fix trait handling: Pass proper context

Author: stevekeay

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

@@ -24,8 +24,9 @@
 def test_with_valid_data(mocker):
     node_uuid = uuidutils.generate_uuid()
     mock_traits = mocker.Mock()
+    mock_context = mocker.Mock()
     mock_node = mocker.Mock(id=1234, traits=mock_traits)
-    mock_task = mocker.Mock(node=mock_node)
+    mock_task = mocker.Mock(node=mock_node, context=mock_context)
     mock_port = mocker.Mock(
         uuid=uuidutils.generate_uuid(),
         node_id=node_uuid,
@@ -52,5 +53,5 @@ def test_with_valid_data(mocker):
 
     mock_traits.get_trait_names.assert_called_once()
     mock_traits.destroy.assert_called_once_with("CUSTOM_NETWORK_SWITCH")
-    mock_traits.create.assert_called_once_with(None, 1234, ["CUSTOM_STORAGE_SWITCH"])
+    mock_traits.create.assert_called_once_with(mock_context, 1234, ["CUSTOM_STORAGE_SWITCH"])
     mock_node.save.assert_called_once()

python/ironic-understack/ironic_understack/update_baremetal_port.py

@@ -196,9 +196,9 @@ def _set_node_traits(task, vlan_groups: set[str]):
     all_possible_suffixes = set(
         CONF.ironic_understack.switch_name_vlan_group_mapping.values()
     )
-    all_traits = { _trait_name(x) for x in all_possible_suffixes }
+    our_traits = { _trait_name(x) for x in all_possible_suffixes }
     required_traits = { _trait_name(x) for x in vlan_groups }
-    existing_traits = set(task.node.traits.get_trait_names()).intersection(all_traits)
+    existing_traits = set(task.node.traits.get_trait_names()).intersection(our_traits)
 
     traits_to_remove = existing_traits.difference(required_traits)
     traits_to_add = required_traits.difference(existing_traits)
@@ -218,7 +218,7 @@ def _set_node_traits(task, vlan_groups: set[str]):
     if traits_to_add:
         LOG.debug("Adding traits %s to node %s", traits_to_add, task.node.uuid)
         task.node.traits = task.node.traits.create(
-            None, task.node.id, list(traits_to_add)
+            task.context, task.node.id, list(traits_to_add)
         )
 
     if traits_to_add or traits_to_remove: