osism 0.20250331.0__py3-none-any.whl → 0.20250425.0__py3-none-any.whl

osism/api.py

@@ -7,11 +7,10 @@ from uuid import UUID
 
 from fastapi import FastAPI, Header, Request, Response
 from pydantic import BaseModel
-import pynetbox
 from starlette.middleware.cors import CORSMiddleware
 
 from osism.tasks import reconciler
-from osism import settings, utils
+from osism import utils
 from osism.services.listener import BaremetalEvents
 
 
@@ -78,20 +77,6 @@ logger = logging.getLogger("api")
 baremetal_events = BaremetalEvents()
 
 
-@app.on_event("startup")
-async def startup_event():
-    if settings.NETBOX_URL and settings.NETBOX_TOKEN:
-        utils.nb = pynetbox.api(settings.NETBOX_URL, token=settings.NETBOX_TOKEN)
-
-        if settings.IGNORE_SSL_ERRORS:
-            import requests
-
-            requests.packages.urllib3.disable_warnings()
-            session = requests.Session()
-            session.verify = False
-            utils.nb.http_session = session
-
-
 @app.get("/")
 async def root():
     return {"message": "Hello World"}

osism/commands/manage.py

@@ -12,7 +12,7 @@ import requests
 from osism.data import TEMPLATE_IMAGE_CLUSTERAPI, TEMPLATE_IMAGE_OCTAVIA
 from osism.tasks import openstack, handle_task
 
-SUPPORTED_CLUSTERAPI_K8S_IMAGES = ["1.29", "1.30", "1.31"]
+SUPPORTED_CLUSTERAPI_K8S_IMAGES = ["1.30", "1.31", "1.32"]
 
 
 class ImageClusterapi(Command):
@@ -51,7 +51,7 @@ class ImageClusterapi(Command):
         parser.add_argument(
             "--filter",
             type=str,
-            help="Filter the version to be managed (e.g. 1.31)",
+            help="Filter the version to be managed (e.g. 1.32)",
             default=None,
         )
         return parser
@@ -188,7 +188,9 @@ class ImageOctavia(Command):
             "--deactivate",
         ]
 
-        task_signature = openstack.image_manager.si(*arguments, configs=result)
+        task_signature = openstack.image_manager.si(
+            *arguments, configs=result, ignore_env=True
+        )
         task = task_signature.apply_async()
         if wait:
             logger.info(

osism/commands/netbox.py

@@ -3,29 +3,33 @@
 from cliff.command import Command
 from loguru import logger
 
-from osism.tasks import conductor, netbox, reconciler, openstack, handle_task
+from osism.tasks import conductor, netbox, reconciler, handle_task
 
 
 class Ironic(Command):
     def get_parser(self, prog_name):
         parser = super(Ironic, self).get_parser(prog_name)
+        parser.add_argument(
+            "--no-wait",
+            help="Do not wait until the sync has been completed",
+            action="store_true",
+        )
+        parser.add_argument(
+            "--force-update",
+            help="Force update of baremetal nodes (Used to update non-comparable items like passwords)",
+            action="store_true",
+        )
         return parser
 
     def take_action(self, parsed_args):
-        # Get Ironic parameters from the conductor
-        task = conductor.get_ironic_parameters.delay()
-        task.wait(timeout=None, interval=0.5)
-        ironic_parameters = task.get()
+        wait = not parsed_args.no_wait
 
-        # Add all unregistered systems from the Netbox in Ironic
-        netbox.get_devices_not_yet_registered_in_ironic.apply_async(
-            (), link=openstack.baremetal_create_nodes.s(ironic_parameters)
+        task = conductor.sync_netbox_with_ironic.delay(
+            force_update=parsed_args.force_update
         )
-
-        # Synchronize the current status in Ironic with the Netbox
-        # openstack.baremetal_node_list.apply_async((), link=netbox.synchronize_device_state.s())
-
-        # Remove systems from Ironic that are no longer present in the Netbox
+        if wait:
+            logger.info(f"Task {task.task_id} is running. Wait. No more output.")
+            task.wait(timeout=None, interval=0.5)
 
 
 class Sync(Command):
@@ -33,7 +37,6 @@ class Sync(Command):
         parser = super(Sync, self).get_parser(prog_name)
         parser.add_argument(
             "--no-wait",
-            default=False,
             help="Do not wait until the sync has been completed",
             action="store_true",
         )

osism/commands/server.py

@@ -93,36 +93,131 @@ class ServerMigrate(Command):
 class ServerList(Command):
     def get_parser(self, prog_name):
         parser = super(ServerList, self).get_parser(prog_name)
+        parser.add_argument(
+            "--domain",
+            help="List all servers of a specific domain",
+            type=str,
+            default=None,
+        )
+        parser.add_argument(
+            "--project",
+            help="List all servers of a specific project",
+            type=str,
+            default=None,
+        )
+        parser.add_argument(
+            "--project-domain", help="Domain of the project", type=str, default=None
+        )
         return parser
 
     def take_action(self, parsed_args):
         conn = get_cloud_connection()
+        domain = parsed_args.domain
+        project = parsed_args.project
+        project_domain = parsed_args.project_domain
 
         result = []
-        for server in conn.compute.servers(all_projects=True, status="build"):
-            duration = datetime.now(timezone.utc) - dateutil.parser.parse(
-                server.created_at
+        if domain:
+            _domain = conn.identity.find_domain(domain)
+            if not _domain:
+                logger.error(f"Domain {domain} not found")
+                return
+            projects = list(conn.identity.projects(domain_id=_domain.id))
+
+            for project in projects:
+                query = {"project_id": project.id}
+                for server in conn.compute.servers(all_projects=True, **query):
+                    result.append(
+                        [
+                            project.name,
+                            project.id,
+                            server.id,
+                            server.name,
+                            server.flavor["original_name"],
+                            server.status,
+                        ]
+                    )
+
+            print(
+                tabulate(
+                    result,
+                    headers=["Project", "Project ID", "ID", "Name", "Flavor", "Status"],
+                    tablefmt="psql",
+                )
             )
-            if duration.total_seconds() > 7200:
-                logger.info(
-                    f"Server {server.id} hangs in BUILD status for more than 2 hours"
+
+        elif project:
+            if project_domain:
+                _project_domain = conn.identity.find_domain(project_domain)
+                if not _project_domain:
+                    logger.error(f"Project domain {project_domain} not found")
+                    return
+                query = {"domain_id": _project_domain.id}
+                _project = conn.identity.find_project(project, **query)
+            else:
+                _project = conn.identity.find_project(project)
+            if not _project:
+                logger.error(f"Project {project} not found")
+                return
+            query = {"project_id": _project.id}
+
+            for server in conn.compute.servers(all_projects=True, **query):
+                result.append(
+                    [
+                        server.id,
+                        server.name,
+                        server.flavor["original_name"],
+                        server.status,
+                    ]
                 )
-                result.append([server.id, server.name, server.status])
 
-        for server in conn.compute.servers(all_projects=True, status="error"):
-            duration = datetime.now(timezone.utc) - dateutil.parser.parse(
-                server.created_at
-            )
-            if duration.total_seconds() > 7200:
-                logger.info(
-                    f"Server {server.id} hangs in ERRORstatus for more than 2 hours"
+            print(
+                tabulate(
+                    result,
+                    headers=["ID", "Name", "Flavor", "Status"],
+                    tablefmt="psql",
                 )
-                result.append([server.id, server.name, server.status])
+            )
 
-        print(
-            tabulate(
-                result,
-                headers=["ID", "Name", "Status"],
-                tablefmt="psql",
+        else:
+            for server in conn.compute.servers(all_projects=True, status="build"):
+                duration = datetime.now(timezone.utc) - dateutil.parser.parse(
+                    server.created_at
+                )
+                if duration.total_seconds() > 7200:
+                    logger.info(
+                        f"Server {server.id} hangs in BUILD status for more than 2 hours"
+                    )
+                    result.append(
+                        [
+                            server.id,
+                            server.name,
+                            server.flavor["original_name"],
+                            server.status,
+                        ]
+                    )
+
+            for server in conn.compute.servers(all_projects=True, status="error"):
+                duration = datetime.now(timezone.utc) - dateutil.parser.parse(
+                    server.created_at
+                )
+                if duration.total_seconds() > 7200:
+                    logger.info(
+                        f"Server {server.id} hangs in ERRORstatus for more than 2 hours"
+                    )
+                    result.append(
+                        [
+                            server.id,
+                            server.name,
+                            server.flavor["original_name"],
+                            server.status,
+                        ]
+                    )
+
+            print(
+                tabulate(
+                    result,
+                    headers=["ID", "Name", "Flavor", "Status"],
+                    tablefmt="psql",
+                )
             )
-        )

osism/commands/volume.py

@@ -14,63 +14,160 @@ from osism.commands import get_cloud_connection
 class VolumeList(Command):
     def get_parser(self, prog_name):
         parser = super(VolumeList, self).get_parser(prog_name)
+        parser.add_argument(
+            "--domain",
+            help="List all volumes of a specific domain",
+            type=str,
+            default=None,
+        )
+        parser.add_argument(
+            "--project",
+            help="List all volumes of a specific project",
+            type=str,
+            default=None,
+        )
+        parser.add_argument(
+            "--project-domain", help="Domain of the project", type=str, default=None
+        )
         return parser
 
     def take_action(self, parsed_args):
         conn = get_cloud_connection()
+        domain = parsed_args.domain
+        project = parsed_args.project
+        project_domain = parsed_args.project_domain
 
         result = []
-        for volume in conn.block_storage.volumes(all_projects=True, status="detaching"):
-            created_at = pytz.utc.localize(dateutil.parser.parse(volume.created_at))
-            duration = datetime.now(timezone.utc) - created_at
-            if duration.total_seconds() > 7200:
-                logger.info(
-                    f"Volume {volume.id} hangs in DETACHING status for more than 2 hours"
-                )
-                result.append([volume.id, volume.name, volume.status])
-
-        for volume in conn.block_storage.volumes(all_projects=True, status="creating"):
-            created_at = pytz.utc.localize(dateutil.parser.parse(volume.created_at))
-            duration = datetime.now(timezone.utc) - created_at
-            if duration.total_seconds() > 7200:
-                logger.info(
-                    f"Volume {volume.id} hangs in CREATING status for more than 2 hours"
-                )
-                result.append([volume.id, volume.name, volume.status])
-
-        for volume in conn.block_storage.volumes(
-            all_projects=True, status="error_deleting"
-        ):
-            created_at = pytz.utc.localize(dateutil.parser.parse(volume.created_at))
-            duration = datetime.now(timezone.utc) - created_at
-            if duration.total_seconds() > 7200:
-                logger.info(
-                    f"Volume {volume.id} hangs in ERROR_DELETING status for more than 2 hours"
+        if domain:
+            _domain = conn.identity.find_domain(domain)
+            if not _domain:
+                logger.error(f"Domain {domain} not found")
+                return
+            projects = list(conn.identity.projects(domain_id=_domain.id))
+
+            for project in projects:
+                query = {"project_id": project.id}
+                for volume in conn.block_storage.volumes(all_projects=True, **query):
+                    result.append(
+                        [
+                            project.name,
+                            project.id,
+                            volume.id,
+                            volume.name,
+                            volume.volume_type,
+                            volume.status,
+                        ]
+                    )
+
+            print(
+                tabulate(
+                    result,
+                    headers=["Project", "Project ID", "ID", "Name", "Type", "Status"],
+                    tablefmt="psql",
                 )
-                result.append([volume.id, volume.name, volume.status])
-
-        for volume in conn.block_storage.volumes(all_projects=True, status="deleting"):
-            created_at = pytz.utc.localize(dateutil.parser.parse(volume.created_at))
-            duration = datetime.now(timezone.utc) - created_at
-            if duration.total_seconds() > 7200:
-                logger.info(
-                    f"Volume {volume.id} hangs in DELETING status for more than 2 hours"
+            )
+
+        elif project:
+            if project_domain:
+                _project_domain = conn.identity.find_domain(project_domain)
+                if not _project_domain:
+                    logger.error(f"Project domain {project_domain} not found")
+                    return
+                query = {"domain_id": _project_domain.id}
+                _project = conn.identity.find_project(project, **query)
+            else:
+                _project = conn.identity.find_project(project)
+            if not _project:
+                logger.error(f"Project {project} not found")
+                return
+            query = {"project_id": _project.id}
+
+            for volume in conn.block_storage.volumes(all_projects=True, **query):
+                result.append(
+                    [
+                        volume.id,
+                        volume.name,
+                        volume.volume_type,
+                        volume.status,
+                    ]
                 )
-                result.append([volume.id, volume.name, volume.status])
-
-        for volume in conn.block_storage.volumes(all_projects=True, status="error"):
-            created_at = pytz.utc.localize(dateutil.parser.parse(volume.created_at))
-            duration = datetime.now(timezone.utc) - created_at
-            if duration.total_seconds() > 7200:
-                logger.info(
-                    f"Volume {volume.id} hangs in ERROR status for more than 2 hours"
+
+            print(
+                tabulate(
+                    result,
+                    headers=["ID", "Name", "Type", "Status"],
+                    tablefmt="psql",
                 )
-                result.append([volume.id, volume.name, volume.status])
+            )
+
+        else:
+            for volume in conn.block_storage.volumes(
+                all_projects=True, status="detaching"
+            ):
+                created_at = pytz.utc.localize(dateutil.parser.parse(volume.created_at))
+                duration = datetime.now(timezone.utc) - created_at
+                if duration.total_seconds() > 7200:
+                    logger.info(
+                        f"Volume {volume.id} hangs in DETACHING status for more than 2 hours"
+                    )
+                    result.append(
+                        [volume.id, volume.name, volume.volume_type, volume.status]
+                    )
+
+            for volume in conn.block_storage.volumes(
+                all_projects=True, status="creating"
+            ):
+                created_at = pytz.utc.localize(dateutil.parser.parse(volume.created_at))
+                duration = datetime.now(timezone.utc) - created_at
+                if duration.total_seconds() > 7200:
+                    logger.info(
+                        f"Volume {volume.id} hangs in CREATING status for more than 2 hours"
+                    )
+                    result.append(
+                        [volume.id, volume.name, volume.volume_type, volume.status]
+                    )
+
+            for volume in conn.block_storage.volumes(
+                all_projects=True, status="error_deleting"
+            ):
+                created_at = pytz.utc.localize(dateutil.parser.parse(volume.created_at))
+                duration = datetime.now(timezone.utc) - created_at
+                if duration.total_seconds() > 7200:
+                    logger.info(
+                        f"Volume {volume.id} hangs in ERROR_DELETING status for more than 2 hours"
+                    )
+                    result.append(
+                        [volume.id, volume.name, volume.volume_type, volume.status]
+                    )
 
-        print(
-            tabulate(
-                result,
-                headers=["ID", "Name", "Status"],
-                tablefmt="psql",
+            for volume in conn.block_storage.volumes(
+                all_projects=True, status="deleting"
+            ):
+                created_at = pytz.utc.localize(dateutil.parser.parse(volume.created_at))
+                duration = datetime.now(timezone.utc) - created_at
+                if duration.total_seconds() > 7200:
+                    logger.info(
+                        f"Volume {volume.id} hangs in DELETING status for more than 2 hours"
+                    )
+                    result.append(
+                        [volume.id, volume.name, volume.volume_type, volume.status]
+                    )
+
+            for volume in conn.block_storage.volumes(all_projects=True, status="error"):
+                created_at = pytz.utc.localize(dateutil.parser.parse(volume.created_at))
+                duration = datetime.now(timezone.utc) - created_at
+                if duration.total_seconds() > 7200:
+                    logger.info(
+                        f"Volume {volume.id} hangs in ERROR status for more than 2 hours"
+                    )
+                    result.append(
+                        [volume.id, volume.name, volume.volume_type, volume.status]
+                    )
+
+            print(
+                tabulate(
+                    result,
+                    headers=["ID", "Name", "Type", "Status"],
+                    tablefmt="psql",
+                )
             )
-        )

osism/core/enums.py

@@ -188,7 +188,7 @@ MAP_ROLE2ROLE = {
         [
             "common",
             [
-                ["loadbalancer", ["opensearch", "mariadb-ng"]],
+                ["loadbalancer", ["letsencrypt", "opensearch", "mariadb-ng"]],
                 ["openvswitch", ["ovn"]],
                 "memcached",
                 "redis",
@@ -199,6 +199,19 @@ MAP_ROLE2ROLE = {
     "collection-kubernetes": [
         ["kubernetes", ["kubeconfig", ["copy-kubeconfig"]]],
     ],
+    "collection-openstack-core": [
+        "horizon",
+        [
+            "keystone",
+            [
+                "glance",
+                "cinder",
+                ["neutron", ["octavia"]],
+                "designate",
+                ["placement", ["nova"]],
+            ],
+        ],
+    ],
     "collection-openstack": [
         "horizon",
         [