osism 0.20250407.0__py3-none-any.whl → 0.20250505.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

@@ -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/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/settings.py

@@ -34,3 +34,12 @@ INVENTORY_RECONCILER_SCHEDULE = float(
 )
 
 OSISM_API_URL = os.getenv("OSISM_API_URL", None)
+
+OSISM_CONDUCTOR_NETBOX_FILTER_LIST = os.getenv(
+    "OSISM_CONDUCTOR_NETBOX_FILTER_LIST",
+    "[{'state': 'active', 'tag': ['managed-by-ironic']}]",
+)
+
+NETBOX_SECONDARIES = (
+    os.getenv("NETBOX_SECONDARIES", read_secret("NETBOX_SECONDARIES")) or "[]"
+)

osism/tasks/__init__.py

@@ -183,11 +183,16 @@ def run_command(
     *arguments,
     publish=True,
     locking=False,
+    ignore_env=False,
     auto_release_time=3600,
 ):
     result = ""
-    command_env = os.environ.copy()
-    command_env.update(env)
+
+    if ignore_env:
+        command_env = env
+    else:
+        command_env = os.environ.copy()
+        command_env.update(env)
 
     if locking:
         lock = Redlock(

osism/tasks/conductor.py

@@ -9,6 +9,7 @@ from loguru import logger
 from pottery import Redlock
 import yaml
 
+from osism import settings
 from osism import utils
 from osism.tasks import Config, netbox, openstack
 
@@ -17,6 +18,7 @@ app.config_from_object(Config)
 
 
 configuration = {}
+nb_device_query_list = None
 
 
 @worker_process_init.connect
@@ -91,6 +93,49 @@ def celery_init_worker(**kwargs):
                         "provisioning_network"
                     ] = result.id
 
+    global nb_device_query_list
+
+    try:
+        supported_nb_device_filters = [
+            "site",
+            "region",
+            "site_group",
+            "location",
+            "rack",
+            "tag",
+            "state",
+        ]
+        nb_device_query_list = yaml.safe_load(
+            settings.OSISM_CONDUCTOR_NETBOX_FILTER_LIST
+        )
+        if type(nb_device_query_list) is not list:
+            raise TypeError
+        for nb_device_query in nb_device_query_list:
+            if type(nb_device_query) is not dict:
+                raise TypeError
+            for key in list(nb_device_query.keys()):
+                if key not in supported_nb_device_filters:
+                    raise ValueError
+                # NOTE: Only "location_id" and "rack_id" are supported by netbox
+                if key in ["location", "rack"]:
+                    value_name = nb_device_query.pop(key, "")
+                    if key == "location":
+                        value_id = netbox.get_location_id(value_name)
+                    elif key == "rack":
+                        value_id = netbox.get_rack_id(value_name)
+                    if value_id:
+                        nb_device_query.update({key + "_id": value_id})
+                    else:
+                        raise ValueError(f"Invalid name {value_name} for {key}")
+    except (yaml.YAMLError, TypeError):
+        logger.error(
+            f"Setting OSISM_CONDUCTOR_NETBOX_FILTER_LIST needs to be an array of mappings containing supported netbox device filters: {supported_nb_device_filters}"
+        )
+        nb_device_query_list = []
+    except ValueError as exc:
+        logger.error(f"Unknown value in OSISM_CONDUCTOR_NETBOX_FILTER_LIST: {exc}")
+        nb_device_query_list = []
+
 
 @app.on_after_configure.connect
 def setup_periodic_tasks(sender, **kwargs):
@@ -135,10 +180,12 @@ def sync_netbox_with_ironic(self, force_update=False):
         },
     }
 
-    devices = list(netbox.get_devices_by_tags(["managed-by-ironic"]))
+    devices = set()
+    for nb_device_query in nb_device_query_list:
+        devices |= set(netbox.get_devices(**nb_device_query))
 
     # NOTE: Find nodes in Ironic which are no longer present in netbox and remove them
-    device_names = [dev.name for dev in devices]
+    device_names = {dev.name for dev in devices}
     nodes = openstack.baremetal_node_list()
     for node in nodes:
         logger.info(f"Looking for {node['Name']} in netbox")
@@ -151,11 +198,6 @@ def sync_netbox_with_ironic(self, force_update=False):
                 logger.info(
                     f"Cleaning up baremetal node not found in netbox: {node['Name']}"
                 )
-                flavor_name = "osism-" + node["Name"]
-                flavor = openstack.compute_flavor_get(flavor_name)
-                if flavor:
-                    logger.info(f"Deleting flavor {flavor_name}")
-                    openstack.compute_flavor_delete(flavor)
                 for port in openstack.baremetal_port_list(
                     details=False, attributes=dict(node_uuid=node["UUID"])
                 ):
@@ -224,19 +266,6 @@ def sync_netbox_with_ironic(self, force_update=False):
             for interface in node_interfaces
             if interface.enabled and not interface.mgmt_only and interface.mac_address
         ]
-        flavor_attributes = {
-            "ram": 1,
-            "disk": 0,
-            "vcpus": 1,
-            "is_public": False,
-            "extra_specs": {
-                "resources:CUSTOM_"
-                + device.name.upper().replace("-", "_").replace(".", "_"): "1",
-                "resources:VCPU": "0",
-                "resources:MEMORY_MB": "0",
-                "resources:DISK_GB": "0",
-            },
-        }
 
         lock = Redlock(
             key=f"lock_osism_tasks_conductor_sync_netbox_with_ironic-{device.name}",
@@ -366,48 +395,6 @@ def sync_netbox_with_ironic(self, force_update=False):
                     logger.info(
                         f"Validation of management interface failed for baremetal node for {device.name}\nReason: {node_validation['management'].reason}"
                     )
-
-                flavor_name = "osism-" + device.name
-                flavor = openstack.compute_flavor_get(flavor_name)
-                if not flavor:
-                    logger.info(f"Creating flavor for {flavor_name}")
-                    flavor = openstack.compute_flavor_create(
-                        flavor_name, flavor_attributes
-                    )
-                else:
-                    flavor_updates = {}
-                    deep_compare(flavor_attributes, flavor, flavor_updates)
-                    flavor_updates_extra_specs = flavor_updates.pop("extra_specs", None)
-                    if flavor_updates:
-                        logger.info(
-                            f"Updating flavor for {device.name} with {flavor_updates}"
-                        )
-                        openstack.compute_flavor_delete(flavor)
-                        flavor = openstack.compute_flavor_create(
-                            flavor_name, flavor_attributes
-                        )
-                    elif flavor_updates_extra_specs:
-                        logger.info(
-                            f"Updating flavor extra_specs for {device.name} with {flavor_updates_extra_specs}"
-                        )
-                        openstack.compute_flavor_update_extra_specs(
-                            flavor, flavor_updates_extra_specs
-                        )
-                        flavor = openstack.compute_flavor_get(flavor_name)
-                    for extra_specs_key in flavor["extra_specs"].keys():
-                        if (
-                            extra_specs_key
-                            not in flavor_attributes["extra_specs"].keys()
-                        ):
-                            logger.info(
-                                f"Deleting flavor extra_specs property {extra_specs_key} for {device.name}"
-                            )
-                            flavor = (
-                                openstack.compute_flavor_delete_extra_specs_property(
-                                    flavor, extra_specs_key
-                                )
-                            )
-
             except Exception as exc:
                 logger.info(
                     f"Could not fully synchronize device {device.name} with ironic: {exc}"

osism/tasks/netbox.py

@@ -1,10 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from celery import Celery
-from celery.signals import worker_process_init
 from loguru import logger
 from pottery import Redlock
-import pynetbox
 
 from osism import settings, utils
 from osism.tasks import Config, run_command
@@ -13,20 +11,6 @@ app = Celery("netbox")
 app.config_from_object(Config)
 
 
-@worker_process_init.connect
-def celery_init_worker(**kwargs):
-    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.on_after_configure.connect
 def setup_periodic_tasks(sender, **kwargs):
     pass
@@ -37,6 +21,9 @@ def run(self, action, arguments):
     pass
 
 
+# NOTE: While `get_*` tasks only operate on the netbox configured in NETBOX_URL, `set_*` tasks additionally operate on all netbox instances listed in NETBOX_SECONDARIES
+
+
 @app.task(bind=True, name="osism.tasks.netbox.set_maintenance")
 def set_maintenance(self, device_name, state=True):
     """Set the maintenance state for a device in the Netbox."""
@@ -48,14 +35,18 @@ def set_maintenance(self, device_name, state=True):
     )
     if lock.acquire(timeout=20):
         try:
-            logger.info(f"Set maintenance state of device {device_name} = {state}")
-
-            device = utils.nb.dcim.devices.get(name=device_name)
-            if device:
-                device.custom_fields.update({"maintenance": state})
-                device.save()
-            else:
-                logger.error(f"Could not set maintenance for {device_name}")
+            for nb in [utils.nb] + utils.secondary_nb_list:
+                logger.info(
+                    f"Set maintenance state of device {device_name} = {state} on {nb.base_url}"
+                )
+                device = nb.dcim.devices.get(name=device_name)
+                if device:
+                    device.custom_fields.update({"maintenance": state})
+                    device.save()
+                else:
+                    logger.error(
+                        f"Could not set maintenance for {device_name} on {nb.base_url}"
+                    )
         finally:
             lock.release()
     else:
@@ -73,14 +64,19 @@ def set_provision_state(self, device_name, state):
     )
     if lock.acquire(timeout=20):
         try:
-            logger.info(f"Set provision state of device {device_name} = {state}")
-
-            device = utils.nb.dcim.devices.get(name=device_name)
-            if device:
-                device.custom_fields.update({"provision_state": state})
-                device.save()
-            else:
-                logger.error(f"Could not set provision state for {device_name}")
+
+            for nb in [utils.nb] + utils.secondary_nb_list:
+                logger.info(
+                    f"Set provision state of device {device_name} = {state} on {nb.base_url}"
+                )
+                device = nb.dcim.devices.get(name=device_name)
+                if device:
+                    device.custom_fields.update({"provision_state": state})
+                    device.save()
+                else:
+                    logger.error(
+                        f"Could not set provision state for {device_name} on {nb.base_url}"
+                    )
         finally:
             lock.release()
     else:
@@ -98,26 +94,54 @@ def set_power_state(self, device_name, state):
     )
     if lock.acquire(timeout=20):
         try:
-            logger.info(f"Set power state of device {device_name} = {state}")
-
-            device = utils.nb.dcim.devices.get(name=device_name)
-            if device:
-                device.custom_fields.update({"power_state": state})
-                device.save()
-            else:
-                logger.error(f"Could not set power state for {device_name}")
+            for nb in [utils.nb] + utils.secondary_nb_list:
+                logger.info(
+                    f"Set power state of device {device_name} = {state} on {nb.base_url}"
+                )
+                device = nb.dcim.devices.get(name=device_name)
+                if device:
+                    device.custom_fields.update({"power_state": state})
+                    device.save()
+                else:
+                    logger.error(
+                        f"Could not set power state for {device_name} on {nb.base_url}"
+                    )
         finally:
             lock.release()
     else:
         logger.error("Could not acquire lock for node {device_name}")
 
 
-@app.task(bind=True, name="osism.tasks.netbox.get_devices")
-def get_devices_by_tags(self, tags, state="active"):
-    return utils.nb.dcim.devices.filter(tag=tags, state=state)
+@app.task(bind=True, name="osism.tasks.netbox.get_location_id")
+def get_location_id(self, location_name):
+    try:
+        location = utils.nb.dcim.locations.get(name=location_name)
+    except ValueError:
+        return None
+    if location:
+        return location.id
+    else:
+        return None
+
+
+@app.task(bind=True, name="osism.tasks.netbox.get_rack_id")
+def get_rack_id(self, rack_name):
+    try:
+        rack = utils.nb.dcim.racks.get(name=rack_name)
+    except ValueError:
+        return None
+    if rack:
+        return rack.id
+    else:
+        return None
 
 
 @app.task(bind=True, name="osism.tasks.netbox.get_devices")
+def get_devices(self, **query):
+    return utils.nb.dcim.devices.filter(**query)
+
+
+@app.task(bind=True, name="osism.tasks.netbox.get_device_by_name")
 def get_device_by_name(self, name):
     return utils.nb.dcim.devices.get(name=name)
 

osism/tasks/openstack.py

@@ -136,50 +136,15 @@ def baremetal_port_delete(self, port_or_id):
     return result
 
 
-@app.task(bind=True, name="osism.tasks.openstack.compute_flavor_get")
-def compute_flavor_get(self, name_or_id):
-    conn = utils.get_openstack_connection()
-    result = conn.compute.find_flavor(
-        name_or_id, ignore_missing=True, get_extra_specs=True
-    )
-    return result
-
-
-@app.task(bind=True, name="osism.tasks.openstack.compute_flavor_create")
-def compute_flavor_create(self, name, attributes=None):
-    if attributes is None:
-        attributes = {}
-    attributes.update({"name": name})
-    extra_specs = attributes.pop("extra_specs", None)
-    conn = utils.get_openstack_connection()
-    flavor = conn.compute.create_flavor(**attributes)
-    if extra_specs:
-        flavor = conn.compute.create_flavor_extra_specs(flavor, extra_specs)
-    return flavor
-
-
-@app.task(bind=True, name="osism.tasks.openstack.compute_flavor_delete")
-def compute_flavor_delete(self, flavor):
-    conn = utils.get_openstack_connection()
-    conn.compute.delete_flavor(flavor, ignore_missing=True)
-
-
-@app.task(bind=True, name="osism.tasks.openstack.compute_flavor_update_extra_specs")
-def compute_flavor_update_extra_specs(self, flavor, extra_specs={}):
-    conn = utils.get_openstack_connection()
-    for key, value in extra_specs.items():
-        conn.compute.update_flavor_extra_specs_property(flavor, key, value)
-
-
-@app.task(bind=True, name="osism.tasks.openstack.compute_flavor_delete_extra_specs")
-def compute_flavor_delete_extra_specs_property(self, flavor, prop):
-    conn = utils.get_openstack_connection()
-    conn.compute.delete_flavor_extra_specs_property(flavor, prop)
-
-
 @app.task(bind=True, name="osism.tasks.openstack.image_manager")
 def image_manager(
-    self, *arguments, configs=None, publish=True, locking=False, auto_release_time=3600
+    self,
+    *arguments,
+    configs=None,
+    publish=True,
+    locking=False,
+    auto_release_time=3600,
+    ignore_env=False
 ):
     command = "/usr/local/bin/openstack-image-manager"
     if configs:
@@ -209,6 +174,7 @@ def image_manager(
                 publish=publish,
                 locking=locking,
                 auto_release_time=auto_release_time,
+                ignore_env=ignore_env,
             )
         return rc
     else:
@@ -220,6 +186,7 @@ def image_manager(
             publish=publish,
             locking=locking,
             auto_release_time=auto_release_time,
+            ignore_env=ignore_env,
         )
 
 

osism/utils/__init__.py

@@ -1,13 +1,34 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import keystoneauth1
+from loguru import logger
 import openstack
 import pynetbox
 from redis import Redis
 import urllib3
+import yaml
 
 from osism import settings
 
+
+def get_netbox_connection(netbox_url, netbox_token, ignore_ssl_errors=False):
+    if netbox_url and netbox_token:
+        nb = pynetbox.api(netbox_url, token=netbox_token)
+
+        if ignore_ssl_errors and nb:
+            import requests
+
+            urllib3.disable_warnings()
+            session = requests.Session()
+            session.verify = False
+            nb.http_session = session
+
+    else:
+        nb = None
+
+    return nb
+
+
 redis = Redis(
     host=settings.REDIS_HOST,
     port=settings.REDIS_PORT,
@@ -16,19 +37,53 @@ redis = Redis(
 )
 redis.ping()
 
-if settings.NETBOX_URL and settings.NETBOX_TOKEN:
-    nb = pynetbox.api(settings.NETBOX_URL, token=settings.NETBOX_TOKEN)
-
-    if settings.IGNORE_SSL_ERRORS and nb:
-        import requests
-
-        urllib3.disable_warnings()
-        session = requests.Session()
-        session.verify = False
-        nb.http_session = session
+nb = get_netbox_connection(
+    settings.NETBOX_URL, settings.NETBOX_TOKEN, settings.IGNORE_SSL_ERRORS
+)
 
-else:
-    nb = None
+try:
+    secondary_nb_settings_list = yaml.safe_load(settings.NETBOX_SECONDARIES)
+    supported_secondary_nb_keys = ["NETBOX_URL", "NETBOX_TOKEN", "IGNORE_SSL_ERRORS"]
+    secondary_nb_list = []
+    if type(secondary_nb_settings_list) is not list:
+        raise TypeError(
+            f"Setting NETBOX_SECONDARIES needs to be an array of mappings containing supported netbox API configuration: {supported_secondary_nb_keys}"
+        )
+    for secondary_nb_settings in secondary_nb_settings_list:
+        if type(secondary_nb_settings) is not dict:
+            raise TypeError(
+                f"Elements in setting NETBOX_SECONDARIES need to be mappings containing supported netbox API configuration: {supported_secondary_nb_keys}"
+            )
+        for key in list(secondary_nb_settings.keys()):
+            if key not in supported_secondary_nb_keys:
+                raise ValueError(
+                    f"Unknown key in element of setting NETBOX_SECONDARIES. Supported keys: {supported_secondary_nb_keys}"
+                )
+        if (
+            "NETBOX_URL" not in secondary_nb_settings
+            or not secondary_nb_settings["NETBOX_URL"]
+        ):
+            raise ValueError(
+                "All NETBOX_URL values in the elements of setting NETBOX_SECONDARIES need to be valid netbox URLs"
+            )
+        if (
+            "NETBOX_TOKEN" not in secondary_nb_settings
+            or not secondary_nb_settings["NETBOX_TOKEN"]
+        ):
+            raise ValueError(
+                "All NETBOX_TOKEN values in the elements of setting NETBOX_SECONDARIES need to be valid netbox tokens"
+            )
+
+        secondary_nb_list.append(
+            get_netbox_connection(
+                secondary_nb_settings["NETBOX_URL"],
+                secondary_nb_settings["NETBOX_TOKEN"],
+                secondary_nb_settings.get("IGNORE_SSL_ERRORS", True),
+            )
+        )
+except (yaml.YAMLError, TypeError, ValueError) as exc:
+    logger.error(f"Error parsing settings NETBOX_SECONDARIES: {exc}")
+    secondary_nb_list = []
 
 
 def get_openstack_connection():

{osism-0.20250407.0.dist-info → osism-0.20250505.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osism
-Version: 0.20250407.0
+Version: 0.20250505.0
 Summary: OSISM manager interface
 Home-page: https://github.com/osism/python-osism
 Author: OSISM GmbH
@@ -27,7 +27,7 @@ Requires-Dist: GitPython==3.1.44
 Requires-Dist: Jinja2==3.1.6
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: ara==1.7.2
-Requires-Dist: celery[redis]==5.5.0
+Requires-Dist: celery[redis]==5.5.2
 Requires-Dist: cliff==4.9.1
 Requires-Dist: deepdiff==8.4.2
 Requires-Dist: docker==7.1.0
@@ -37,31 +37,31 @@ Requires-Dist: flower==2.0.1
 Requires-Dist: hiredis==3.1.0
 Requires-Dist: jc==1.25.4
 Requires-Dist: keystoneauth1==5.10.0
-Requires-Dist: kombu==5.5.2
+Requires-Dist: kombu==5.5.3
 Requires-Dist: kubernetes==32.0.1
 Requires-Dist: loguru==0.7.3
 Requires-Dist: netmiko==4.5.0
 Requires-Dist: nornir-ansible==2023.12.28
 Requires-Dist: nornir==3.5.0
-Requires-Dist: openstacksdk==4.4.0
+Requires-Dist: openstacksdk==4.5.0
 Requires-Dist: pottery==3.0.1
-Requires-Dist: prompt-toolkit==3.0.50
-Requires-Dist: pydantic==1.10.21
+Requires-Dist: prompt-toolkit==3.0.51
+Requires-Dist: pydantic==1.10.22
 Requires-Dist: pynetbox==7.4.1
 Requires-Dist: pytest-testinfra==10.2.2
 Requires-Dist: python-dateutil==2.9.0.post0
-Requires-Dist: setuptools==78.1.0
+Requires-Dist: setuptools==80.3.1
 Requires-Dist: sqlmodel==0.0.24
 Requires-Dist: sushy==5.5.0
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: transitions==0.9.2
-Requires-Dist: uvicorn[standard]==0.34.0
+Requires-Dist: uvicorn[standard]==0.34.2
 Requires-Dist: watchdog==6.0.0
 Provides-Extra: ansible
 Requires-Dist: ansible-runner==2.4.1; extra == "ansible"
-Requires-Dist: ansible-core==2.18.4; extra == "ansible"
+Requires-Dist: ansible-core==2.18.5; extra == "ansible"
 Provides-Extra: openstack-image-manager
-Requires-Dist: openstack-image-manager==0.20250407.0; extra == "openstack-image-manager"
+Requires-Dist: openstack-image-manager==0.20250423.0; extra == "openstack-image-manager"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{osism-0.20250407.0.dist-info → osism-0.20250505.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 osism/__init__.py,sha256=1UiNTBus0V0f2AbZQzAtVtu6zkfCCrw0OTq--NwFAqY,341
 osism/__main__.py,sha256=ILe4gu61xEISiBsxanqTQIdSkV-YhpZXTRlguCYyssk,141
-osism/api.py,sha256=Lvkdd92tvv9RtoMs9RtvqsN3DiSKPdSll24J3wRzbBY,4793
+osism/api.py,sha256=xJC6RyC1TU54PU2C06rlialh2SmTCgM1L0MSgyUlubU,4331
 osism/main.py,sha256=Dt2-9sLXcS-Ny4DAz7hrha-KRc7zd7BFUTRdfs_X8z4,893
-osism/settings.py,sha256=m__DltxKQo5D-vDKKwY8RNBVs5bverYdJmtyVyln_6o,1049
+osism/settings.py,sha256=xzFRbf5mdl_MUAUFqPavE14vaVuTr5z6b969vJQvF2E,1306
 osism/actions/__init__.py,sha256=bG7Ffen4LvQtgnYPFEpFccsWs81t4zqqeqn9ZeirH6E,38
 osism/commands/__init__.py,sha256=Ag4wX_DCgXRdoLn6t069jqb3DdRylsX2nyYkiyCx4uk,456
 osism/commands/apply.py,sha256=n3lLb1cS3GahQqRT0723di98hg47MjVzDzkAoeZX7qU,16780
@@ -13,11 +13,11 @@ osism/commands/console.py,sha256=8BPz1hio5Wi6kONVAWFuSqkDRrMcLEYeFIY8dbtN6e4,321
 osism/commands/container.py,sha256=Fku2GaCM3Idq_FxExUtNqjrEM0XYjpVvXmueSVO8S_c,1601
 osism/commands/get.py,sha256=ryytjtXWmlMV0NucP5tGkMZu0nIlC4xVtjRk4iMZ06c,8967
 osism/commands/log.py,sha256=2IpYuosC7FZwwLvM8HmKSU1NRNIelVVYzqjjVMCrOJk,4072
-osism/commands/manage.py,sha256=E0ZF4Bf91cgttkSVt1dOQ4nQbRUSDAgsgPOjJMDsGBk,11932
+osism/commands/manage.py,sha256=5ypZzA91QGgWCt35rVNJSXVC9l189IntS4UnsD8LRZY,11971
 osism/commands/netbox.py,sha256=_2-j6XM9JvH0DXnbct6rG9T6hT8KEpm3vazQC28Rt7I,4529
 osism/commands/noset.py,sha256=7zDFuFMyNpo7DUOKcNiYV8nodtdMOYFp5LDPcuJhlZ8,1481
 osism/commands/reconciler.py,sha256=Ja_b86gX6-_Pr3DmrUUvskmEnnJpHQ-XJNQLycMJeyc,2818
-osism/commands/server.py,sha256=zFXRdYoj4ZNDJNPSaGddMPEWxt8G2GyMomPOcCOaN3c,4137
+osism/commands/server.py,sha256=avmoOv5rjOi-fN2A-27cPwOtiy2Q2j6UFtCh3QrfWAI,7512
 osism/commands/service.py,sha256=A1lgAlGeCJpbFFqF55DRWPcCirIgpU0dzjzVLZ0mz3k,2649
 osism/commands/set.py,sha256=xLBi2DzbVQo2jb3-cOIE9In5UB3vFxquQJkDN-EsfhM,1425
 osism/commands/status.py,sha256=X-Rcj-XuNPDBoxsGkf96NswwpmTognxz1V6E2NX2ZgY,1997
@@ -25,7 +25,7 @@ osism/commands/sync.py,sha256=Vf9k7uVQTIu-8kK1u7Gjs3et3RRBEkmnNikot_PFJIE,484
 osism/commands/task.py,sha256=mwJJ7a71Lw3o_FX7j3rR0-NbPdPwMDOjbOAiiXE4uGc,543
 osism/commands/validate.py,sha256=hIQB0zk4xIBZJORtBp_tWrXTRKKhB2qi6j-mznDxKR4,4191
 osism/commands/vault.py,sha256=Ip0IMR7zaBkPbLJenXr4ZwxM6FnozZ9wn9rwHmFHo8s,1818
-osism/commands/volume.py,sha256=SqD9pYgtcYnMu6sB2pG8lfrLHRq6GzOb_-RkWOOVZPo,3156
+osism/commands/volume.py,sha256=l6oAk__dFM8KKdLTWOvuSiI7tLh9wAPZp8hwmYF-NX0,6595
 osism/commands/wait.py,sha256=mKFDqEXcaLlKw1T3MuBEZpNh7CeL3lpUXgubD2_f8es,6580
 osism/commands/worker.py,sha256=iraCOEhCp7WgfjfZ0-12XQYQPUjpi9rSJK5Z9JfNJk4,1651
 osism/core/__init__.py,sha256=bG7Ffen4LvQtgnYPFEpFccsWs81t4zqqeqn9ZeirH6E,38
@@ -35,21 +35,21 @@ osism/data/__init__.py,sha256=izXdh0J3vPLQI7kBhJI7ibJQzPqU_nlONP0L4Cf_k6A,1504
 osism/plugins/__init__.py,sha256=bG7Ffen4LvQtgnYPFEpFccsWs81t4zqqeqn9ZeirH6E,38
 osism/services/__init__.py,sha256=bG7Ffen4LvQtgnYPFEpFccsWs81t4zqqeqn9ZeirH6E,38
 osism/services/listener.py,sha256=eEamlQsJqCuU9K2QFmk3yM9LAJZEanVcTLtGMsNCKjs,9783
-osism/tasks/__init__.py,sha256=lrSkcZtbzhWsLS4hWadKfpP_tCd1pX1IhvrBU3EhKmM,8605
+osism/tasks/__init__.py,sha256=ZEu_KYsapTYp0etr-rLqie_NT_LndHDDpx53xITru5Y,8691
 osism/tasks/ansible.py,sha256=RcLxLrjzL5_X6OjNHm3H0lZlmKKlYKIANB0M4_d4chE,1109
 osism/tasks/ceph.py,sha256=eIQkah3Kj4INtOkF9kTjHbXJ3_J2lg48EWJKfHc-UYw,615
-osism/tasks/conductor.py,sha256=Qg4ic9j5khHGumXCRaosrDiphs4-Eqk02BCb78zuTkM,19162
+osism/tasks/conductor.py,sha256=jtvw5UfhPOPEbIBkIyBkiHbaPJsNKbEABbc3FtHYOo4,18210
 osism/tasks/kolla.py,sha256=wJQpWn_01iWLkr7l7T7RNrQGfRgsgmYi4WQlTmNGvew,618
 osism/tasks/kubernetes.py,sha256=VzXq_VrYU_CLm4cOruqnE3Kq2ydfO9glZ3p0bp3OYoc,625
-osism/tasks/netbox.py,sha256=qT3-0GWDPCnejLGAhNp7InMSxBTk7qmKwfdNn1in3FM,4857
-osism/tasks/openstack.py,sha256=ZFdgudp02a9I4AiJae2Pu0_k9REYi4P7wTLA5rzx8is,7825
+osism/tasks/netbox.py,sha256=QVOLiTH2Su237YAS0QfXbQ86E-OA1JzrFDfyi9JBmvk,5658
+osism/tasks/openstack.py,sha256=g15tCll5vP1pC6ysxRCTZxplsdGmXbxaCH3k1Qdv5Xg,6367
 osism/tasks/reconciler.py,sha256=RGUcax2gDuyVLw1nGRQn5izXclnPBo9MRl0ndLDiiYQ,2707
-osism/utils/__init__.py,sha256=DP2D7xyXnfWuH-c26elIwdwrMSY-oSkVsLFKsQfna9w,1477
-osism-0.20250407.0.dist-info/licenses/AUTHORS,sha256=EKFIR9F27AvoEXp1cA6FkGbjEOFt4Rcbipr5RJc7jSs,64
-osism-0.20250407.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-osism-0.20250407.0.dist-info/METADATA,sha256=TIDKl4LiJsyH7yJLztBxKbVc3BWnaKMdHxXRZ377Reg,2972
-osism-0.20250407.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-osism-0.20250407.0.dist-info/entry_points.txt,sha256=DlfrvU14rI55WuTrwNRoce9FY3ric4HeZKZx_Z3NzCw,3015
-osism-0.20250407.0.dist-info/pbr.json,sha256=7g2xfwKFA8HvM2aPcqC5h0SXZ_VjJYyEL03mJcdLU6A,47
-osism-0.20250407.0.dist-info/top_level.txt,sha256=8L8dsI9hcaGHsdnR4k_LN9EM78EhwrXRFHyAryPXZtY,6
-osism-0.20250407.0.dist-info/RECORD,,
+osism/utils/__init__.py,sha256=_uhe9ghqAJ2me0p187X-vzJ2Nh_Hpmfw3D6HU4kKa10,3759
+osism-0.20250505.0.dist-info/licenses/AUTHORS,sha256=DJIRsjyrFxKjFvmpUNDRDBS04nRiJ5B6FpKcDcfnoGM,36
+osism-0.20250505.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+osism-0.20250505.0.dist-info/METADATA,sha256=9UPuB22oJMzuSpvDxVYVXTun60Wz4uBvtE7fMUKJKBY,2972
+osism-0.20250505.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+osism-0.20250505.0.dist-info/entry_points.txt,sha256=DlfrvU14rI55WuTrwNRoce9FY3ric4HeZKZx_Z3NzCw,3015
+osism-0.20250505.0.dist-info/pbr.json,sha256=xWRK5iE40MX99mSkANXdqP33gzUrHwuP4JmJG0hUNMA,47
+osism-0.20250505.0.dist-info/top_level.txt,sha256=8L8dsI9hcaGHsdnR4k_LN9EM78EhwrXRFHyAryPXZtY,6
+osism-0.20250505.0.dist-info/RECORD,,

{osism-0.20250407.0.dist-info → osism-0.20250505.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

osism-0.20250505.0.dist-info/licenses/AUTHORS

@@ -0,0 +1 @@
+janhorstmann <horstmann@osism.tech>

osism-0.20250505.0.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "6139ca4", "is_release": false}

osism-0.20250407.0.dist-info/licenses/AUTHORS

@@ -1 +0,0 @@
-renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

osism-0.20250407.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "976a50a", "is_release": false}