Merge pull request #938 from rackerlabs/sync-all-projects

fix: Sync all openstack projects to nautobot, not just the user ones

Author: stevekeay

python/understack-workflows/tests/conftest.py

@@ -60,8 +60,15 @@ def _get_project(project_id):
                 "id": project_id,
                 "domain_id": project_data["domain_id"].hex,
             }
-            return openstack.identity.v3.project.Project(**data)
-        raise openstack.exceptions.NotFoundException
+        elif project_id == project_data["domain_id"].hex:
+            data = {
+                **project_data,
+                "id": project_data["domain_id"].hex,
+                "domain_id": "default",
+            }
+        else:
+            raise openstack.exceptions.NotFoundException
+        return openstack.identity.v3.project.Project(**data)
 
     conn = MagicMock(spec_set=openstack.connection.Connection)
     conn.identity.get_project.side_effect = _get_project
@@ -111,4 +118,6 @@ def nautobot(requests_mock, nautobot_url: str, tenant_data: dict) -> Nautobot:
     requests_mock.get(tenant_data["url"], json=tenant_data)
     requests_mock.delete(tenant_data["url"])
     requests_mock.post(f"{nautobot_url}/api/tenancy/tenants/", json=tenant_data)
+    requests_mock.patch(tenant_data["url"], json=tenant_data)
+
     return Nautobot(nautobot_url, "blah")

python/understack-workflows/tests/test_sync_keystone.py

@@ -4,11 +4,9 @@
 import pytest
 from pytest_lazy_fixtures import lf
 
-from understack_workflows.domain import DefaultDomain
 from understack_workflows.main.sync_keystone import Event
 from understack_workflows.main.sync_keystone import argument_parser
 from understack_workflows.main.sync_keystone import do_action
-from understack_workflows.main.sync_keystone import is_valid_domain
 
 
 @pytest.mark.parametrize(
@@ -23,16 +21,14 @@
         ),
         (
             [
-                "--only-domain",
-                lf("domain_id"),
                 "identity.project.created",
                 lf("project_id"),
             ],
             nullcontext(),
             lf("project_id"),
         ),
         (
-            ["--only-domain", "default", "identity.project.created", lf("project_id")],
+            ["identity.project.created", lf("project_id")],
             nullcontext(),
             lf("project_id"),
         ),
@@ -46,69 +42,34 @@ def test_parse_object_id(arg_list, context, expected_id):
         assert args.object == expected_id
 
 
-@pytest.mark.parametrize(
-    "only_domain,expected",
-    [
-        (None, True),
-        (DefaultDomain(), False),
-        (lf("domain_id"), True),
-    ],
-)
-def test_is_valid_domain(os_conn, project_id, only_domain, expected):
-    assert is_valid_domain(os_conn, project_id, only_domain) == expected
-
-
-@pytest.mark.parametrize(
-    "only_domain",
-    [
-        None,
-        lf("domain_id"),
-        uuid.uuid4(),
-    ],
-)
 def test_create_project(
     os_conn,
     nautobot,
     project_id: uuid.UUID,
-    only_domain: uuid.UUID | DefaultDomain | None,
+    domain_id: uuid.UUID,
 ):
-    ret = do_action(os_conn, nautobot, Event.ProjectCreate, project_id, only_domain)
-    os_conn.identity.get_project.assert_called_with(project_id.hex)
+    ret = do_action(os_conn, nautobot, Event.ProjectCreate, project_id)
+    os_conn.identity.get_project.assert_any_call(domain_id.hex)
+    os_conn.identity.get_project.assert_any_call(project_id.hex)
     assert ret == 0
 
 
-@pytest.mark.parametrize(
-    "only_domain",
-    [
-        None,
-        lf("domain_id"),
-        uuid.uuid4(),
-    ],
-)
 def test_update_project(
     os_conn,
     nautobot,
     project_id: uuid.UUID,
-    only_domain: uuid.UUID | DefaultDomain | None,
+    domain_id: uuid.UUID,
 ):
-    ret = do_action(os_conn, nautobot, Event.ProjectUpdate, project_id, only_domain)
-    os_conn.identity.get_project.assert_called_with(project_id.hex)
+    ret = do_action(os_conn, nautobot, Event.ProjectUpdate, project_id)
+    os_conn.identity.get_project.assert_any_call(domain_id.hex)
+    os_conn.identity.get_project.assert_any_call(project_id.hex)
     assert ret == 0
 
 
-@pytest.mark.parametrize(
-    "only_domain",
-    [
-        None,
-        lf("domain_id"),
-        uuid.uuid4(),
-    ],
-)
 def test_delete_project(
     os_conn,
     nautobot,
     project_id: uuid.UUID,
-    only_domain: uuid.UUID | DefaultDomain | None,
 ):
-    ret = do_action(os_conn, nautobot, Event.ProjectDelete, project_id, only_domain)
+    ret = do_action(os_conn, nautobot, Event.ProjectDelete, project_id)
     assert ret == 0

python/understack-workflows/understack_workflows/bmc_chassis_info.py

@@ -100,8 +100,7 @@ def combine_lldp(lldp, interface) -> InterfaceInfo:
     lldp_entry = lldp.get(name, lldp.get(alternate_name, {}))
     if not lldp_entry:
         logger.info(
-            "LLDP info from BMC is missing for %s or %s, "
-            "we only have LLDP info for %s",
+            "LLDP info from BMC is missing for %s or %s, we only have LLDP info for %s",
             name,
             alternate_name,
             list(lldp.keys()),

python/understack-workflows/understack_workflows/bmc_credentials.py

@@ -144,7 +144,7 @@ def _redfish_request(
         )
         if response.status_code >= 400:
             raise Exception(
-                f"Redfish HTTP {response.status_code} " f"from {uri}: {response.text}"
+                f"Redfish HTTP {response.status_code} from {uri}: {response.text}"
             )
 
         else:

python/understack-workflows/understack_workflows/domain.py

@@ -3,8 +3,6 @@
 import uuid
 from enum import StrEnum
 
-from understack_workflows.domain import DefaultDomain
-from understack_workflows.domain import domain_id
 from understack_workflows.helpers import credential
 from understack_workflows.helpers import parser_nautobot_args
 from understack_workflows.helpers import setup_logger
@@ -39,11 +37,6 @@ def argument_parser():
         help="Cloud to load. default: %(default)s",
     )
 
-    parser.add_argument(
-        "--only-domain",
-        type=domain_id,
-        help="Only operate on projects from specified domain",
-    )
     parser.add_argument("event", type=Event, choices=[item.value for item in Event])
     parser.add_argument(
         "object", type=uuid.UUID, help="Keystone ID of object the event happened on"
@@ -53,25 +46,6 @@ def argument_parser():
     return parser
 
 
-def is_valid_domain(
-    conn: Connection,
-    project_id: uuid.UUID,
-    only_domain: uuid.UUID | DefaultDomain | None,
-) -> bool:
-    if only_domain is None:
-        return True
-    project = conn.identity.get_project(project_id.hex)  # type: ignore
-    ret = project.domain_id == only_domain.hex
-    if not ret:
-        logger.info(
-            "keystone project %s part of domain %s and not %s",
-            project_id,
-            project.domain_id,
-            only_domain,
-        )
-    return ret
-
-
 def _create_outside_network(conn: Connection, project_id: uuid.UUID):
     network = _find_outside_network(conn, project_id.hex)
     if network:
@@ -120,44 +94,60 @@ def _find_outside_network(conn: Connection, project_id: str):
     )
 
 
+def _tenant_attrs(conn: Connection, project_id: uuid.UUID) -> tuple[str, str]:
+    project = conn.identity.get_project(project_id.hex)  # type: ignore
+    domain_id = project.domain_id
+
+    if domain_id == "default":
+        domain_name = "default"
+    else:
+        domain = conn.identity.get_project(domain_id)  # type: ignore
+        domain_name = domain.name
+
+    tenant_name = f"{domain_name}:{project.name}"
+    return tenant_name, str(project.description)
+
+
 def handle_project_create(
     conn: Connection, nautobot: Nautobot, project_id: uuid.UUID
 ) -> int:
-    logger.info("got request to create tenant %s", project_id)
-    project = conn.identity.get_project(project_id.hex)  # type: ignore
-    ten_api = nautobot.session.tenancy.tenants
+    logger.info("got request to create tenant %s", project_id.hex)
+    tenant_name, tenant_description = _tenant_attrs(conn, project_id)
+
+    nautobot_tenant_api = nautobot.session.tenancy.tenants
     try:
-        ten = ten_api.create(
-            id=str(project_id), name=project.name, description=project.description
+        tenant = nautobot_tenant_api.create(
+            id=str(project_id), name=tenant_name, description=tenant_description
         )
         _create_outside_network(conn, project_id)
     except Exception:
         logger.exception(
-            "Unable to create project %s / %s", str(project_id), project.name
+            "Unable to create project %s / %s", str(project_id), tenant_name
         )
         return _EXIT_API_ERROR
 
-    logger.info("tenant %s created %s", project_id, ten.created)  # type: ignore
+    logger.info("tenant %s created %s", project_id, tenant.created)  # type: ignore
     return _EXIT_SUCCESS
 
 
 def handle_project_update(
     conn: Connection, nautobot: Nautobot, project_id: uuid.UUID
 ) -> int:
-    logger.info("got request to update tenant %s", project_id)
-    project = conn.identity.get_project(project_id.hex)  # type: ignore
-    tenant_api = nautobot.session.tenancy.tenants
+    logger.info("got request to update tenant %s", project_id.hex)
+    tenant_name, tenant_description = _tenant_attrs(conn, project_id)
 
+    tenant_api = nautobot.session.tenancy.tenants
     existing_tenant = tenant_api.get(project_id)
     logger.info("existing_tenant: %s", existing_tenant)
     try:
         if existing_tenant is None:
             new_tenant = tenant_api.create(
-                id=str(project_id), name=project.name, description=project.description
+                id=str(project_id), name=tenant_name, description=tenant_description
             )
             logger.info("tenant %s created %s", project_id, new_tenant.created)  # type: ignore
         else:
-            existing_tenant.description = project.description  # type: ignore
+            existing_tenant.name = tenant_name  # type: ignore
+            existing_tenant.description = tenant_description  # type: ignore
             existing_tenant.save()  # type: ignore
             logger.info(
                 "tenant %s last updated %s",
@@ -168,7 +158,7 @@ def handle_project_update(
         _create_outside_network(conn, project_id)
     except Exception:
         logger.exception(
-            "Unable to update project %s / %s", str(project_id), project.name
+            "Unable to update project %s / %s", str(project_id), tenant_name
         )
         return _EXIT_API_ERROR
     return _EXIT_SUCCESS
@@ -194,16 +184,7 @@ def do_action(
     nautobot: Nautobot,
     event: Event,
     project_id: uuid.UUID,
-    only_domain: uuid.UUID | DefaultDomain | None,
 ) -> int:
-    if event in [Event.ProjectCreate, Event.ProjectUpdate] and not is_valid_domain(
-        conn, project_id, only_domain
-    ):
-        logger.info(
-            "keystone project %s not part of %s, skipping", project_id, only_domain
-        )
-        return _EXIT_SUCCESS
-
     match event:
         case Event.ProjectCreate:
             return handle_project_create(conn, nautobot, project_id)
@@ -224,4 +205,4 @@ def main() -> int:
     nb_token = args.nautobot_token or credential("nb-token", "token")
     nautobot = Nautobot(args.nautobot_url, nb_token, logger=logger)
 
-    return do_action(conn, nautobot, args.event, args.object, args.only_domain)
+    return do_action(conn, nautobot, args.event, args.object)

python/understack-workflows/understack_workflows/main/sync_keystone.py

@@ -33,8 +33,6 @@ spec:
         command:
           - sync-keystone
         args:
-          - "--only-domain"
-          - "default"
           - "{{inputs.parameters.event_type}}"
           - "{{inputs.parameters.project_uuid}}"
         volumeMounts: