From patchwork Mon Mar 22 02:46:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 89619 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B1E8EA0548; Mon, 22 Mar 2021 03:55:30 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C2F3140E8F; Mon, 22 Mar 2021 03:55:29 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 152CE4069C for ; Mon, 22 Mar 2021 03:55:27 +0100 (CET) IronPort-SDR: qrZ903CnGm1R2mWeurCFId6JARetWo4g/gf9ooLzKXpktKQEWPGXbJC/3imm9ByHfn8N0z1Bft 5G5VK2X3dwcQ== X-IronPort-AV: E=McAfee;i="6000,8403,9930"; a="254189564" X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="254189564" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:27 -0700 IronPort-SDR: uEhInUlG9EubUrw7HvZTA2Njvb06ZQh/M4LXby6rnAqUpNqpjyCF88rpIt7/uOvZsETpg65zxo Sy7sSfnyp6CA== X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="407623001" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:26 -0700 From: Haiyang Zhao To: dts@dpdk.org Cc: lijuan.tu@intel.com, Haiyang Zhao Date: Mon, 22 Mar 2021 10:46:11 +0800 Message-Id: <20210322024616.14499-2-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210322024616.14499-1-haiyangx.zhao@intel.com> References: <20210322024616.14499-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 1/6] nics/net_device: add driver/firmware X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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" add attribute driver/firmware and the related methods for NetDevice. Signed-off-by: Haiyang Zhao --- nics/net_device.py | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/nics/net_device.py b/nics/net_device.py index 6a26d1eb..98d31237 100644 --- a/nics/net_device.py +++ b/nics/net_device.py @@ -71,7 +71,9 @@ class NetDevice(object): self.intf2_name = None self.get_interface_name() self.socket = self.get_nic_socket() - self.pkg = {} + self.driver_version = '' + self.firmware = '' + self.pkg = None def stop(self): pass @@ -123,6 +125,7 @@ class NetDevice(object): """ Get the NIC pkg. """ + self.pkg = {'type': '', 'version': ''} out = self.__send_expect('dmesg | grep "DDP package" | tail -1', '# ') if 'could not load' in out: print(RED(out)) @@ -140,6 +143,36 @@ class NetDevice(object): self.pkg['version'] = pkg_info[1].strip() return self.pkg + @nic_has_driver + def get_driver_firmware(self): + """ + Get NIC driver and firmware version. + """ + get_driver_firmware = getattr( + self, 'get_driver_firmware_%s' % + self.__get_os_type()) + get_driver_firmware() + + def get_driver_firmware_linux(self): + """ + Get NIC driver and firmware version. + """ + rexp = 'version:\s.+' + pattern = re.compile(rexp) + out = self.__send_expect('ethtool -i {} | grep version'.format(self.intf_name), '# ') + driver_firmware = pattern.findall(out) + if len(driver_firmware) > 1: + self.driver_version = driver_firmware[0].split(': ')[-1].strip() + self.firmware = driver_firmware[1].split(': ')[-1].strip() + + return self.driver_version, self.firmware + + def get_driver_firmware_freebsd(self): + """ + Get the NIC driver and firmware version. + """ + NotImplemented + def get_nic_socket(self): """ Get socket id of specified pci device. From patchwork Mon Mar 22 02:46:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 89620 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BBDACA034F; Mon, 22 Mar 2021 03:55:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD811140EAE; Mon, 22 Mar 2021 03:55:31 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 36F2B4069C for ; Mon, 22 Mar 2021 03:55:30 +0100 (CET) IronPort-SDR: 9qP8ADGbcYVE5vwhFYY2/w96XVjm7F0RNAqu4USK9mFs7rtZVa2Ecx1dkosGcIkOBkRKOBwyCQ 9neHYFWFe4wQ== X-IronPort-AV: E=McAfee;i="6000,8403,9930"; a="254189569" X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="254189569" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:29 -0700 IronPort-SDR: Sl+Ne0Yp7fIG2eTAZMJAF8qqYJAcoY3lsAPxWWpVHcC/6fHfECdni2K5fzeSFvC+YdFyKibJYu Xk1RIaGfftwA== X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="407623006" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:27 -0700 From: Haiyang Zhao To: dts@dpdk.org Cc: lijuan.tu@intel.com, Haiyang Zhao Date: Mon, 22 Mar 2021 10:46:12 +0800 Message-Id: <20210322024616.14499-3-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210322024616.14499-1-haiyangx.zhao@intel.com> References: <20210322024616.14499-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 2/6] framework/dut: get nic driver/firmware info X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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" get nic driver/firmware info in dut prerequisites. Signed-off-by: Haiyang Zhao --- framework/dut.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/dut.py b/framework/dut.py index 5bc84fca..d31ba42c 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -424,13 +424,13 @@ class Dut(Crb): retry_times = 3 if self.ports_info: self.nic = self.ports_info[0]['port'] - # TODO: get nic driver/firmware version + self.nic.get_driver_firmware() if self.nic.default_driver == 'ice': self.get_nic_pkg(retry_times) def get_nic_pkg(self, retry_times=3): self.nic.pkg = self.nic.get_nic_pkg() - while not self.nic.pkg and retry_times > 0: + while not self.nic.pkg.get('type') and retry_times > 0: self.restore_interfaces() self.nic.pkg = self.nic.get_nic_pkg() retry_times = retry_times - 1 From patchwork Mon Mar 22 02:46:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 89621 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DF6C1A034F; Mon, 22 Mar 2021 03:55:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D7AD6140EBD; Mon, 22 Mar 2021 03:55:33 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 213AE4069C for ; Mon, 22 Mar 2021 03:55:31 +0100 (CET) IronPort-SDR: rDe/9lCrg0rGhk5nwKEySziMmdAsWs5pb+FKhBSeNs1EcmhRrNrXn0Ocf8e8Ec0/qzbJX2c9fG jC0AafZo2cEQ== X-IronPort-AV: E=McAfee;i="6000,8403,9930"; a="254189570" X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="254189570" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:31 -0700 IronPort-SDR: F5sk56bjCu7mDmfyxkE4gHyWkHhOJL7UFme+Yms9VBQVVC3+4GsufUVjzF4DTREmN6zFvb8P62 yCb670MhcP8Q== X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="407623015" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:29 -0700 From: Haiyang Zhao To: dts@dpdk.org Cc: lijuan.tu@intel.com, Haiyang Zhao Date: Mon, 22 Mar 2021 10:46:13 +0800 Message-Id: <20210322024616.14499-4-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210322024616.14499-1-haiyangx.zhao@intel.com> References: <20210322024616.14499-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 3/6] framework/test_result: add driver/firmware/package X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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" add driver/firmware/package in result and the related get method, and also update the index of other elements. Signed-off-by: Haiyang Zhao --- framework/test_result.py | 83 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-) diff --git a/framework/test_result.py b/framework/test_result.py index 35607451..6dd94451 100644 --- a/framework/test_result.py +++ b/framework/test_result.py @@ -46,6 +46,11 @@ class Result(object): internals = [ 'dut1', [ + 'kdriver', + 'firmware', + 'pkg', + 'driver', + 'dpdk_version', 'target1', 'nic1', [ 'suite1', [ 'case1', ['PASSED', ''], @@ -92,17 +97,85 @@ class Result(object): """ try: dut_idx = self.__internals.index(dut) - return self.__internals[dut_idx + 1][0] + return self.__internals[dut_idx + 1][4] except: return '' def __set_dpdk_version(self, dpdk_version): - if not self.internals[self.__dut + 1]: + if dpdk_version not in self.internals[self.__dut + 1]: self.internals[self.__dut + 1].append(dpdk_version) def __get_dpdk_version(self): + return self.internals[self.__dut + 1][3] + + def current_kdriver(self, dut): + """ + Returns the driver version for a given DUT + """ + try: + dut_idx = self.__internals.index(dut) + return self.__internals[dut_idx + 1][0] + except: + return '' + + def __set_kdriver(self, driver): + if not self.internals[self.__dut + 1]: + self.internals[self.__dut + 1].append(driver) + + def __get_kdriver(self): return self.internals[self.__dut + 1][0] + def current_firmware_version(self, dut): + """ + Returns the firmware version for a given DUT + """ + try: + dut_idx = self.__internals.index(dut) + return self.__internals[dut_idx + 1][1] + except: + return '' + + def __set_firmware(self, firmware): + if firmware not in self.internals[self.__dut + 1]: + self.internals[self.__dut + 1].append(firmware) + + def __get_firmware(self): + return self.internals[self.__dut + 1][1] + + def current_package_version(self, dut): + """ + Returns the DDP package version for a given DUT + """ + try: + dut_idx = self.__internals.index(dut) + return self.__internals[dut_idx + 1][2] + except: + return '' + + def __set_ddp_package(self, package): + if package not in self.internals[self.__dut + 1]: + self.internals[self.__dut + 1].append(package) + + def __get_ddp_package(self): + return self.internals[self.__dut + 1][2] + + def current_driver(self, dut): + """ + Returns the DDP package version for a given DUT + """ + try: + dut_idx = self.__internals.index(dut) + return self.__internals[dut_idx + 1][3] + except: + return '' + + def __set_driver(self, package): + if package not in self.internals[self.__dut + 1]: + self.internals[self.__dut + 1].append(package) + + def __get_driver(self): + return self.internals[self.__dut + 1][3] + def __current_targets(self): return self.internals[self.__dut + 1] @@ -210,7 +283,7 @@ class Result(object): dut_idx = self.__internals.index(dut) except: return None - return self.__internals[dut_idx + 1][1::3] + return self.__internals[dut_idx + 1][5::3] def current_nic(self, dut, target): """ @@ -305,6 +378,10 @@ class Result(object): """ dut = property(__get_dut, __set_dut) dpdk_version = property(__get_dpdk_version, __set_dpdk_version) + kdriver = property(__get_kdriver, __set_kdriver) + driver = property(__get_driver, __set_driver) + firmware = property(__get_firmware, __set_firmware) + package = property(__get_ddp_package, __set_ddp_package) target = property(__get_target, __set_target) test_suite = property(__get_test_suite, __set_test_suite) test_case = property(__get_test_case, __set_test_case) From patchwork Mon Mar 22 02:46:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 89622 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A461A034F; Mon, 22 Mar 2021 03:55:35 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 055B0140EE0; Mon, 22 Mar 2021 03:55:35 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 8D5AE4069C for ; Mon, 22 Mar 2021 03:55:33 +0100 (CET) IronPort-SDR: Mzbb3Qd/Rmk5BfhQjGECF43gqfgEVCPgZC5daxQP1FHdA336Z1kQS610zJBJwhx8Jlmc5mnNFW 0XrQ1hbatz6g== X-IronPort-AV: E=McAfee;i="6000,8403,9930"; a="254189571" X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="254189571" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:33 -0700 IronPort-SDR: oR9/pCq91Yl9FwYHgmPeWV8/kkGJZs9YUGwMbqeWYTkH2sYS6kRg9JY1X/sAIhtv7dk054Bicu YAPFHPUTAXdQ== X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="407623023" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:31 -0700 From: Haiyang Zhao To: dts@dpdk.org Cc: lijuan.tu@intel.com, Haiyang Zhao Date: Mon, 22 Mar 2021 10:46:14 +0800 Message-Id: <20210322024616.14499-5-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210322024616.14499-1-haiyangx.zhao@intel.com> References: <20210322024616.14499-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 4/6] framework/dts: add more nic configurations in result X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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" add nic driver/firmware/package version in result. Signed-off-by: Haiyang Zhao --- framework/dts.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/framework/dts.py b/framework/dts.py index d4a8c6e9..6f621a51 100644 --- a/framework/dts.py +++ b/framework/dts.py @@ -624,6 +624,10 @@ def run_all(config_file, pkgName, git, patch, skip_setup, if dts_run_prerequisties(duts, tester, pkgName, patch, dts_commands, serializer) is False: dts_crbs_exit(duts, tester) continue + result.kdriver = duts[0].nic.default_driver + '-' + duts[0].nic.driver_version + result.firmware = duts[0].nic.firmware + result.package = duts[0].nic.pkg['type'] + ' ' + duts[0].nic.pkg['version'] if duts[0].nic.pkg else None + result.driver = settings.load_global_setting(settings.HOST_DRIVER_SETTING) result.dpdk_version = duts[0].dpdk_version dts_run_target(duts, tester, targets, test_suites, subtitle) From patchwork Mon Mar 22 02:46:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 89623 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 35F0CA034F; Mon, 22 Mar 2021 03:55:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 30E28140EE6; Mon, 22 Mar 2021 03:55:36 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 2A95F140EE6 for ; Mon, 22 Mar 2021 03:55:35 +0100 (CET) IronPort-SDR: uSarxUbADkm9P7kczS9rOld9yKI43QX1iEvr3eLBcQ0zmBK0JILt/o7++9mKriPUJfUQC3I9ig EF3bJSJfGOMw== X-IronPort-AV: E=McAfee;i="6000,8403,9930"; a="254189572" X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="254189572" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:34 -0700 IronPort-SDR: ItHgT8exoEXrVNX/ULU4+wweGvheXgC8qJnuH5ohY45xAAsspcSro+lMeDnPQ9KQSkvi4E21DF cppfNn3iLZdA== X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="407623031" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:33 -0700 From: Haiyang Zhao To: dts@dpdk.org Cc: lijuan.tu@intel.com, Haiyang Zhao Date: Mon, 22 Mar 2021 10:46:15 +0800 Message-Id: <20210322024616.14499-6-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210322024616.14499-1-haiyangx.zhao@intel.com> References: <20210322024616.14499-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 5/6] framework/excel_reporter: add driver/firmware/pkg X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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" add driver/firmware/pkg info in excel format result file. Signed-off-by: Haiyang Zhao --- framework/excel_reporter.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/framework/excel_reporter.py b/framework/excel_reporter.py index 89b9a175..747f577e 100644 --- a/framework/excel_reporter.py +++ b/framework/excel_reporter.py @@ -193,8 +193,20 @@ class ExcelReporter(object): def __write_nic(self, dut, target): nic = self.result.current_nic(dut, target) + driver = self.result.current_driver(dut) + kdriver = self.result.current_kdriver(dut) + firmware = self.result.current_firmware_version(dut) + pkg = self.result.current_package_version(dut) self.col += 1 + self.sheet.col(self.col).width = 32 * 256 # 32 characters self.sheet.write(self.row, self.col, nic, self.title_style) + self.sheet.write(self.row+1, self.col, 'driver: ' + driver) + self.sheet.write(self.row+2, self.col, 'kdriver: ' + kdriver) + self.sheet.write(self.row+3, self.col, 'firmware: ' + firmware) + if pkg is not None: + self.sheet.write(self.row+4, self.col, 'pkg: ' + pkg) + self.row = self.row + 1 + self.row = self.row + 3 self.__write_suites(dut, target) self.col -= 1 From patchwork Mon Mar 22 02:46:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 89624 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5A6BBA034F; Mon, 22 Mar 2021 03:55:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 55DF4140EED; Mon, 22 Mar 2021 03:55:38 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id AA6994069C for ; Mon, 22 Mar 2021 03:55:36 +0100 (CET) IronPort-SDR: 5Vnm3LU0tD8uybLdjlOFGEsXZt8p8eQTlhavRnsJ7Z0f/5G9aSLnfkSW75HHKBhCGLM+ijG1cU YwxeBU+71vkg== X-IronPort-AV: E=McAfee;i="6000,8403,9930"; a="254189573" X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="254189573" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:36 -0700 IronPort-SDR: puc6TdblYLLK54Z2gjGJi832Tw61WzvLU4m3lZxzztwlWdkUK7I2m1Cm3Z4R1+W7usV/tN5Dhu gFTvwzfRx7NA== X-IronPort-AV: E=Sophos;i="5.81,266,1610438400"; d="scan'208";a="407623040" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2021 19:55:34 -0700 From: Haiyang Zhao To: dts@dpdk.org Cc: lijuan.tu@intel.com, Haiyang Zhao Date: Mon, 22 Mar 2021 10:46:16 +0800 Message-Id: <20210322024616.14499-7-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210322024616.14499-1-haiyangx.zhao@intel.com> References: <20210322024616.14499-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 6/6] framework/json_reporter: add driver/firmware/pkg X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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" add driver/firmware/pkg info in json format result file. Signed-off-by: Haiyang Zhao --- framework/json_reporter.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/framework/json_reporter.py b/framework/json_reporter.py index 88099cb8..f7025c2c 100644 --- a/framework/json_reporter.py +++ b/framework/json_reporter.py @@ -65,8 +65,15 @@ class JSONReporter(object): return 'fail' target_map = {} target_map['dpdk_version'] = result.current_dpdk_version(dut) + target_map['nic'] = {} for target in result.all_targets(dut): + target_map['nic']['name'] = result.current_nic(dut, target) target_map[target] = self.__scan_target(result, dut, target) + target_map['nic']['kdriver'] = result.current_kdriver(dut) + target_map['nic']['driver'] = result.current_driver(dut) + target_map['nic']['firmware'] = result.current_firmware_version(dut) + if result.current_package_version(dut) is not None: + target_map['nic']['pkg'] = result.current_package_version(dut) return target_map def save(self, result):