Fix present state for RJ45: Link Up/Down => Port Up/Down

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

Author: stephenxs

scripts/sfpshow

@@ -434,13 +434,13 @@ class SFPShow(object):
         sfp_info_dict = state_db.get_all(self.db.STATE_DB, 'TRANSCEIVER_INFO|{}'.format(interface_name))
         if sfp_info_dict:
             if sfp_info_dict['type'] == RJ45_PORT_TYPE:
-                output = 'Link Up'
+                output = 'Port Up'
             else:
                 output = 'Present'
         else:
             # We have to check whether it is an RJ45 port via calling platform API in case it is absent
             if is_rj45_port(interface_name):
-                output = 'Link Down'
+                output = 'Port Down'
             else:
                 output = 'Not present'
         return output

sfputil/main.py

@@ -738,7 +738,7 @@ def presence(port):
                 sys.exit(ERROR_NOT_IMPLEMENTED)
 
             if is_rj45_port_from_api(logical_port_name):
-                status_string = "Link Up" if presence else "Link Down"
+                status_string = "Port Up" if presence else "Port Down"
             else:
                 status_string = "Present" if presence else "Not present"
             output_table.append([port_name, status_string])

tests/sfp_test.py

@@ -351,31 +351,31 @@ def test_sfp_presence(self):
         result = runner.invoke(show.cli.commands["interfaces"].commands["transceiver"].commands["presence"], ["Ethernet16"])
         expected = """Port        Presence
 ----------  ----------
-Ethernet16  Link Up
+Ethernet16  Port Up
 """
         assert result.exit_code == 0
         assert result.output == expected
 
         result = runner.invoke(show.cli.commands["interfaces"].commands["transceiver"].commands["presence"], ["Ethernet28"])
         expected = """Port        Presence
 ----------  ----------
-Ethernet28  Link Up
+Ethernet28  Port Up
 """
         assert result.exit_code == 0
         assert result.output == expected
 
         result = runner.invoke(show.cli.commands["interfaces"].commands["transceiver"].commands["presence"], ["Ethernet29"])
         expected = """Port        Presence
 ----------  ----------
-Ethernet29  Link Down
+Ethernet29  Port Down
 """
         assert result.exit_code == 0
         assert result.output == expected
 
         result = runner.invoke(show.cli.commands["interfaces"].commands["transceiver"].commands["presence"], ["Ethernet36"])
         expected = """Port        Presence
 ----------  ----------
-Ethernet36  Link Up
+Ethernet36  Port Up
 """
         assert result.exit_code == 0
         assert result.output == expected