* [dts] [PATCH V1] Add FW Version
@ 2020-08-13 15:22 David Liu
2020-08-14 8:33 ` Ma, LihongX
0 siblings, 1 reply; 4+ messages in thread
From: David Liu @ 2020-08-13 15:22 UTC (permalink / raw)
To: dts; +Cc: lylavoie, David Liu
Add firmware version test case
Add firmware version test plan
Add firmware version cfg file
Signed-off-by: David Liu <dliu@iol.unh.edu>
---
conf/firmware_version.cfg | 25 ++++
framework/pmd_output.py | 8 +-
test_plans/firmware_version_test_plan.rst | 79 ++++++++++++
tests/TestSuite_firmware_version.py | 148 ++++++++++++++++++++++
4 files changed, 259 insertions(+), 1 deletion(-)
create mode 100644 conf/firmware_version.cfg
create mode 100644 test_plans/firmware_version_test_plan.rst
create mode 100644 tests/TestSuite_firmware_version.py
diff --git a/conf/firmware_version.cfg b/conf/firmware_version.cfg
new file mode 100644
index 0000000..3dce9ea
--- /dev/null
+++ b/conf/firmware_version.cfg
@@ -0,0 +1,25 @@
+# Users could change these configuration on demand:
+#
+# - expected_firmware_version is a dictionary defining expected firmware version.
+# Each diver will have different version format.
+# The pattern for supported expected firmware version:
+#
+# - i40e:
+# {'driver' : ['X.XX', '0x8000XXXX', 'X.X.X']}
+# - mlx5:
+# {'driver' : ['XX.XX.XXXX', 'MT_XXXXXX']}
+# - bnxt:
+# {'driver' : ['XXX.XXX.XXX.XXX/pkg', 'XXX.XXX.XXX.XXX']}
+#
+# Note: run ./dts and use show port info <port_id> command will show you the
+# firmware version.
+#
+# Example:
+# [suite]
+# expected_firmware_version = {
+# 'i40e': ['0x80002919', '5.05', '1.1313.0'],
+# 'mlx5' : ['12.25.6555', 'MT_555555555'],
+# 'bnxt' : ['236.0.222.0/pkg', '216.3.254.0']}
+
+[suite]
+expected_firmware_version = {}
diff --git a/framework/pmd_output.py b/framework/pmd_output.py
index 2d66743..8967b5e 100644
--- a/framework/pmd_output.py
+++ b/framework/pmd_output.py
@@ -1,6 +1,6 @@
# BSD LICENSE
#
-# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+# Copyright(c) 2020 Intel Corporation. All rights reserved
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -237,6 +237,12 @@ class PmdOutput():
"""
return self.get_detail_from_port_info("MAC address: ", "([0-9A-F]{2}:){5}[0-9A-F]{2}", port_id)
+ def get_firmware_version(self, port_id):
+ """
+ Get the firmware version.
+ """
+ return self.get_detail_from_port_info("Firmware-version: ", "\S.*", port_id)
+
def get_port_connect_socket(self, port_id):
"""
Get the socket id which the specified port is connecting with.
diff --git a/test_plans/firmware_version_test_plan.rst b/test_plans/firmware_version_test_plan.rst
new file mode 100644
index 0000000..d9cf47f
--- /dev/null
+++ b/test_plans/firmware_version_test_plan.rst
@@ -0,0 +1,79 @@
+.. # BSD LICENSE
+ #
+ # Copyright(c) 2020 Intel Corporation. All rights reserved
+ # Copyright © 2018[, 2019] The University of New Hampshire. All rights reserved.
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions
+ # are met:
+ #
+ # * Redistributions of source code must retain the above copyright
+ # notice, this list of conditions and the following disclaimer.
+ # * Redistributions in binary form must reproduce the above copyright
+ # notice, this list of conditions and the following disclaimer in
+ # the documentation and/or other materials provided with the
+ # distribution.
+ # * Neither the name of Intel Corporation nor the names of its
+ # contributors may be used to endorse or promote products derived
+ # from this software without specific prior written permission.
+ #
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=======================
+Firmware Version Test
+=======================
+
+The Firmware Version Test checks the firmware version from the device info and
+compares to the firmware version defined by user. This test case is driver
+restricted since each driver will have different version format.
+
+
+Prerequisites
+=============
+
+If using vfio the kernel must be >= 3.6+ and VT-d must be enabled in bios.When
+using vfio, use the following commands to load the vfio driver and bind it
+to the device under test::
+
+ modprobe vfio
+ modprobe vfio-pci
+ usertools/dpdk-devbind.py --bind=vfio-pci device_bus_id
+
+Assuming that ports are up and working, then launch the ``testpmd`` application
+with the following arguments::
+
+ ./build/app/testpmd -- -i --portmask=0x3
+
+Ensure the ```firmware_version.cfg``` file have the correct name and firmware
+version.
+
+Test Case : Firmware Version Test
+===================================
+
+1. Use testpmd to show the port info that contained the firmware version::
+
+ testpmd> show port info <PORT_ID>
+
+2. Compares the outputted firmware version with the firmware version listed in the
+ ```firmware_version.cfg``` file. Different driver will have different version
+ format.
+ Currently support: i40e, mlx5, bnxt
+
+ Example below:
+ {'i40e' : ['5.01', '0x80002341', '1.1.1']}
+ {'mlx5' : ['12.14.3462', 'MT_2416545656']}
+ {'bnxt' : ['236.0.222.0', '216.3.254.0']}
+
+
+3. Verifies they matches.
diff --git a/tests/TestSuite_firmware_version.py b/tests/TestSuite_firmware_version.py
new file mode 100644
index 0000000..85f0833
--- /dev/null
+++ b/tests/TestSuite_firmware_version.py
@@ -0,0 +1,148 @@
+# BSD LICENSE
+#
+# Copyright(c) 2020 Intel Corporation. All rights reserved
+# Copyright © 2018[, 2019] The University of New Hampshire. All rights reserved.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Intel Corporation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""
+DPDK Test suite.
+"""
+from pmd_output import PmdOutput
+from test_case import TestCase
+import re
+
+
+class TestFirmwareVersion(TestCase):
+
+ def set_up_all(self):
+ """
+ Run at the start of each test suite.
+ """
+ self.ports = self.dut.get_ports()
+
+ self.pmdout = PmdOutput(self.dut)
+
+ def set_up(self):
+ """
+ Run before each test case.
+ """
+ pass
+
+ def check_firmware_version(self, exp_fwversion, fwversion):
+ vf = ['major', 'minor', 'path', 'build']
+ fwversion = re.split("\\.", fwversion)
+ exp_fwversion = re.split("\\.", exp_fwversion)
+
+ self.verify(len(exp_fwversion) == len(fwversion), "Invalid version format")
+
+ for i in range(len(exp_fwversion)):
+ if fwversion[i] != exp_fwversion[i] and i == 0:
+ self.verify(False,
+ f"Fail: {vf[i]} version is different expected {exp_fwversion[i]} but was {fwversion[i]}")
+ elif fwversion[i] != exp_fwversion[i] and i > 0:
+ print(f"Warning: {vf[i]} version is different expected {exp_fwversion[i]} but was {fwversion[i]}")
+
+ def check_format(self, exp, out, name, pattern, match):
+ if match is None:
+ self.verify(re.search(pattern, exp) is not None, f"Invalid expected {name} format")
+ self.verify(re.search(pattern, out) is not None, f"Invalid {name} format")
+ else:
+ exp = re.findall(pattern, exp)
+ out = re.findall(pattern, out)
+
+ self.verify(exp[0] == match, f"Invalid expected {name} format")
+ self.verify(out[0] == match, f"Invalid {name} format")
+
+ def test_firmware_version(self):
+ self.pmdout.start_testpmd("Default")
+
+ # Read the version cfg
+ expected_version_list = self.get_suite_cfg()['expected_firmware_version']
+
+ self.verify(self.kdriver in expected_version_list, "driver is not in the cfg file")
+ expected_version_info = expected_version_list[self.kdriver]
+
+ for port in self.ports:
+ out = self.dut.send_expect(f"show port info {port}", "testpmd> ")
+ self.verify("Firmware-version:" in out, "Firmware version not detected")
+
+ version_info = self.pmdout.get_firmware_version(port)
+
+ if self.kdriver == "i40e":
+ # Get the version information from output and cfg file
+ fwversion, etrackid, networkdriver = version_info.split()
+ exp_etrackid, exp_fwversion, exp_networkdriver = expected_version_info
+ self.check_format(exp_fwversion, fwversion, "version", r'^\d{1,4}\.\d{1,4}$', None)
+
+ self.check_firmware_version(exp_fwversion, fwversion)
+
+ self.check_format(exp_etrackid, etrackid, "etrackid", r'^.{0,6}', "0x8000")
+
+ self.check_format(exp_networkdriver, networkdriver,
+ "network driver", r'^\d{1,4}\.\d{1,4}\.\d{1,4}$', None)
+
+ elif self.kdriver == "mlx5":
+ # Get the version information from output and cfg file
+ exp_fwversion, exp_psid = expected_version_info
+ fwversion, psid = version_info.split()
+
+ self.check_format(exp_fwversion, fwversion, "version", r'^\d{1,4}\.\d{1,4}\.\d{1,4}$', None)
+
+ self.check_firmware_version(exp_fwversion, fwversion)
+
+ # remove "(" and ")" from the string
+ psid = re.sub('[()]', '', psid)
+
+ self.check_format(exp_psid, psid, "psid", r'^.{0,3}', "MT_")
+
+ elif self.kdriver == "bnxt":
+ # Get the version information from output and cfg file
+ exp_pkg, exp_fwversion = expected_version_info
+ pkg, fwversion = version_info.split()
+
+ self.check_format(exp_fwversion, fwversion, "version", r'^\d{1,4}\.\d{1,4}\.\d{1,4}\.\d{1,4}$', None)
+
+ self.check_firmware_version(exp_fwversion, fwversion)
+
+ self.check_format(exp_pkg, pkg, "pkg", r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\S{1,3}$', None)
+
+ else:
+ self.verify(False, f"Test: case fails on {self.kdriver} driver")
+
+ def tear_down(self):
+ """
+ Run after each test case.
+ """
+ self.dut.kill_all()
+
+ def tear_down_all(self):
+ """
+ Run after each test suite.
+ """
+ self.dut.kill_all()
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dts] [PATCH V1] Add FW Version
2020-08-13 15:22 [dts] [PATCH V1] Add FW Version David Liu
@ 2020-08-14 8:33 ` Ma, LihongX
2020-08-21 3:06 ` Tu, Lijuan
0 siblings, 1 reply; 4+ messages in thread
From: Ma, LihongX @ 2020-08-14 8:33 UTC (permalink / raw)
To: David Liu, dts; +Cc: lylavoie
Ack-by: lihongx.ma<lihongx.ma@intel.com>
Regards,
Ma,lihong
-----Original Message-----
From: dts <dts-bounces@dpdk.org> On Behalf Of David Liu
Sent: Thursday, August 13, 2020 11:23 PM
To: dts@dpdk.org
Cc: lylavoie@iol.unh.edu; David Liu <dliu@iol.unh.edu>
Subject: [dts] [PATCH V1] Add FW Version
Add firmware version test case
Add firmware version test plan
Add firmware version cfg file
Signed-off-by: David Liu <dliu@iol.unh.edu>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dts] [PATCH V1] Add FW Version
@ 2020-08-13 15:06 David Liu
0 siblings, 0 replies; 4+ messages in thread
From: David Liu @ 2020-08-13 15:06 UTC (permalink / raw)
To: dts; +Cc: lylavoie, David Liu
Add firmware version test case
Add firmware version test plan
Add firmware version cfg file
Signed-off-by: David Liu <dliu@iol.unh.edu>
---
conf/firmware_version.cfg | 25 ++++
framework/pmd_output.py | 8 +-
test_plans/firmware_version_test_plan.rst | 79 ++++++++++++
tests/TestSuite_firmware_version.py | 148 ++++++++++++++++++++++
4 files changed, 259 insertions(+), 1 deletion(-)
create mode 100644 conf/firmware_version.cfg
create mode 100644 test_plans/firmware_version_test_plan.rst
create mode 100644 tests/TestSuite_firmware_version.py
diff --git a/conf/firmware_version.cfg b/conf/firmware_version.cfg
new file mode 100644
index 0000000..149dd47
--- /dev/null
+++ b/conf/firmware_version.cfg
@@ -0,0 +1,25 @@
+# Users could change these configuration on demand:
+#
+# - expected_firmware_version is a dictionary defining expected firmware version.
+# Each diver will have different version format.
+# The pattern for supported expected firmare version:
+#
+# - i40e:
+# {'driver' : ['X.XX', '0x8000XXXX', 'X.X.X']}
+# - mlx5:
+# {'driver' : ['XX.XX.XXXX', 'MT_XXXXXX']}
+# - bnxt:
+# {'driver' : ['XXX.XXX.XXX.XXX/pkg', 'XXX.XXX.XXX.XXX']}
+#
+# Note: run ./dts and use show port info <port_id> command will show you the
+# firmware version.
+#
+# Example:
+# [suite]
+# expected_firmware_version = {
+# 'i40e': ['0x80002919', '5.05', '1.1313.0'],
+# 'mlx5' : ['12.25.6555', 'MT_555555555'],
+# 'bnxt' : ['236.0.222.0/pkg', '216.3.254.0']}
+
+[suite]
+expected_firmware_version = {}
diff --git a/framework/pmd_output.py b/framework/pmd_output.py
index 2d66743..8967b5e 100644
--- a/framework/pmd_output.py
+++ b/framework/pmd_output.py
@@ -1,6 +1,6 @@
# BSD LICENSE
#
-# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+# Copyright(c) 2020 Intel Corporation. All rights reserved
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -237,6 +237,12 @@ class PmdOutput():
"""
return self.get_detail_from_port_info("MAC address: ", "([0-9A-F]{2}:){5}[0-9A-F]{2}", port_id)
+ def get_firmware_version(self, port_id):
+ """
+ Get the firmware version.
+ """
+ return self.get_detail_from_port_info("Firmware-version: ", "\S.*", port_id)
+
def get_port_connect_socket(self, port_id):
"""
Get the socket id which the specified port is connecting with.
diff --git a/test_plans/firmware_version_test_plan.rst b/test_plans/firmware_version_test_plan.rst
new file mode 100644
index 0000000..d9cf47f
--- /dev/null
+++ b/test_plans/firmware_version_test_plan.rst
@@ -0,0 +1,79 @@
+.. # BSD LICENSE
+ #
+ # Copyright(c) 2020 Intel Corporation. All rights reserved
+ # Copyright © 2018[, 2019] The University of New Hampshire. All rights reserved.
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions
+ # are met:
+ #
+ # * Redistributions of source code must retain the above copyright
+ # notice, this list of conditions and the following disclaimer.
+ # * Redistributions in binary form must reproduce the above copyright
+ # notice, this list of conditions and the following disclaimer in
+ # the documentation and/or other materials provided with the
+ # distribution.
+ # * Neither the name of Intel Corporation nor the names of its
+ # contributors may be used to endorse or promote products derived
+ # from this software without specific prior written permission.
+ #
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=======================
+Firmware Version Test
+=======================
+
+The Firmware Version Test checks the firmware version from the device info and
+compares to the firmware version defined by user. This test case is driver
+restricted since each driver will have different version format.
+
+
+Prerequisites
+=============
+
+If using vfio the kernel must be >= 3.6+ and VT-d must be enabled in bios.When
+using vfio, use the following commands to load the vfio driver and bind it
+to the device under test::
+
+ modprobe vfio
+ modprobe vfio-pci
+ usertools/dpdk-devbind.py --bind=vfio-pci device_bus_id
+
+Assuming that ports are up and working, then launch the ``testpmd`` application
+with the following arguments::
+
+ ./build/app/testpmd -- -i --portmask=0x3
+
+Ensure the ```firmware_version.cfg``` file have the correct name and firmware
+version.
+
+Test Case : Firmware Version Test
+===================================
+
+1. Use testpmd to show the port info that contained the firmware version::
+
+ testpmd> show port info <PORT_ID>
+
+2. Compares the outputted firmware version with the firmware version listed in the
+ ```firmware_version.cfg``` file. Different driver will have different version
+ format.
+ Currently support: i40e, mlx5, bnxt
+
+ Example below:
+ {'i40e' : ['5.01', '0x80002341', '1.1.1']}
+ {'mlx5' : ['12.14.3462', 'MT_2416545656']}
+ {'bnxt' : ['236.0.222.0', '216.3.254.0']}
+
+
+3. Verifies they matches.
diff --git a/tests/TestSuite_firmware_version.py b/tests/TestSuite_firmware_version.py
new file mode 100644
index 0000000..85f0833
--- /dev/null
+++ b/tests/TestSuite_firmware_version.py
@@ -0,0 +1,148 @@
+# BSD LICENSE
+#
+# Copyright(c) 2020 Intel Corporation. All rights reserved
+# Copyright © 2018[, 2019] The University of New Hampshire. All rights reserved.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Intel Corporation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""
+DPDK Test suite.
+"""
+from pmd_output import PmdOutput
+from test_case import TestCase
+import re
+
+
+class TestFirmwareVersion(TestCase):
+
+ def set_up_all(self):
+ """
+ Run at the start of each test suite.
+ """
+ self.ports = self.dut.get_ports()
+
+ self.pmdout = PmdOutput(self.dut)
+
+ def set_up(self):
+ """
+ Run before each test case.
+ """
+ pass
+
+ def check_firmware_version(self, exp_fwversion, fwversion):
+ vf = ['major', 'minor', 'path', 'build']
+ fwversion = re.split("\\.", fwversion)
+ exp_fwversion = re.split("\\.", exp_fwversion)
+
+ self.verify(len(exp_fwversion) == len(fwversion), "Invalid version format")
+
+ for i in range(len(exp_fwversion)):
+ if fwversion[i] != exp_fwversion[i] and i == 0:
+ self.verify(False,
+ f"Fail: {vf[i]} version is different expected {exp_fwversion[i]} but was {fwversion[i]}")
+ elif fwversion[i] != exp_fwversion[i] and i > 0:
+ print(f"Warning: {vf[i]} version is different expected {exp_fwversion[i]} but was {fwversion[i]}")
+
+ def check_format(self, exp, out, name, pattern, match):
+ if match is None:
+ self.verify(re.search(pattern, exp) is not None, f"Invalid expected {name} format")
+ self.verify(re.search(pattern, out) is not None, f"Invalid {name} format")
+ else:
+ exp = re.findall(pattern, exp)
+ out = re.findall(pattern, out)
+
+ self.verify(exp[0] == match, f"Invalid expected {name} format")
+ self.verify(out[0] == match, f"Invalid {name} format")
+
+ def test_firmware_version(self):
+ self.pmdout.start_testpmd("Default")
+
+ # Read the version cfg
+ expected_version_list = self.get_suite_cfg()['expected_firmware_version']
+
+ self.verify(self.kdriver in expected_version_list, "driver is not in the cfg file")
+ expected_version_info = expected_version_list[self.kdriver]
+
+ for port in self.ports:
+ out = self.dut.send_expect(f"show port info {port}", "testpmd> ")
+ self.verify("Firmware-version:" in out, "Firmware version not detected")
+
+ version_info = self.pmdout.get_firmware_version(port)
+
+ if self.kdriver == "i40e":
+ # Get the version information from output and cfg file
+ fwversion, etrackid, networkdriver = version_info.split()
+ exp_etrackid, exp_fwversion, exp_networkdriver = expected_version_info
+ self.check_format(exp_fwversion, fwversion, "version", r'^\d{1,4}\.\d{1,4}$', None)
+
+ self.check_firmware_version(exp_fwversion, fwversion)
+
+ self.check_format(exp_etrackid, etrackid, "etrackid", r'^.{0,6}', "0x8000")
+
+ self.check_format(exp_networkdriver, networkdriver,
+ "network driver", r'^\d{1,4}\.\d{1,4}\.\d{1,4}$', None)
+
+ elif self.kdriver == "mlx5":
+ # Get the version information from output and cfg file
+ exp_fwversion, exp_psid = expected_version_info
+ fwversion, psid = version_info.split()
+
+ self.check_format(exp_fwversion, fwversion, "version", r'^\d{1,4}\.\d{1,4}\.\d{1,4}$', None)
+
+ self.check_firmware_version(exp_fwversion, fwversion)
+
+ # remove "(" and ")" from the string
+ psid = re.sub('[()]', '', psid)
+
+ self.check_format(exp_psid, psid, "psid", r'^.{0,3}', "MT_")
+
+ elif self.kdriver == "bnxt":
+ # Get the version information from output and cfg file
+ exp_pkg, exp_fwversion = expected_version_info
+ pkg, fwversion = version_info.split()
+
+ self.check_format(exp_fwversion, fwversion, "version", r'^\d{1,4}\.\d{1,4}\.\d{1,4}\.\d{1,4}$', None)
+
+ self.check_firmware_version(exp_fwversion, fwversion)
+
+ self.check_format(exp_pkg, pkg, "pkg", r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\S{1,3}$', None)
+
+ else:
+ self.verify(False, f"Test: case fails on {self.kdriver} driver")
+
+ def tear_down(self):
+ """
+ Run after each test case.
+ """
+ self.dut.kill_all()
+
+ def tear_down_all(self):
+ """
+ Run after each test suite.
+ """
+ self.dut.kill_all()
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-21 3:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-13 15:22 [dts] [PATCH V1] Add FW Version David Liu
2020-08-14 8:33 ` Ma, LihongX
2020-08-21 3:06 ` Tu, Lijuan
-- strict thread matches above, loose matches on Subject: below --
2020-08-13 15:06 David Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).