From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 18415A00C4; Fri, 24 Apr 2020 07:54:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC5151C1C4; Fri, 24 Apr 2020 07:54:37 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 7A3201C1B2 for ; Fri, 24 Apr 2020 07:54:36 +0200 (CEST) IronPort-SDR: JoUIzmMoKh7T3cb+a9+Qms8lT4Zq0RamF+U5hXcOnJrGOQ72Etf8nNXSl4X2eUJfLQnPQpFTvQ Iepu+Ce2CheA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2020 22:54:35 -0700 IronPort-SDR: qTaDDglpr1LE+CkTV4hN/S7ri7bkQVJDUtoeB/xVSCjF6FmSQBMJAUcm52bU1l4lU566u06NbV lGZnv30DDtDw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,310,1583222400"; d="scan'208";a="457792550" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga006.fm.intel.com with ESMTP; 23 Apr 2020 22:54:35 -0700 Received: from cdsmsx151.ccr.corp.intel.com (172.17.4.38) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 23 Apr 2020 22:54:18 -0700 Received: from cdsmsx102.ccr.corp.intel.com ([169.254.2.104]) by CDSMSX151.ccr.corp.intel.com ([169.254.3.217]) with mapi id 14.03.0439.000; Fri, 24 Apr 2020 13:54:16 +0800 From: "Jiang, MaoX" To: "dts@dpdk.org" Thread-Topic: [dts] [PATCH V1] nics/system_info: _strip_memory adapt new output Thread-Index: AQHWGe2v2v6e54Ro7k67YiUURYgzf6iHvnMwgAAG3wA= Date: Fri, 24 Apr 2020 05:54:15 +0000 Message-ID: <79BEEF5375D8C04B84B9FF07CBE5ED8716523D53@CDSMSX102.ccr.corp.intel.com> References: <1587699137-89442-1-git-send-email-yux.jiang@intel.com> <50bf0a9a2ccf4bdab3befeac80613bdf@intel.com> <60652C6914E08D41B9AA1580751B3CA9015EF9BE@SHSMSX103.ccr.corp.intel.com> In-Reply-To: <60652C6914E08D41B9AA1580751B3CA9015EF9BE@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.17.6.105] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V1] nics/system_info: _strip_memory adapt new output X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Tested-by: "Jiang,mao" > > -----Original Message----- > > From: Jiang, YuX > > Sent: Friday, April 24, 2020 11:32 AM > > To: dts@dpdk.org > > Cc: Jiang, YuX > > Subject: [dts][PATCH V1] nics/system_info: _strip_memory adapt new > > output > > > > From: "Jiang,yu" > > > > adapt the new output of memory info > > > > Signed-off-by: Jiang,yu > > --- > > nics/system_info.py | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/nics/system_info.py b/nics/system_info.py index > > da73b9f..5f796be 100644 > > --- a/nics/system_info.py > > +++ b/nics/system_info.py > > @@ -75,9 +75,12 @@ class SystemInfo(object): > > def _strip_memory(self, memories): > > """ > > Size: 8192 MB Locator: DIMM_A1 Speed: 2133 MHz > > + Size: 32 GB Locator: DIMMB1 Speed: 2400 MT/s > > """ > > s_regex =3D r"(\s+)Size: (\d+) MB" > > + s_regex_gb =3D r"(\s+)Size: (\d+) GB" > > l_regex=3D r"(\s+)Locator: .*_(\w+)" > > + l_regex_x=3D r"(\s+)Locator:.*DIMM(\w+)" > > speed_regex =3D r"(\s+)Speed: (.*)" > > size =3D "" > > locate =3D "" > > @@ -88,11 +91,17 @@ class SystemInfo(object): > > total_size =3D 0 > > for line in lines: > > m =3D re.match(s_regex, line) > > + m_gb =3D re.match(s_regex_gb, line) > > if m: > > size =3D m.group(2) > > + elif m_gb: > > + size =3D m_gb.group(2)*1024 > > l_m =3D re.match(l_regex, line) > > + l_mx =3D re.match(l_regex_x, line) > > if l_m: > > locate =3D l_m.group(2) > > + elif l_mx: > > + locate =3D l_mx.group(2) > > s_m =3D re.match(speed_regex, line) > > if s_m: > > speed =3D s_m.group(2) > > -- > > 2.17.2