Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/116453/?format=api
http://patches.dpdk.org/api/patches/116453/?format=api", "web_url": "http://patches.dpdk.org/project/dts/patch/20220920114352.18414-2-zhiminx.huang@intel.com/", "project": { "id": 3, "url": "http://patches.dpdk.org/api/projects/3/?format=api", "name": "DTS", "link_name": "dts", "list_id": "dts.dpdk.org", "list_email": "dts@dpdk.org", "web_url": "", "scm_url": "git://dpdk.org/tools/dts", "webscm_url": "http://git.dpdk.org/tools/dts/", "list_archive_url": "https://inbox.dpdk.org/dts", "list_archive_url_format": "https://inbox.dpdk.org/dts/{}", "commit_url_format": "" }, "msgid": "<20220920114352.18414-2-zhiminx.huang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20220920114352.18414-2-zhiminx.huang@intel.com", "date": "2022-09-20T11:43:52", "name": "[V3,2/2] tests/telemetry:add cases to check laser power in dpdk", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ecdb1f9450414ab3c60b34ba2509a47eab7625e0", "submitter": { "id": 1685, "url": "http://patches.dpdk.org/api/people/1685/?format=api", "name": "Huang, ZhiminX", "email": "zhiminx.huang@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dts/patch/20220920114352.18414-2-zhiminx.huang@intel.com/mbox/", "series": [ { "id": 24718, "url": "http://patches.dpdk.org/api/series/24718/?format=api", "web_url": "http://patches.dpdk.org/project/dts/list/?series=24718", "date": "2022-09-20T11:43:51", "name": "[V3,1/2] test_plans/telemetry_test_plan:add cases to check laser power in dpdk", "version": 3, "mbox": "http://patches.dpdk.org/series/24718/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/116453/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/116453/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dts-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 77B62A00C4;\n\tTue, 20 Sep 2022 05:31:03 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 72A8640DFB;\n\tTue, 20 Sep 2022 05:31:03 +0200 (CEST)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n by mails.dpdk.org (Postfix) with ESMTP id 870D44069B\n for <dts@dpdk.org>; Tue, 20 Sep 2022 05:31:01 +0200 (CEST)", "from fmsmga007.fm.intel.com ([10.253.24.52])\n by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Sep 2022 20:31:01 -0700", "from unknown (HELO localhost.localdomain) ([10.239.252.93])\n by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Sep 2022 20:30:59 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1663644662; x=1695180662;\n h=from:to:cc:subject:date:message-id:in-reply-to: references;\n bh=H8HD1o80zKFJSHqYNQGaHNHav2T39gr2Ac1Sf8f+sBo=;\n b=RvjkrhVgS7Q6CDjTZXEN/2U1sUn9JYWFfS5lIdgryXk0BpsRd1UDgrzS\n dNgohyRStZH0pX/xaS5Sw875Yjfk8w9tK3vuBj0bYHSmsNb6/SHJ5bcqK\n a31SxWTmkLugBuE5bQ84ccmtfVtUMlcHWIR3Z8qxw2FmrZ2PrvgMzDvb+\n b55raUaIHPYnYkEFATRcgT2Q3UsbQRzCC4Zp2ObJ0O0HGde6iWomGZi7X\n 6u6la47M59XP3pwEVYgoMrerjJ78c3lEv+EDkCmmaBHBLPxWp/ztx9G+r\n 1cvhCXVstU9znXUNAyCkelf0DZRQM5kR5S5LyMfd86iyzOf2u4zdnKAzI Q==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10475\"; a=\"325884528\"", "E=Sophos;i=\"5.93,329,1654585200\"; d=\"scan'208\";a=\"325884528\"", "E=Sophos;i=\"5.93,329,1654585200\"; d=\"scan'208\";a=\"621101453\"" ], "From": "Zhimin Huang <zhiminx.huang@intel.com>", "To": "dts@dpdk.org", "Cc": "Zhimin Huang <zhiminx.huang@intel.com>", "Subject": "[dts][PATCH V3 2/2] tests/telemetry:add cases to check laser power in\n dpdk", "Date": "Tue, 20 Sep 2022 19:43:52 +0800", "Message-Id": "<20220920114352.18414-2-zhiminx.huang@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20220920114352.18414-1-zhiminx.huang@intel.com>", "References": "<20220920114352.18414-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 <dts.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dts/>", "List-Post": "<mailto:dts@dpdk.org>", "List-Help": "<mailto:dts-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>", "Errors-To": "dts-bounces@dpdk.org" }, "content": "the customer need to get the laser power values in dpdk.\nso a new telemtry command /ethdev/module_eeprom to show module\nEEPROM for each port in dpdk22.07.\nwe add new test cases to check laser power value.\n1.check the laser power values same as that of 'ethtool -m'.\n2.check different/same optical modules have different/same laser power values.\n\nSigned-off-by: Zhimin Huang <zhiminx.huang@intel.com>\nAcked-by: Peng, Yuan <yuan.peng@intel.com>\nTested-by: Jiale Song < songx.jiale@intel.com>\n---\nv3:\n-add more comments in testplan\n\n tests/TestSuite_telemetry.py | 184 ++++++++++++++++++++++++++++++++++-\n 1 file changed, 183 insertions(+), 1 deletion(-)", "diff": "diff --git a/tests/TestSuite_telemetry.py b/tests/TestSuite_telemetry.py\nindex 97c1c748..1dda5502 100644\n--- a/tests/TestSuite_telemetry.py\n+++ b/tests/TestSuite_telemetry.py\n@@ -539,6 +539,127 @@ class TestTelemetry(TestCase):\n self.close_telemetry_server()\n raise Exception(e)\n \n+ def start_telemetry_server_and_get_module_eeprom(self, port_id):\n+ try:\n+ self.change_flag = True\n+ self.dut.bind_interfaces_linux(\"vfio-pci\")\n+ out = self.start_telemetry_server()\n+ self.tester.is_interface_up(self.tester_iface0)\n+ p = re.search(\"socket /var/run/dpdk/(.+?)/\", out)\n+ self.start_dpdk_telemetry(p.group(1))\n+ module_eeprom_output = self.dut_telemetry.send_expect(\n+ \"/ethdev/module_eeprom,{}\".format(port_id), \"--> \"\n+ )\n+ self.close_telemetry_server()\n+ return module_eeprom_output\n+ except Exception as e:\n+ self.close_telemetry_server()\n+ raise Exception(e)\n+\n+ def start_dpdk_telemetry(self, *args):\n+ self.dut_telemetry = self.dut.new_session()\n+ dpdk_tool = os.path.join(self.target_dir, \"usertools/dpdk-telemetry.py\")\n+ self.dut_telemetry.send_expect(\n+ \"python3 \" + dpdk_tool + \" -f {}\".format(args[0]), \"--> \", 5\n+ )\n+\n+ def verify_nic_laser_power_via_dpdk(self, laser_powers, *ports):\n+ if isinstance(laser_powers, str):\n+ laser_powers = [laser_powers]\n+ for laser_power, port in zip(laser_powers, ports):\n+ laser_power_via_dpdk = self.get_nic_laser_power_via_dpdk(port)\n+ dpdk_float_values = self.get_float_laser_power_values(laser_power_via_dpdk)\n+ eth_float_values = self.get_float_laser_power_values(laser_power)\n+ test_flag = [\n+ abs(v_d - v_e) for v_d, v_e in zip(dpdk_float_values, eth_float_values)\n+ ]\n+ self.logger.info(\n+ \"dpdk:{} eth:{}\".format(dpdk_float_values, eth_float_values)\n+ )\n+ self.verify(\n+ [flag <= 0.1 for flag in test_flag],\n+ \"dpdk:{} eth:{},get the incorrect laser power values\".format(\n+ dpdk_float_values, eth_float_values\n+ ),\n+ )\n+\n+ def verify_laser_Power_in_different_optical_modules(self, laser_powers, *ports):\n+ laser_power_via_dpdk = self.get_nic_laser_power_via_dpdk(ports[-1])\n+ dpdk_float_values = self.get_float_laser_power_values(laser_power_via_dpdk)\n+ eth_float_values = self.get_float_laser_power_values(laser_powers[0])\n+ self.logger.info(\n+ \"dpdk port 1: {} eth port 0: {}\".format(\n+ dpdk_float_values, eth_float_values\n+ )\n+ )\n+ test_flag = [\n+ abs(v_d - v_e) for v_d, v_e in zip(dpdk_float_values, eth_float_values)\n+ ]\n+ self.verify(\n+ [flag > 0.1 for flag in test_flag],\n+ \"different optical modules should have different laser power values\",\n+ )\n+\n+ def verify_laser_Power_in_same_optical_modules(self, laser_powers, *ports):\n+ laser_power_via_dpdk = self.get_nic_laser_power_via_dpdk(ports[-1])\n+ dpdk_float_values = self.get_float_laser_power_values(laser_power_via_dpdk)\n+ eth_float_values = self.get_float_laser_power_values(laser_powers[0])\n+ self.logger.info(\n+ \"dpdk port 1: {} eth port 0: {}\".format(\n+ dpdk_float_values, eth_float_values\n+ )\n+ )\n+ test_flag = [\n+ abs(v_d - v_e) for v_d, v_e in zip(dpdk_float_values, eth_float_values)\n+ ]\n+ self.verify(\n+ [flag <= 0.1 for flag in test_flag],\n+ \"same optical modules should have same laser power values\",\n+ )\n+\n+ def get_float_laser_power_values(self, output):\n+ p = re.findall(r\"(\\d+\\.\\d+.)\", output)\n+ float_list = list(map(float, p))\n+ return float_list\n+\n+ def get_nic_laser_power_via_ethtool(self, intf):\n+ output = self.d_a_console(\n+ \"ethtool -m {} | grep 'Laser output power'\".format(intf)\n+ )\n+ rex_output = re.search(r\"Laser output power\\s+:.*\", output)\n+ if not rex_output:\n+ return False\n+ return rex_output.group()\n+\n+ def get_nic_laser_power_via_dpdk(self, port):\n+ out = self.start_telemetry_server_and_get_module_eeprom(port)\n+ laser_power_via_dpdk = self.get_nic_laser_power_via_dpdk_rex(out)\n+ return laser_power_via_dpdk\n+\n+ def get_nic_laser_power_via_dpdk_rex(self, output):\n+ rex_output = re.search(r'\"Laser output power\":.*?dBm\"', output)\n+ if not rex_output:\n+ return False\n+ return rex_output.group()\n+\n+ def check_interface_link_up(self, intf):\n+ try:\n+ link = self.dut.is_interface_up(intf)\n+ self.verify(link, \"link is down\")\n+ except Exception as e:\n+ self.d_a_console(\"ifconfig {} up\".format(intf))\n+ finally:\n+ time.sleep(3)\n+\n+ def skip_unsupported_get_laser_power(self, *intfs):\n+ laser_power_list = []\n+ for intf in intfs:\n+ output = self.get_nic_laser_power_via_ethtool(intf)\n+ if not output:\n+ return False\n+ laser_power_list.append(output)\n+ return laser_power_list\n+\n #\n # Test cases.\n #\n@@ -550,6 +671,11 @@ class TestTelemetry(TestCase):\n # get ports information\n self.dut_ports = self.dut.get_ports()\n self.verify(len(self.dut_ports) >= 2, \"Insufficient ports\")\n+ self.pf0_intf = self.dut.ports_info[self.dut_ports[0]][\"intf\"]\n+ self.pf1_intf = self.dut.ports_info[self.dut_ports[1]][\"intf\"]\n+ self.tester_iface0 = self.tester.get_interface(\n+ self.tester.get_local_port(self.dut_ports[0])\n+ )\n self.init_test_binary_files()\n self.nic_grp = self.get_ports_by_nic_type()\n self.used_ports = []\n@@ -559,7 +685,7 @@ class TestTelemetry(TestCase):\n \"\"\"\n Run before each test case.\n \"\"\"\n- pass\n+ self.dut.bind_interfaces_linux(\"vfio-pci\")\n \n def tear_down(self):\n \"\"\"\n@@ -585,3 +711,59 @@ class TestTelemetry(TestCase):\n Stats of 2 ports for testpmd and telemetry with same type nic\n \"\"\"\n self.verify_same_nic_with_2ports()\n+\n+ def test_read_nic_laser_power_via_dpdk(self):\n+ \"\"\"\n+ read laser power, check testpmd show correct laser power\n+ \"\"\"\n+ self.dut.bind_interfaces_linux(self.kdriver)\n+ self.check_interface_link_up(self.pf0_intf)\n+ laser_power_list = self.skip_unsupported_get_laser_power(self.pf0_intf)\n+ self.skip_case(laser_power_list, \"The test need Optical module to support\")\n+ self.verify_nic_laser_power_via_dpdk(laser_power_list, self.dut_ports[0])\n+\n+ def test_check_laser_power_in_different_optical_modules(self):\n+ \"\"\"\n+ set different optical modules in two ports and check the testpmd show different laser power\n+ \"\"\"\n+ self.dut.bind_interfaces_linux(self.kdriver)\n+ [self.check_interface_link_up(i) for i in [self.pf0_intf, self.pf1_intf]]\n+ laser_power_list = self.skip_unsupported_get_laser_power(\n+ self.pf0_intf, self.pf1_intf\n+ )\n+ self.skip_case(laser_power_list, \"The test need Optical module to support\")\n+ float_list = [\n+ self.get_float_laser_power_values(laser_power)\n+ for laser_power in laser_power_list\n+ ]\n+ self.skip_case(\n+ abs(float_list[0][0] - float_list[1][0]) > 0.1\n+ and abs(float_list[0][1] - float_list[1][1]) > 0.1,\n+ \"The test need different optical module in two ports\",\n+ )\n+ self.verify_laser_Power_in_different_optical_modules(\n+ laser_power_list, self.dut_ports[0], self.dut_ports[1]\n+ )\n+\n+ def test_check_laser_power_in_same_optical_modules(self):\n+ \"\"\"\n+ set same optical modules in two ports and check the testpmd show same laser power\n+ \"\"\"\n+ self.dut.bind_interfaces_linux(self.kdriver)\n+ [self.check_interface_link_up(i) for i in [self.pf0_intf, self.pf1_intf]]\n+ laser_power_list = self.skip_unsupported_get_laser_power(\n+ self.pf0_intf, self.pf1_intf\n+ )\n+ self.skip_case(laser_power_list, \"The test need Optical module to support\")\n+ float_list = [\n+ self.get_float_laser_power_values(laser_power)\n+ for laser_power in laser_power_list\n+ ]\n+ self.skip_case(\n+ abs(float_list[0][0] - float_list[1][0]) <= 0.1\n+ and abs(float_list[0][1] - float_list[1][1]) <= 0.1,\n+ \"The test need same optical module in two ports\",\n+ )\n+ self.verify_laser_Power_in_same_optical_modules(\n+ laser_power_list, self.dut_ports[0], self.dut_ports[1]\n+ )\n", "prefixes": [ "V3", "2/2" ] }{ "id": 116453, "url": "