[xcvrd] Fix xcvrd crash on other port prefixes (sonic-net#123)

Implement a better check for logical_port_name_to_physical_port_list function. Currently it will only accept names that start with "Ethernet". If we try to add other ports it will crash. In the future Arista will implement other port types. For example "Recirc0". Co-authored-by: Zhi Yuan Carl Zhao <[email protected]>
carl-nokia · Feb 23, 2021 · b9381a5 · b9381a5
1 parent c3c1a59
commit b9381a5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/sonic-xcvrd/xcvrd/xcvrd.py b/sonic-xcvrd/xcvrd/xcvrd.py
@@ -105,14 +105,14 @@
 
 
 def logical_port_name_to_physical_port_list(port_name):
-    if port_name.startswith("Ethernet"):
+    try:
+        return [int(port_name)]
+    except ValueError:
         if platform_sfputil.is_logical_port(port_name):
             return platform_sfputil.get_logical_to_physical(port_name)
         else:
             helper_logger.log_error("Invalid port '{}'".format(port_name))
             return None
-    else:
-        return [int(port_name)]
 
 # Get physical port name