Revert the logic to fetch presence status from error status for RJ45 port (#17)

* Revert the logic to fetch presence status from error status

Signed-off-by: Stephen Sun <[email protected]>

* Unit test

Signed-off-by: Stephen Sun <[email protected]>

* Fix error

Signed-off-by: Stephen Sun <[email protected]>

Author: stephenxs

scripts/sfpshow

@@ -431,34 +431,26 @@ class SFPShow(object):
                         self.intf_eeprom[interface] = "SFP EEPROM Not detected\n"
 
 
-    def convert_presence_info_to_cli_output_string(self, state_db, interface_name):
-        sfp_info_dict = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_INFO|{}'.format(interface_name))
-        if not sfp_info_dict:
-            status_string = 'Not present'
-        elif sfp_info_dict.get('type') == RJ45_PORT_TYPE:
-            status = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_STATUS|{}'.format(interface_name))
-            status_string = status.get('error')
-            if status_string == 'N/A':
-                status_string = 'Present'
-        else:
-            status_string = 'Present'
-
-        return status_string
-
     @multi_asic_util.run_on_multi_asic
     def get_presence(self):
         port_table = []
 
         if self.intf_name is not None:
-            presence_str = self.convert_presence_info_to_cli_output_string(self.db, self.intf_name)
-            port_table.append((self.intf_name, presence_str))
+            presence = self.db.exists(self.db.STATE_DB, 'TRANSCEIVER_INFO|{}'.format(self.intf_name))
+            if presence:
+                port_table.append((self.intf_name, 'Present'))
+            else:
+                port_table.append((self.intf_name, 'Not present'))
         else:
             port_table_keys = self.db.keys(self.db.APPL_DB, "PORT_TABLE:*")
             for i in port_table_keys:
                 key = re.split(':', i, maxsplit=1)[-1].strip()
                 if key and key.startswith(front_panel_prefix()) and not key.startswith((backplane_prefix(), inband_prefix(), recirc_prefix())):
-                    presence_str = self.convert_presence_info_to_cli_output_string(self.db, key)
-                    port_table.append((key, presence_str))
+                    presence = self.db.exists(self.db.STATE_DB, 'TRANSCEIVER_INFO|{}'.format(key))
+                    if presence:
+                        port_table.append((key, 'Present'))
+                    else:
+                        port_table.append((key, 'Not present'))
 
         self.table += port_table
 

sfputil/main.py

@@ -740,13 +740,6 @@ def presence(port):
 
         logical_port_list = [port]
 
-    state_db = SonicV2Connector(host='127.0.0.1')
-    if state_db is not None:
-        state_db.connect(state_db.STATE_DB)
-    else:
-        click.echo("Failed to connect to STATE_DB")
-        return
-
     for logical_port_name in logical_port_list:
         ganged = False
         i = 1
@@ -762,19 +755,13 @@ def presence(port):
         for physical_port in physical_port_list:
             port_name = get_physical_port_name(logical_port_name, i, ganged)
 
-            if is_rj45_port_from_db(port_name, state_db):
-                status = state_db.get_all(state_db.STATE_DB, 'TRANSCEIVER_STATUS|{}'.format(port_name))
-                status_string = status.get('error')
-                if status_string == 'N/A':
-                    status_string = 'Present'
-            else:
-                try:
-                    presence = platform_chassis.get_sfp(physical_port).get_presence()
-                except NotImplementedError:
-                    click.echo("This functionality is currently not implemented for this platform")
-                    sys.exit(ERROR_NOT_IMPLEMENTED)
+            try:
+                presence = platform_chassis.get_sfp(physical_port).get_presence()
+            except NotImplementedError:
+                click.echo("This functionality is currently not implemented for this platform")
+                sys.exit(ERROR_NOT_IMPLEMENTED)
 
-                status_string = "Present" if presence else "Not present"
+            status_string = "Present" if presence else "Not present"
             output_table.append([port_name, status_string])
 
             i += 1

tests/mock_tables/state_db.json

@@ -222,8 +222,8 @@
         "error": "N/A"
     },
     "TRANSCEIVER_STATUS|Ethernet16": {
-        "status": "255",
-        "error": "Not present"
+        "status": "0",
+        "error": "N/A"
     },
     "TRANSCEIVER_STATUS|Ethernet28": {
         "status": "0",

tests/sfp_test.py

@@ -350,8 +350,8 @@ def test_sfp_presence(self):
 
         result = runner.invoke(show.cli.commands["interfaces"].commands["transceiver"].commands["presence"], ["Ethernet16"])
         expected = """Port        Presence
-----------  -----------
-Ethernet16  Not present
+----------  ----------
+Ethernet16  Present
 """
         assert result.exit_code == 0
         assert result.output == expected
@@ -367,7 +367,7 @@ def test_sfp_presence(self):
         result = runner.invoke(show.cli.commands["interfaces"].commands["transceiver"].commands["presence"], ["Ethernet36"])
         expected = """Port        Presence
 ----------  ----------
-Ethernet36  Unknown
+Ethernet36  Present
 """
         assert result.exit_code == 0
         assert result.output == expected

tests/sfputil_test.py

@@ -308,8 +308,8 @@ def test_show_presence(self, mock_chassis):
         result = runner.invoke(sfputil.cli.commands['show'].commands['presence'], ["-p", "Ethernet16"])
         assert result.exit_code == 0
         expected_output = """Port        Presence
-----------  -----------
-Ethernet16  Not present
+----------  ----------
+Ethernet16  Present
 """
         assert result.output == expected_output
 
@@ -325,7 +325,7 @@ def test_show_presence(self, mock_chassis):
         assert result.exit_code == 0
         expected_output = """Port        Presence
 ----------  ----------
-Ethernet36  Unknown
+Ethernet36  Present
 """
         assert result.output == expected_output