From patchwork Fri Nov 27 02:50:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 84597 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D0DEFA0527; Fri, 27 Nov 2020 03:56:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC098CAA2; Fri, 27 Nov 2020 03:56:52 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 8F23CCA9D for ; Fri, 27 Nov 2020 03:56:49 +0100 (CET) IronPort-SDR: hG9gI9jg2WmFTNwbLOPoBGFEKbW5Xt8LBr3QL24iNhTrMjXGIeBiWikvvBEIETqOBgSkgSlPy9 UQxFXIy8AyXQ== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="233947101" X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="233947101" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:47 -0800 IronPort-SDR: 4CcB0v28vsyzoJChUtp0vvuNZgIiFj6mZGdeqE3JdNUhMbXM0tuwwDzwPIoTYe6jV0X+ek6+QJ DlkwfHSlrRTw== X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="313557292" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:46 -0800 From: Haiyang Zhao To: Lijuan.Tu@intel.com, dts@dpdk.org Cc: Haiyang Zhao Date: Fri, 27 Nov 2020 10:50:23 +0800 Message-Id: <20201127025029.22276-2-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201127025029.22276-1-haiyangx.zhao@intel.com> References: <20201127025029.22276-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 1/7] framework/dut: record DPDK version in host DUT 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" get dpdk version from VERSION and save it in host dut. Signed-off-by: Haiyang Zhao --- framework/dut.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/framework/dut.py b/framework/dut.py index 2863848..f3ef8c6 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -80,6 +80,7 @@ class Dut(Crb): self.hugepage_path = None self.apps_name_conf = {} self.apps_name = {} + self.dpdk_version = '' def filter_cores_from_crb_cfg(self): # get core list from crbs.cfg @@ -368,7 +369,13 @@ class Dut(Crb): Then call pci scan function to collect nic device information. At last setup DUT' environment for validation. """ - self.send_expect("cd %s" % self.base_dir, "# ") + out = self.send_expect("cd %s" % self.base_dir, "# ") + assert 'No such file or directory' not in out, "Can't switch to dpdk folder!!!" + out = self.send_expect("cat VERSION", "# ") + if 'No such file or directory' in out: + self.logger.error("Can't get DPDK version due to VERSION not exist!!!") + else: + self.dpdk_version = out self.send_expect("alias ls='ls --color=none'", "#") if self.get_os_type() == 'freebsd': From patchwork Fri Nov 27 02:50:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 84600 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9AB02A052A; Fri, 27 Nov 2020 03:56:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DC7B6CAA9; Fri, 27 Nov 2020 03:56:52 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id F0154CAA1 for ; Fri, 27 Nov 2020 03:56:50 +0100 (CET) IronPort-SDR: BFQnbpwePeSWZFakUvZjFaAiAZuqwKc7/Z2aXcZMzhIxAdjNimSamvsEUj3Kaksjj/YAD/NHIg LdB5/p0GbJ+A== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="233947104" X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="233947104" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:49 -0800 IronPort-SDR: XAbR31NTgsqdQm47YmwSl8I89vbyQl8H0R9G60X9rJnJOiNgZoCk7FdcWvLQmso75k9jdkJnW5 ER6JfT1qr/bg== X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="313557297" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:47 -0800 From: Haiyang Zhao To: Lijuan.Tu@intel.com, dts@dpdk.org Cc: Haiyang Zhao Date: Fri, 27 Nov 2020 10:50:24 +0800 Message-Id: <20201127025029.22276-3-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201127025029.22276-1-haiyangx.zhao@intel.com> References: <20201127025029.22276-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 2/7] framework/virt_dut: record DPDK version in guest DUT 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" get and save guest DUT dpdk version. Signed-off-by: Haiyang Zhao --- framework/virt_dut.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/virt_dut.py b/framework/virt_dut.py index 03569ba..9b0126b 100644 --- a/framework/virt_dut.py +++ b/framework/virt_dut.py @@ -172,8 +172,12 @@ class VirtDut(DPDKdut): self.prepare_package() out = self.send_expect("cd %s" % self.base_dir, "# ") + assert 'No such file or directory' not in out, "Can't switch to dpdk folder!!!" + out = self.send_expect("cat VERSION", "# ") if 'No such file or directory' in out: - self.logger.error("Can't switch to dpdk folder!!!") + self.logger.error("Can't get DPDK version due to VERSION not exist!!!") + else: + self.dpdk_version = out self.send_expect("alias ls='ls --color=none'", "#") From patchwork Fri Nov 27 02:50:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 84599 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5B2DDA0545; Fri, 27 Nov 2020 03:56:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1AFABCAAE; Fri, 27 Nov 2020 03:56:53 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 300DACA9D for ; Fri, 27 Nov 2020 03:56:51 +0100 (CET) IronPort-SDR: 9GwilTDYxfd5OgDKmLKG5/AeH/Y9/jP7ubtuZzc5ty+J0O7B+X7KFxxQig4npHxvdtzx7Y27P+ 6vVx03DF0P6Q== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="233947105" X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="233947105" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:50 -0800 IronPort-SDR: NvelwO0NDl97gTRGKOrC78COyEBaFt12b7CU8un01K6mpAKf0XEJAan6hrXGGqfuMZ9iT4mRyv CpFf3GM8uCnA== X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="313557302" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:49 -0800 From: Haiyang Zhao To: Lijuan.Tu@intel.com, dts@dpdk.org Cc: Haiyang Zhao Date: Fri, 27 Nov 2020 10:50:25 +0800 Message-Id: <20201127025029.22276-4-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201127025029.22276-1-haiyangx.zhao@intel.com> References: <20201127025029.22276-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 3/7] framework/dts: save dpdk version in global result 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" save dpdk version in global result after executing prerequisities. Signed-off-by: Haiyang Zhao --- framework/dts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/dts.py b/framework/dts.py index 8c61385..d4a8c6e 100644 --- a/framework/dts.py +++ b/framework/dts.py @@ -624,7 +624,7 @@ 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.dpdk_version = duts[0].dpdk_version dts_run_target(duts, tester, targets, test_suites, subtitle) dts_crbs_exit(duts, tester) From patchwork Fri Nov 27 02:50:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 84601 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6F8DFA09D2; Fri, 27 Nov 2020 03:56:57 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4A8EACAB5; Fri, 27 Nov 2020 03:56:54 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 7DFE0CA9D for ; Fri, 27 Nov 2020 03:56:52 +0100 (CET) IronPort-SDR: 548kaWUpUibLyodJ90UPv00uBbDkb1xQKDCPZyIg0CZgqytcejzipdKFteC/cOjtmk/vRfphx5 uxQn0+hVb9RA== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="233947109" X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="233947109" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:52 -0800 IronPort-SDR: Jm1V5JClX9zlTdXuuh5cTH9UxJpe6CI2s5b4pCaj6SwoKqYznXoj2WrvhhqF/HJcCTHwGHAyeE i8vV7s+zw0Gg== X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="313557317" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:50 -0800 From: Haiyang Zhao To: Lijuan.Tu@intel.com, dts@dpdk.org Cc: Haiyang Zhao Date: Fri, 27 Nov 2020 10:50:26 +0800 Message-Id: <20201127025029.22276-5-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201127025029.22276-1-haiyangx.zhao@intel.com> References: <20201127025029.22276-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 4/7] framework/excel_reporter: add dpdk version in excel result 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" add dpdk version in excel result and modify the other element index. Signed-off-by: Haiyang Zhao --- framework/excel_reporter.py | 54 ++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/framework/excel_reporter.py b/framework/excel_reporter.py index 65d26b6..89b9a17 100644 --- a/framework/excel_reporter.py +++ b/framework/excel_reporter.py @@ -76,38 +76,40 @@ class ExcelReporter(object): def __add_header(self): self.sheet.write(0, 0, 'DUT', self.header_style) - self.sheet.write(0, 1, 'Target', self.header_style) - self.sheet.write(0, 2, 'NIC', self.header_style) - self.sheet.write(0, 3, 'Test suite', self.header_style) - self.sheet.write(0, 4, 'Test case', self.header_style) - self.sheet.write(0, 5, 'Results', self.header_style) - - self.sheet.write(0, 7, 'Pass', self.header_style) - self.sheet.write(0, 8, 'Fail', self.header_style) - self.sheet.write(0, 9, 'Blocked', self.header_style) - self.sheet.write(0, 10, 'N/A', self.header_style) - self.sheet.write(0, 11, 'Not Run', self.header_style) - self.sheet.write(0, 12, 'Total', self.header_style) - - self.sheet.write(1, 7, Formula('COUNTIF(F2:F2000,"PASSED")')) - self.sheet.write(1, 8, Formula('COUNTIF(F2:F2000,"FAILED*") + COUNTIF(F2:F2000,"IXA*")')) - self.sheet.write(1, 9, Formula('COUNTIF(F2:F2000,"BLOCKED*")')) - self.sheet.write(1, 10, Formula('COUNTIF(F2:F2000,"N/A*")')) - self.sheet.write(1, 12, Formula('H2+I2+J2+K2+L2')) + self.sheet.write(0, 1, 'DPDK version', self.header_style) + self.sheet.write(0, 2, 'Target', self.header_style) + self.sheet.write(0, 3, 'NIC', self.header_style) + self.sheet.write(0, 4, 'Test suite', self.header_style) + self.sheet.write(0, 5, 'Test case', self.header_style) + self.sheet.write(0, 6, 'Results', self.header_style) + + self.sheet.write(0, 8, 'Pass', self.header_style) + self.sheet.write(0, 9, 'Fail', self.header_style) + self.sheet.write(0, 10, 'Blocked', self.header_style) + self.sheet.write(0, 11, 'N/A', self.header_style) + self.sheet.write(0, 12, 'Not Run', self.header_style) + self.sheet.write(0, 13, 'Total', self.header_style) + + self.sheet.write(1, 8, Formula('COUNTIF(G2:G2000,"PASSED")')) + self.sheet.write(1, 9, Formula('COUNTIF(G2:G2000,"FAILED*") + COUNTIF(G2:G2000,"IXA*")')) + self.sheet.write(1, 10, Formula('COUNTIF(G2:G2000,"BLOCKED*")')) + self.sheet.write(1, 11, Formula('COUNTIF(G2:G2000,"N/A*")')) + self.sheet.write(1, 13, Formula('I2+J2+K2+L2+M2')) self.sheet.col(0).width = 4000 - self.sheet.col(1).width = 7500 - self.sheet.col(2).width = 3000 - self.sheet.col(3).width = 5000 - self.sheet.col(4).width = 8000 - self.sheet.col(5).width = 3000 - self.sheet.col(6).width = 1000 - self.sheet.col(7).width = 3000 + self.sheet.col(1).width = 4500 + self.sheet.col(2).width = 7500 + self.sheet.col(3).width = 3000 + self.sheet.col(4).width = 5000 + self.sheet.col(5).width = 8000 + self.sheet.col(6).width = 3000 + self.sheet.col(7).width = 1000 self.sheet.col(8).width = 3000 self.sheet.col(9).width = 3000 self.sheet.col(10).width = 3000 self.sheet.col(11).width = 3000 self.sheet.col(12).width = 3000 + self.sheet.col(13).width = 3000 def __styles(self): header_pattern = xlwt.Pattern() @@ -223,6 +225,8 @@ class ExcelReporter(object): if self.result.is_dut_failed(dut): self.__write_failed_dut(dut) else: + self.col = self.col + 1 + self.sheet.write(self.row, self.col, self.result.current_dpdk_version(dut), self.title_style) self.__write_targets(dut) self.row += 1 From patchwork Fri Nov 27 02:50:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 84602 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 763F6A0524; Fri, 27 Nov 2020 03:56:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7BEF1CAB9; Fri, 27 Nov 2020 03:56:56 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 09595CAB9 for ; Fri, 27 Nov 2020 03:56:53 +0100 (CET) IronPort-SDR: 5pQoARnjSFSDJ+hh69bIQQEpTZOU4nEf3hHCOvzKnG8NpuUy0k4Q25kBJl05SmR3vgrrsJSDfZ 4bRBDHzEbHkA== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="233947114" X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="233947114" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:53 -0800 IronPort-SDR: gvRJuLJlZqAVjymwZkHEDMniCJnRXVRNNE2LBPLxLx7PITwyUc4tlFlx0A3skKyuE+GmMSd6Pk a7pvNAJqNNeg== X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="313557323" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:52 -0800 From: Haiyang Zhao To: Lijuan.Tu@intel.com, dts@dpdk.org Cc: Haiyang Zhao Date: Fri, 27 Nov 2020 10:50:27 +0800 Message-Id: <20201127025029.22276-6-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201127025029.22276-1-haiyangx.zhao@intel.com> References: <20201127025029.22276-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 5/7] framework/json_reporter: add dpdk version in json 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" result add dpdk version in json result. Signed-off-by: Haiyang Zhao --- framework/json_reporter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/json_reporter.py b/framework/json_reporter.py index 1b15bbe..88099cb 100644 --- a/framework/json_reporter.py +++ b/framework/json_reporter.py @@ -64,6 +64,7 @@ class JSONReporter(object): if result.is_dut_failed(dut): return 'fail' target_map = {} + target_map['dpdk_version'] = result.current_dpdk_version(dut) for target in result.all_targets(dut): target_map[target] = self.__scan_target(result, dut, target) return target_map From patchwork Fri Nov 27 02:50:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 84603 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D00DDA0527; Fri, 27 Nov 2020 03:56:59 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B1A1FCABE; Fri, 27 Nov 2020 03:56:57 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id D08C4CA6A for ; Fri, 27 Nov 2020 03:56:55 +0100 (CET) IronPort-SDR: 8cqpCUW3e6Uag9F7gvV/wdG92IzxFo4/z2KVUzndGJQqMkspR3z0mSBXiIMXk3Cjh+8JOshJ8j TIb9E8dc4qyA== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="233947116" X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="233947116" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:55 -0800 IronPort-SDR: nI4PLucjKyL7gIrL81FQ8cSsAWlEShVWce/8uHP7lOEku1f40I5BLpgQyJeLb96M6Hu8r4o6uT H3iF8Bd4RW2g== X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="313557329" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:53 -0800 From: Haiyang Zhao To: Lijuan.Tu@intel.com, dts@dpdk.org Cc: Haiyang Zhao Date: Fri, 27 Nov 2020 10:50:28 +0800 Message-Id: <20201127025029.22276-7-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201127025029.22276-1-haiyangx.zhao@intel.com> References: <20201127025029.22276-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 6/7] framework/test_result: add dpdk_version in Result 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" add dpdk_version and get method in class Result, and modify all_targets as target element index changed. Signed-off-by: Haiyang Zhao --- framework/test_result.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/framework/test_result.py b/framework/test_result.py index e5a2b4e..3560745 100644 --- a/framework/test_result.py +++ b/framework/test_result.py @@ -86,6 +86,23 @@ class Result(object): def __get_dut(self): return self.__internals[self.__dut] + def current_dpdk_version(self, dut): + """ + Returns the dpdk version for a given DUT + """ + try: + dut_idx = self.__internals.index(dut) + return self.__internals[dut_idx + 1][0] + except: + return '' + + def __set_dpdk_version(self, dpdk_version): + if not self.internals[self.__dut + 1]: + self.internals[self.__dut + 1].append(dpdk_version) + + def __get_dpdk_version(self): + return self.internals[self.__dut + 1][0] + def __current_targets(self): return self.internals[self.__dut + 1] @@ -193,7 +210,7 @@ class Result(object): dut_idx = self.__internals.index(dut) except: return None - return self.__internals[dut_idx + 1][::3] + return self.__internals[dut_idx + 1][1::3] def current_nic(self, dut, target): """ @@ -287,6 +304,7 @@ class Result(object): presented interface. """ dut = property(__get_dut, __set_dut) + dpdk_version = property(__get_dpdk_version, __set_dpdk_version) 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 Fri Nov 27 02:50:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 84604 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 238D5A0524; Fri, 27 Nov 2020 03:57:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DF11CCAC1; Fri, 27 Nov 2020 03:56:57 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 17227CAA1 for ; Fri, 27 Nov 2020 03:56:56 +0100 (CET) IronPort-SDR: xsK0eLOQ83QhzhS+bdn9aqYPMxD3MyiEKH3k/O2BoII3Ij6UB6j4bK7o4Pvi81dLYjAm+gn3LU RRjZwWx/jWRw== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="233947118" X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="233947118" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:56 -0800 IronPort-SDR: zLPxU3/vyCTIlG5RC9cGTtw/1JXG/B5AWNFubjVcirgRApfB29JTNnvs3we/cyrFFE4PCyWKXR iU9rDGpjlAJg== X-IronPort-AV: E=Sophos;i="5.78,373,1599548400"; d="scan'208";a="313557337" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 18:56:55 -0800 From: Haiyang Zhao To: Lijuan.Tu@intel.com, dts@dpdk.org Cc: Haiyang Zhao Date: Fri, 27 Nov 2020 10:50:29 +0800 Message-Id: <20201127025029.22276-8-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201127025029.22276-1-haiyangx.zhao@intel.com> References: <20201127025029.22276-1-haiyangx.zhao@intel.com> Subject: [dts] [PATCH V1 7/7] framework/stats_reporter: add dpdk version in stats_reporter 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" add dpdk version in stats_reporter. Signed-off-by: Haiyang Zhao --- framework/stats_reporter.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/framework/stats_reporter.py b/framework/stats_reporter.py index 3793ca5..8cde5cd 100644 --- a/framework/stats_reporter.py +++ b/framework/stats_reporter.py @@ -65,6 +65,13 @@ class StatsReporter(object): self.__add_stat(test_result) def __write_stats(self): + duts = self.result.all_duts() + if len(duts) == 1: + self.stats_file.write("dpdk_version = {}\n".format(self.result.current_dpdk_version(duts[0]))) + else: + for dut in duts(): + dpdk_version = self.result.current_dpdk_version(dut) + self.stats_file.write("{}.dpdk_version = {}\n".format(dut, dpdk_version)) self.__count_stats() self.stats_file.write("Passed = %d\n" % self.passed) self.stats_file.write("Failed = %d\n" % self.failed)