Force use of qualified switch names in local_link_info

These need to be consistent with existing data.

Author: stevekeay

python/ironic-understack/ironic_understack/inspected_port.py

@@ -21,12 +21,12 @@ def local_link_connection(self) -> dict:
 
     @property
     def parsed_name(self) -> dict[str, str]:
-        parts = self.switch_system_name.split(".", maxsplit=1)
-        if len(parts) != 2:
+        parts = self.switch_system_name.split(".")
+        if len(parts) < 2:
             raise ValueError(
                 "Failed to parse switch hostname - expecting name.dc in %s", self
             )
-        switch_name, data_center_name = parts
+        switch_name, data_center_name = parts[0:2]
 
         parts = switch_name.rsplit("-", maxsplit=1)
         if len(parts) != 2:

python/ironic-understack/ironic_understack/tests/test_update_baremetal_port.py

@@ -3,7 +3,6 @@
 import ironic.objects
 from oslo_utils import uuidutils
 
-import ironic_understack
 from ironic_understack.update_baremetal_port import UpdateBaremetalPortsHook
 
 # load some metaprgramming normally taken care of during Ironic initialization:
@@ -95,7 +94,7 @@ def test_with_valid_data(mocker, caplog):
     assert mock_port.local_link_connection == {
         "port_id": "Ethernet1/18",
         "switch_id": "88:5a:92:ec:54:59",
-        "switch_info": "f20-3-1.iad3",
+        "switch_info": "f20-3-1.iad3.rackspace.net",
     }
     assert mock_port.physical_network == "f20-3-network"
     mock_port.save.assert_called()

python/ironic-understack/ironic_understack/update_baremetal_port.py

@@ -34,7 +34,7 @@ def __call__(self, task, inventory, plugin_data):
 
         - local_link_info.port_id (e.g. "Ethernet1/1")
         - local_link_info.switch_id (e.g. "aa:bb:cc:dd:ee:ff")
-        - local_link_info.switch_info (e.g. "a1-1-1.ord1")
+        - local_link_info.switch_info (e.g. "a1-1-1.ord1.rackspace.net")
         - physical_network (e.g. "a1-1-network")
 
         We also add or remove node "traits" based on the inventory data.  We
@@ -72,14 +72,21 @@ def _parse_plugin_data(plugin_data: dict) -> list[InspectedPort]:
         InspectedPort(
             mac_address=mac[name],
             name=name,
-            switch_system_name=str(lldp["switch_system_name"]).lower(),
+            switch_system_name=_normalise_switch_name(lldp["switch_system_name"]),
             switch_chassis_id=str(lldp["switch_chassis_id"]).lower(),
             switch_port_id=str(lldp["switch_port_id"]),
         )
         for name, lldp in plugin_data["parsed_lldp"].items()
     ]
 
 
+def _normalise_switch_name(name: str) -> str:
+    suffix = ".rackspace.net"
+    name = str(name).lower()
+    name = name if name.endswith(suffix) else name + suffix
+    return name
+
+
 def _update_port_attrs(task, ports_by_mac, vlan_groups, node_uuid):
     for baremetal_port in ironic_ports_for_node(task.context, task.node.id):
         inspected_port = ports_by_mac.get(baremetal_port.address)