Merge pull request #1710 from rackerlabs/resync-keystone-to-nautobot

feat: unified nautobot resync workflow

Author: cardoe

python/understack-workflows/pyproject.toml

@@ -39,6 +39,8 @@ netapp-configure-interfaces = "understack_workflows.main.netapp_configure_net:ma
 netapp-create-svm = "understack_workflows.main.netapp_create_svm:main"
 openstack-oslo-event = "understack_workflows.main.openstack_oslo_event:main"
 resync-ironic-nautobot = "understack_workflows.main.resync_ironic_to_nautobot:main"
+resync-keystone-nautobot = "understack_workflows.main.resync_keystone_to_nautobot:main"
+resync-neutron-nautobot = "understack_workflows.main.resync_neutron_to_nautobot:main"
 sync-keystone = "understack_workflows.main.sync_keystone:main"
 sync-network-segment-range = "understack_workflows.main.sync_ucvni_group_range:main"
 undersync-switch = "understack_workflows.main.undersync_switch:main"

python/understack-workflows/tests/test_oslo_event_neutron_network.py

@@ -33,6 +33,13 @@ def test_handle_network_create(network_create_event_data):
     mock_nautobot = Mock()
     mock_nautobot.ipam.namespaces.create.return_value = "123"
 
+    # Mock update to return 404 so create path is taken
+    mock_pynautobot_req = Mock()
+    mock_pynautobot_req.status_code = 404
+    mock_nautobot.plugins.undercloud_vni.ucvnis.update.side_effect = (
+        pynautobot.RequestError(mock_pynautobot_req)
+    )
+
     result = neutron_network.handle_network_create_or_update(
         None, mock_nautobot, network_create_event_data, ucvni_group_name="FOO"
     )
@@ -59,7 +66,8 @@ def test_handle_network_create(network_create_event_data):
 
 def test_handle_network_update(network_update_event_data):
     mock_nautobot = Mock()
-    mock_nautobot.ipam.namespaces.update.return_value = "123"
+    mock_nautobot.ipam.namespaces.create.return_value = "123"
+    mock_nautobot.plugins.undercloud_vni.ucvnis.update.return_value = "updated"
 
     result = neutron_network.handle_network_create_or_update(
         None, mock_nautobot, network_update_event_data, ucvni_group_name="FOO"
@@ -68,9 +76,9 @@ def test_handle_network_update(network_update_event_data):
     mock_nautobot.ipam.namespaces.create.assert_called_once_with(
         name="f4aa4b99-2c2f-4698-a2f0-ac9920b1ee81"
     )
-    mock_nautobot.plugins.undercloud_vni.ucvnis.create.assert_called_once_with(
-        {
-            "id": "f4aa4b99-2c2f-4698-a2f0-ac9920b1ee81",
+    mock_nautobot.plugins.undercloud_vni.ucvnis.update.assert_called_once_with(
+        id="f4aa4b99-2c2f-4698-a2f0-ac9920b1ee81",
+        data={
             "name": "service-net",
             "status": {
                 "name": "Active",
@@ -119,6 +127,34 @@ def test_handle_network_create_idempotent_ucvni(network_create_event_data):
     assert result == 0
 
 
+def test_handle_network_create_duplicate_ucvni_group_and_id(network_create_event_data):
+    """Test that duplicate ucvni_group + ucvni_id combination fails the sync."""
+    mock_nautobot = Mock()
+    mock_nautobot.ipam.namespaces.create.return_value = "123"
+
+    # Mock update to return 404 so create path is taken
+    mock_update_req = Mock()
+    mock_update_req.status_code = 404
+    mock_nautobot.plugins.undercloud_vni.ucvnis.update.side_effect = (
+        pynautobot.RequestError(mock_update_req)
+    )
+
+    # Mock create to fail with duplicate ucvni_group + ucvni_id error
+    mock_create_req = Mock()
+    mock_create_req.status_code = 400
+    mock_create_req.text = "UCVNI with this Ucvni group and UCVNI_ID already exists."
+
+    mock_nautobot.plugins.undercloud_vni.ucvnis.create.side_effect = (
+        pynautobot.RequestError(mock_create_req)
+    )
+
+    result = neutron_network.handle_network_create_or_update(
+        None, mock_nautobot, network_create_event_data, ucvni_group_name="FOO"
+    )
+    # Should return 1 (failure) due to segmentation ID conflict
+    assert result == 1
+
+
 def test_handle_network_delete(network_delete_event_data):
     mock_nautobot_namespace = Mock()
     mock_nautobot_namespace.delete.return_value = "123"

python/understack-workflows/tests/test_resync_ironic_to_nautobot.py

@@ -3,32 +3,10 @@
 from unittest.mock import MagicMock
 from unittest.mock import patch
 
-from understack_workflows.main.resync_ironic_to_nautobot import SyncResult
 from understack_workflows.main.resync_ironic_to_nautobot import argument_parser
 from understack_workflows.main.resync_ironic_to_nautobot import main
 from understack_workflows.main.resync_ironic_to_nautobot import sync_nodes
-
-
-class TestSyncResult:
-    """Test cases for SyncResult dataclass."""
-
-    def test_defaults(self):
-        result = SyncResult()
-        assert result.total == 0
-        assert result.failed == 0
-        assert result.succeeded == 0
-
-    def test_succeeded_calculation(self):
-        result = SyncResult(total=10, failed=3)
-        assert result.succeeded == 7
-
-    def test_all_failed(self):
-        result = SyncResult(total=5, failed=5)
-        assert result.succeeded == 0
-
-    def test_none_failed(self):
-        result = SyncResult(total=5, failed=0)
-        assert result.succeeded == 5
+from understack_workflows.resync import SyncResult
 
 
 class TestArgumentParser:
@@ -37,18 +15,7 @@ class TestArgumentParser:
     def test_default_args(self):
         parser = argument_parser()
         args = parser.parse_args([])
-        assert args.node is None
-        assert args.dry_run is False
-
-    def test_node_arg(self):
-        parser = argument_parser()
-        args = parser.parse_args(["--node", "test-uuid"])
-        assert args.node == "test-uuid"
-
-    def test_dry_run_arg(self):
-        parser = argument_parser()
-        args = parser.parse_args(["--dry-run"])
-        assert args.dry_run is True
+        assert args.nautobot_url is not None or args.nautobot_token is None
 
 
 class TestSyncNodes:
@@ -81,15 +48,15 @@ def test_sync_single_node(self, mock_sync, mock_ironic_class):
         mock_ironic = MagicMock()
         mock_ironic_class.return_value = mock_ironic
         mock_node = MagicMock(uuid="uuid-1", name="node-1")
-        mock_ironic.get_node.return_value = mock_node
+        mock_ironic.list_nodes.return_value = [mock_node]
         mock_sync.return_value = 0
 
         nautobot = MagicMock()
-        result = sync_nodes(nautobot, node_uuid="uuid-1")
+        result = sync_nodes(nautobot)
 
         assert result.total == 1
         assert result.failed == 0
-        mock_ironic.get_node.assert_called_once_with("uuid-1")
+        mock_ironic.list_nodes.assert_called_once()
 
     @patch("understack_workflows.main.resync_ironic_to_nautobot.IronicClient")
     @patch(
@@ -111,33 +78,30 @@ def test_sync_with_failures(self, mock_sync, mock_ironic_class):
         assert result.succeeded == 1
 
     @patch("understack_workflows.main.resync_ironic_to_nautobot.IronicClient")
-    def test_dry_run_skips_sync(self, mock_ironic_class):
+    @patch(
+        "understack_workflows.main.resync_ironic_to_nautobot.sync_device_to_nautobot"
+    )
+    def test_sync_no_nodes(self, mock_sync, mock_ironic_class):
         mock_ironic = MagicMock()
         mock_ironic_class.return_value = mock_ironic
-        mock_node = MagicMock(uuid="uuid-1", name="node-1")
-        mock_ironic.list_nodes.return_value = [mock_node]
+        mock_ironic.list_nodes.return_value = []
 
         nautobot = MagicMock()
-        result = sync_nodes(nautobot, dry_run=True)
+        result = sync_nodes(nautobot)
 
-        assert result.total == 1
+        assert result.total == 0
         assert result.failed == 0
 
 
 class TestMain:
     """Test cases for main function."""
 
     @patch("understack_workflows.main.resync_ironic_to_nautobot.sync_nodes")
-    @patch("understack_workflows.main.resync_ironic_to_nautobot.pynautobot")
-    @patch("understack_workflows.main.resync_ironic_to_nautobot.credential")
+    @patch("understack_workflows.main.resync_ironic_to_nautobot.get_nautobot_client")
     @patch("understack_workflows.main.resync_ironic_to_nautobot.setup_logger")
     @patch("understack_workflows.main.resync_ironic_to_nautobot.argument_parser")
-    def test_main_success(
-        self, mock_parser, mock_logger, mock_cred, mock_pynb, mock_sync
-    ):
+    def test_main_success(self, mock_parser, mock_logger, mock_get_nb, mock_sync):
         mock_args = MagicMock()
-        mock_args.nautobot_token = "token"
-        mock_args.nautobot_url = "http://nautobot"
         mock_args.node = None
         mock_args.dry_run = False
         mock_parser.return_value.parse_args.return_value = mock_args
@@ -148,16 +112,11 @@ def test_main_success(
         assert result == 0
 
     @patch("understack_workflows.main.resync_ironic_to_nautobot.sync_nodes")
-    @patch("understack_workflows.main.resync_ironic_to_nautobot.pynautobot")
-    @patch("understack_workflows.main.resync_ironic_to_nautobot.credential")
+    @patch("understack_workflows.main.resync_ironic_to_nautobot.get_nautobot_client")
     @patch("understack_workflows.main.resync_ironic_to_nautobot.setup_logger")
     @patch("understack_workflows.main.resync_ironic_to_nautobot.argument_parser")
-    def test_main_with_failures(
-        self, mock_parser, mock_logger, mock_cred, mock_pynb, mock_sync
-    ):
+    def test_main_with_failures(self, mock_parser, mock_logger, mock_get_nb, mock_sync):
         mock_args = MagicMock()
-        mock_args.nautobot_token = "token"
-        mock_args.nautobot_url = "http://nautobot"
         mock_args.node = None
         mock_args.dry_run = False
         mock_parser.return_value.parse_args.return_value = mock_args