Fix inspection hook trait handling for adding node traits

Author: stevekeay

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

@@ -102,7 +102,6 @@ def test_with_valid_data(mocker, caplog):
 
     mock_traits.get_trait_names.assert_called_once()
     mock_traits.destroy.assert_called_once_with("CUSTOM_BMC_SWITCH")
-    ironic_understack.update_baremetal_port.objects.TraitList.create.assert_called_once_with(
-        mock_context, 1234, ["CUSTOM_NETWORK_SWITCH", "CUSTOM_STORAGE_SWITCH"]
-    )
+    mock_traits.append.assert_any_call("CUSTOM_NETWORK_SWITCH")
+    mock_traits.append.assert_any_call("CUSTOM_STORAGE_SWITCH")
     mock_node.save.assert_called_once()

python/ironic-understack/ironic_understack/update_baremetal_port.py

@@ -1,6 +1,5 @@
 from typing import Any
 
-import openstack
 from ironic import objects
 from ironic.common import exception
 from ironic.drivers.modules.inspector.hooks import base
@@ -174,34 +173,16 @@ def _set_node_traits(task, vlan_groups: set[str]):
     required_traits = {_trait_name(x) for x in vlan_groups if x}
     existing_traits = set(node.traits.get_trait_names()).intersection(our_traits)
 
-    traits_to_remove = sorted(existing_traits.difference(required_traits))
-    traits_to_add = sorted(required_traits.difference(existing_traits))
-
     LOG.debug(
         "Checking traits for node %s: existing=%s required=%s",
         node.uuid,
         existing_traits,
         required_traits,
     )
-
-    for trait in traits_to_remove:
-        LOG.debug("Removing trait %s from node %s", trait, node.uuid)
-        try:
-            node.traits.destroy(trait)
-        except openstack.exceptions.NotFoundException:
-            pass
-
-    if traits_to_add:
-        LOG.debug("Adding traits %s to node %s", traits_to_add, node.uuid)
-
-        node.traits = objects.TraitList.create(
-            task.context, node.id, list(traits_to_add)
-        )
-
-    if traits_to_add or traits_to_remove:
+    if existing_traits != required_traits:
+        objects.TraitList.create(task.context, task.node.id, required_traits)
         node.save()
 
-
 def _trait_name(vlan_group_name: str) -> str:
     suffix = vlan_group_name.upper().split("-")[-1]
     return f"CUSTOM_{suffix}_SWITCH"