From patchwork Wed Aug 3 22:46:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, ZhiminX" X-Patchwork-Id: 114586 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 72729A00C5; Wed, 3 Aug 2022 16:27:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 687F140A7E; Wed, 3 Aug 2022 16:27:03 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 8A97D40141 for ; Wed, 3 Aug 2022 16:27:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659536822; x=1691072822; h=from:to:cc:subject:date:message-id; bh=m6FmzYCt/EhDg2lMUGHfykKaKmFhS/YdS9t0plCEjYA=; b=EFbxJh6ppSy6+ipZcShl7HlQScgw16gvinlao9ppmXxznHDjENsfm2Jz z5DL3/WT/nojmzolCEURKJkEhUaOGcyYJhfQM+wXo9Ys8a4tx7ooJqbIW +cjla9k+cOTc2FjIAw69GtCRadeT4QXtXib4K5F5u70FdK8JkdL7nk6bC c8XPffqEmnjNnxjiZdMoebOJfrhXw71NNH8YHC3zwYh5gYlM38Uo2AroV t1nAYeOAebhVmltNDZ5wCoPfHQWOQIpUWVcaIOvk9VIAZHyLx/j0I/gyL 2e+cCUv9kfGjQiTW8CQYRjPLjz+XFlqjXe+nGCtDMHLlCs8xM3ugHDwzh w==; X-IronPort-AV: E=McAfee;i="6400,9594,10428"; a="351396858" X-IronPort-AV: E=Sophos;i="5.93,214,1654585200"; d="scan'208";a="351396858" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Aug 2022 07:27:01 -0700 X-IronPort-AV: E=Sophos;i="5.93,214,1654585200"; d="scan'208";a="631167520" Received: from unknown (HELO cvl_100g_103.icx.intel.com) ([10.239.252.93]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Aug 2022 07:27:00 -0700 From: Zhimin Huang To: dts@dpdk.org Cc: Zhimin Huang Subject: [dts][PATCH V1 1/2] test_plans/telemetry:add 22.07 new feature case Date: Thu, 4 Aug 2022 06:46:07 +0800 Message-Id: <20220803224608.7123-1-zhiminx.huang@intel.com> X-Mailer: git-send-email 2.17.1 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 add 22.07 new feature, support get laser power value in telemetry client. Signed-off-by: Zhimin Huang --- test_plans/telemetry_test_plan.rst | 67 +++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/test_plans/telemetry_test_plan.rst b/test_plans/telemetry_test_plan.rst index 16568cd3..bca142fc 100644 --- a/test_plans/telemetry_test_plan.rst +++ b/test_plans/telemetry_test_plan.rst @@ -200,4 +200,69 @@ Test case: Stats of 4 ports for testpmd and telemetry with different type nic a. Ensure # of ports stats being returned == # of ports b. Ensure packet counts (eg rx_good_packets) is 0 c. Ensure extended NIC stats are shown (depends on PMD used for testing, refer to ixgbe/i40e tests for PMD xstats) - d. Ensure extended NIC stats are 0 (eg: rx_q0_packets == 0) \ No newline at end of file + d. Ensure extended NIC stats are 0 (eg: rx_q0_packets == 0) + +Test case: read nic Laser Power via dpdk +======================================== + +1.Bind ports to dpdk:: + + ./usertools/dpdk-devbind.py --bind=vfio-pci 18:00.0 18.00.1 88:00.0 88:00.1 + +2.Launch the dpdk testpmd with teltmetry:: + + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd --telemetry -- -i + +3.Launch the telemetry client:: + + python ./usertools/dpdk-telemetry.py + +4.Excute command in telemtry client:: + + --> /ethdev/module_eeprom, + +5.check the testpmd and telemetry show info same as 'ethtool -m' + +Test case: check Laser Power in different optical modules +========================================================= + +1.set port 0 and port 1 with diffent optical modules + +2.Launch the dpdk testpmd with teltmetry:: + + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd --telemetry -- -i + +3.Launch the telemetry client:: + + python ./usertools/dpdk-telemetry.py + +4.Excute command in telemtry client:: + + --> /ethdev/module_eeprom,0 + --> /ethdev/module_eeprom,1 + +5.check port 0 and port 1 have different Laser Power + +Test case: check Laser Power in same optical modules +==================================================== + +1.set port 0 and port 1 with same optical modules + +2.Launch the dpdk testpmd with teltmetry:: + + ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd --telemetry -- -i + +3.Launch the telemetry client:: + + python ./usertools/dpdk-telemetry.py + +4.Excute command in telemtry client:: + + --> /ethdev/module_eeprom,0 + --> /ethdev/module_eeprom,1 + +5.check port 0 and port 1 have same Laser Power + +.. note:: + + the laser power will change slightly with the voltage and temperature From patchwork Wed Aug 3 22:46:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, ZhiminX" X-Patchwork-Id: 114587 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 9BD3BA00C5; Wed, 3 Aug 2022 16:27:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 942EE42BA5; Wed, 3 Aug 2022 16:27:05 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id A3F9342BA5 for ; Wed, 3 Aug 2022 16:27:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659536823; x=1691072823; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=hznLMewIeH1wDb6Ak0W+RRTfgRYm/1Ijkzvv+053vI0=; b=TWyupOy1kckCYS7nPGV2+ySqLTSiQo67ndRJLBkjfhH2y0858gEuMlCZ SPZFr5FEpZ6s25U8ODmz5wUYKhmRDHSmI3QXK8LztbkjKWm9HzGPKZTII 77OhxzaGA2dUD5H2qv4q2rFozKyaMrhcl8hR5HzImHduOkpPtf/oxQf7s Fc3KM20ceYKbjyaq44fdv7qtaVCo2r9YnNNJSTHsOzR0ioC/h4Hbyj2TM tJlCzc6XCheC7cJ+fusC0lxZLYlCorxfApdXc4rofFTYh5v5HSTywiPCB vrUQu8G20vzSUNLYCVw99TAED45yDos3lfjErNHGDaD7UKdGdPpDcMLv/ A==; X-IronPort-AV: E=McAfee;i="6400,9594,10428"; a="351396864" X-IronPort-AV: E=Sophos;i="5.93,214,1654585200"; d="scan'208";a="351396864" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Aug 2022 07:27:03 -0700 X-IronPort-AV: E=Sophos;i="5.93,214,1654585200"; d="scan'208";a="631167538" Received: from unknown (HELO cvl_100g_103.icx.intel.com) ([10.239.252.93]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Aug 2022 07:27:01 -0700 From: Zhimin Huang To: dts@dpdk.org Cc: Zhimin Huang Subject: [dts][PATCH V1 2/2] tests/telemetry:add 22.07 new feature case Date: Thu, 4 Aug 2022 06:46:08 +0800 Message-Id: <20220803224608.7123-2-zhiminx.huang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220803224608.7123-1-zhiminx.huang@intel.com> References: <20220803224608.7123-1-zhiminx.huang@intel.com> 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 add 22.07 new feature, support get laser power value in telemetry client. Signed-off-by: Zhimin Huang --- tests/TestSuite_telemetry.py | 182 ++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 1 deletion(-) diff --git a/tests/TestSuite_telemetry.py b/tests/TestSuite_telemetry.py index 97c1c748..fb6bfe7a 100644 --- a/tests/TestSuite_telemetry.py +++ b/tests/TestSuite_telemetry.py @@ -539,6 +539,125 @@ class TestTelemetry(TestCase): self.close_telemetry_server() raise Exception(e) + def start_telemetry_server_and_get_module_eeprom(self, port_id): + try: + self.change_flag = True + self.dut.bind_interfaces_linux("vfio-pci") + out = self.start_telemetry_server() + self.tester.is_interface_up(self.tester_iface0) + p = re.search("socket /var/run/dpdk/(.+?)/", out) + self.start_dpdk_telemetry(p.group(1)) + module_eeprom_output = self.dut_telemetry.send_expect( + "/ethdev/module_eeprom,{}".format(port_id), "--> " + ) + self.close_telemetry_server() + return module_eeprom_output + except Exception as e: + self.close_telemetry_server() + raise Exception(e) + + def start_dpdk_telemetry(self, *args): + self.dut_telemetry = self.dut.new_session() + dpdk_tool = os.path.join(self.target_dir, "usertools/dpdk-telemetry.py") + self.dut_telemetry.send_expect( + "python3 " + dpdk_tool + " -f {}".format(args[0]), "--> ", 5 + ) + + def verify_nic_laser_power_via_dpdk(self, laser_powers, *ports): + if isinstance(laser_powers, str): + laser_powers = [laser_powers] + for laser_power, port in zip(laser_powers, ports): + laser_power_via_dpdk = self.get_nic_laser_power_via_dpdk(port) + dpdk_float_values = self.get_float_laser_power_values(laser_power_via_dpdk) + eth_float_values = self.get_float_laser_power_values(laser_power) + test_flag = [ + abs(v_d - v_e) for v_d, v_e in zip(dpdk_float_values, eth_float_values) + ] + self.logger.info( + "dpdk:{} eth:{}".format(dpdk_float_values, eth_float_values) + ) + self.verify( + [flag <= 0.1 for flag in test_flag], + "dpdk:{} eth:{},get the incorrect laser power " + "values".format(dpdk_float_values, eth_float_values), + ) + + def verify_laser_Power_in_different_optical_modules(self, laser_powers, *ports): + laser_power_via_dpdk = self.get_nic_laser_power_via_dpdk(ports[-1]) + dpdk_float_values = self.get_float_laser_power_values(laser_power_via_dpdk) + eth_float_values = self.get_float_laser_power_values(laser_powers[0]) + self.logger.info( + "dpdk port 1: {} eth port 0: {}".format( + dpdk_float_values, eth_float_values + ) + ) + test_flag = [ + abs(v_d - v_e) for v_d, v_e in zip(dpdk_float_values, eth_float_values) + ] + self.verify( + [flag > 0.1 for flag in test_flag], + "different optical modules should have different laser power " "values", + ) + + def verify_laser_Power_in_same_optical_modules(self, laser_powers, *ports): + laser_power_via_dpdk = self.get_nic_laser_power_via_dpdk(ports[-1]) + dpdk_float_values = self.get_float_laser_power_values(laser_power_via_dpdk) + eth_float_values = self.get_float_laser_power_values(laser_powers[0]) + self.logger.info( + "dpdk port 1: {} eth port 0: {}".format( + dpdk_float_values, eth_float_values + ) + ) + test_flag = [ + abs(v_d - v_e) for v_d, v_e in zip(dpdk_float_values, eth_float_values) + ] + self.verify( + [flag <= 0.1 for flag in test_flag], + "same optical modules should have same laser power " "values", + ) + + def get_float_laser_power_values(self, output): + p = re.findall(r"(\d+\.\d+.)", output) + float_list = list(map(float, p)) + return float_list + + def get_nic_laser_power_via_ethtool(self, intf): + output = self.d_a_console( + "ethtool -m {} | grep 'Laser output power'".format(intf) + ) + rex_output = re.search(r"Laser output power\s+:.*", output) + if not rex_output: + return False + return rex_output.group() + + def get_nic_laser_power_via_dpdk(self, port): + out = self.start_telemetry_server_and_get_module_eeprom(port) + laser_power_via_dpdk = self.get_nic_laser_power_via_dpdk_rex(out) + return laser_power_via_dpdk + + def get_nic_laser_power_via_dpdk_rex(self, output): + rex_output = re.search(r'"Laser output power":.*?dBm"', output) + if not rex_output: + return False + return rex_output.group() + + def check_interface_link_up(self, intf): + try: + self.dut.is_interface_up(intf) + except Exception as e: + self.d_a_console("ifconfig {} up".format(intf)) + finally: + time.sleep(3) + + def skip_unsupported_get_laser_power(self, *intfs): + laser_power_list = [] + for intf in intfs: + output = self.get_nic_laser_power_via_ethtool(intf) + if not output: + return False + laser_power_list.append(output) + return laser_power_list + # # Test cases. # @@ -550,6 +669,11 @@ class TestTelemetry(TestCase): # get ports information self.dut_ports = self.dut.get_ports() self.verify(len(self.dut_ports) >= 2, "Insufficient ports") + self.pf0_intf = self.dut.ports_info[self.dut_ports[0]]["intf"] + self.pf1_intf = self.dut.ports_info[self.dut_ports[1]]["intf"] + self.tester_iface0 = self.tester.get_interface( + self.tester.get_local_port(self.dut_ports[0]) + ) self.init_test_binary_files() self.nic_grp = self.get_ports_by_nic_type() self.used_ports = [] @@ -559,7 +683,7 @@ class TestTelemetry(TestCase): """ Run before each test case. """ - pass + self.dut.bind_interfaces_linux("vfio-pci") def tear_down(self): """ @@ -585,3 +709,59 @@ class TestTelemetry(TestCase): Stats of 2 ports for testpmd and telemetry with same type nic """ self.verify_same_nic_with_2ports() + + def test_read_nic_laser_power_via_dpdk(self): + """ + read laser power, check testpmd show correct laser power + """ + self.dut.bind_interfaces_linux(self.kdriver) + self.check_interface_link_up(self.pf0_intf) + laser_power_list = self.skip_unsupported_get_laser_power(self.pf0_intf) + self.skip_case(laser_power_list, "The test need Optical module to support") + self.verify_nic_laser_power_via_dpdk(laser_power_list, self.dut_ports[0]) + + def test_check_laser_Power_in_different_optical_modules(self): + """ + set different optical modules in two ports and check the testpmd show different laser power + """ + self.dut.bind_interfaces_linux(self.kdriver) + [self.check_interface_link_up(i) for i in [self.pf0_intf, self.pf1_intf]] + laser_power_list = self.skip_unsupported_get_laser_power( + self.pf0_intf, self.pf1_intf + ) + float_list = [ + self.get_float_laser_power_values(laser_power) + for laser_power in laser_power_list + ] + self.skip_case(laser_power_list, "The test need Optical module to support") + self.skip_case( + abs(float_list[0][0] - float_list[1][0]) > 0.1 + and abs(float_list[0][1] - float_list[1][1]) > 0.1, + "The test need " "different " "optical module " "in two " "ports", + ) + self.verify_laser_Power_in_different_optical_modules( + laser_power_list, self.dut_ports[0], self.dut_ports[1] + ) + + def test_check_laser_Power_in_same_optical_modules(self): + """ + set same optical modules in two ports and check the testpmd show different laser power + """ + self.dut.bind_interfaces_linux(self.kdriver) + [self.check_interface_link_up(i) for i in [self.pf0_intf, self.pf1_intf]] + laser_power_list = self.skip_unsupported_get_laser_power( + self.pf0_intf, self.pf1_intf + ) + float_list = [ + self.get_float_laser_power_values(laser_power) + for laser_power in laser_power_list + ] + self.skip_case(laser_power_list, "The test need Optical module to support") + self.skip_case( + abs(float_list[0][0] - float_list[1][0]) <= 0.1 + and abs(float_list[0][1] - float_list[1][1]) <= 0.1, + "The test need " "same " "optical module " "in two " "ports", + ) + self.verify_laser_Power_in_same_optical_modules( + laser_power_list, self.dut_ports[0], self.dut_ports[1] + )