Modify test_get_transceiver_info to handle get_transceiver_info_firmw…

…are_versions API (sonic-net#11708) * Modify test_get_transceiver_info to handle get_transceiver_info_firmware_versions API Signed-off-by: Mihir Patel <patelmi@microsoft.com> * Addressed pre-commit check issues --------- Signed-off-by: Mihir Patel <patelmi@microsoft.com>
mssonicbld · Mar 7, 2024 · 3532b2b · 3532b2b
1 parent 18b456a
commit 3532b2b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/tests/common/helpers/platform_api/sfp.py b/tests/common/helpers/platform_api/sfp.py
@@ -66,6 +66,10 @@ def get_transceiver_info(conn, index):
     return sfp_api(conn, index, 'get_transceiver_info')
 
 
+def get_transceiver_info_firmware_versions(conn, index):
+    return sfp_api(conn, index, 'get_transceiver_info_firmware_versions')
+
+
 def get_transceiver_bulk_status(conn, index):
     return sfp_api(conn, index, 'get_transceiver_bulk_status')
 

diff --git a/tests/platform_tests/api/test_sfp.py b/tests/platform_tests/api/test_sfp.py
@@ -97,17 +97,18 @@ class TestSfpApi(PlatformApiTestBase):
     ]
 
     # some new keys added for QSFP-DD and OSFP in 202205 or later branch
-    EXPECTED_XCVR_NEW_QSFP_DD_OSFP_INFO_KEYS = ['active_firmware',
-                                                'host_lane_count',
+    EXPECTED_XCVR_NEW_QSFP_DD_OSFP_INFO_KEYS = ['host_lane_count',
                                                 'media_lane_count',
                                                 'cmis_rev',
                                                 'host_lane_assignment_option',
-                                                'inactive_firmware',
                                                 'media_interface_technology',
                                                 'media_interface_code',
                                                 'host_electrical_interface',
                                                 'media_lane_assignment_option']
 
+    EXPECTED_XCVR_NEW_QSFP_DD_OSFP_FIRMWARE_INFO_KEYS = ['active_firmware',
+                                                         'inactive_firmware']
+
     # These are fields which have been added in the common parsers
     # in sonic-platform-common/sonic_sfp, but since some vendors are
     # using their own custom parsers, they do not yet provide these
@@ -389,7 +390,14 @@ def test_get_transceiver_info(self, duthosts, enum_rand_one_per_hwsku_hostname,
                             active_apsel_hostlane_count = 8
                             UPDATED_EXPECTED_XCVR_INFO_KEYS = self.EXPECTED_XCVR_INFO_KEYS + \
                                 self.EXPECTED_XCVR_NEW_QSFP_DD_OSFP_INFO_KEYS + \
+                                self.EXPECTED_XCVR_NEW_QSFP_DD_OSFP_FIRMWARE_INFO_KEYS + \
                                 ["active_apsel_hostlane{}".format(n) for n in range(1, active_apsel_hostlane_count + 1)]
+                            firmware_info_dict = sfp.get_transceiver_info_firmware_versions(platform_api_conn, i)
+                            if self.expect(firmware_info_dict is not None,
+                                           "Unable to retrieve transceiver {} firmware info".format(i)):
+                                if self.expect(isinstance(firmware_info_dict, dict),
+                                               "Transceiver {} firmware info appears incorrect".format(i)):
+                                    actual_keys.extend(list(firmware_info_dict.keys()))
                             if 'ZR' in info_dict['media_interface_code']:
                                 UPDATED_EXPECTED_XCVR_INFO_KEYS = UPDATED_EXPECTED_XCVR_INFO_KEYS + \
                                                                   self.QSFPZR_EXPECTED_XCVR_INFO_KEYS