osism 0.20251003.0__py3-none-any.whl → 0.20251012.0__py3-none-any.whl

osism/commands/server.py

@@ -108,6 +108,18 @@ class ServerList(Command):
         parser.add_argument(
             "--project-domain", help="Domain of the project", type=str, default=None
         )
+        parser.add_argument(
+            "--user",
+            default=None,
+            type=str,
+            help="Only list servers for the given user (name or ID)",
+        )
+        parser.add_argument(
+            "--user-domain",
+            default=None,
+            type=str,
+            help="Domain the user belongs to (name or ID)",
+        )
         return parser
 
     def take_action(self, parsed_args):
@@ -115,8 +127,31 @@ class ServerList(Command):
         domain = parsed_args.domain
         project = parsed_args.project
         project_domain = parsed_args.project_domain
+        user = parsed_args.user
+        user_domain = parsed_args.user_domain
 
         result = []
+
+        # Handle user lookup if --user is specified
+        user_id = None
+        if user:
+            user_query = {}
+
+            if user_domain:
+                u_d = conn.identity.find_domain(user_domain, ignore_missing=True)
+                if u_d and "id" in u_d:
+                    user_query = dict(domain_id=u_d.id)
+                else:
+                    logger.error(f"No domain found for {user_domain}")
+                    return
+
+            u = conn.identity.find_user(user, ignore_missing=True, **user_query)
+            if u and "id" in u:
+                user_id = u.id
+            else:
+                logger.error(f"No user found for {user}")
+                return
+
         if domain:
             _domain = conn.identity.find_domain(domain)
             if not _domain:
@@ -131,6 +166,7 @@ class ServerList(Command):
                         [
                             project.name,
                             project.id,
+                            server.user_id if hasattr(server, "user_id") else None,
                             server.id,
                             server.name,
                             server.flavor["original_name"],
@@ -141,7 +177,15 @@ class ServerList(Command):
             print(
                 tabulate(
                     result,
-                    headers=["Project", "Project ID", "ID", "Name", "Flavor", "Status"],
+                    headers=[
+                        "Project",
+                        "Project ID",
+                        "User ID",
+                        "ID",
+                        "Name",
+                        "Flavor",
+                        "Status",
+                    ],
                     tablefmt="psql",
                 )
             )
@@ -161,9 +205,20 @@ class ServerList(Command):
                 return
             query = {"project_id": _project.id}
 
+            # Get domain name from project
+            domain_name = None
+            if hasattr(_project, "domain_id") and _project.domain_id:
+                try:
+                    _domain = conn.identity.get_domain(_project.domain_id)
+                    domain_name = _domain.name if _domain else _project.domain_id
+                except Exception:
+                    domain_name = _project.domain_id
+
             for server in conn.compute.servers(all_projects=True, **query):
                 result.append(
                     [
+                        domain_name,
+                        server.user_id if hasattr(server, "user_id") else None,
                         server.id,
                         server.name,
                         server.flavor["original_name"],
@@ -174,7 +229,47 @@ class ServerList(Command):
             print(
                 tabulate(
                     result,
-                    headers=["ID", "Name", "Flavor", "Status"],
+                    headers=["Domain", "User ID", "ID", "Name", "Flavor", "Status"],
+                    tablefmt="psql",
+                )
+            )
+
+        elif user_id:
+            query = {"user_id": user_id}
+
+            for server in conn.compute.servers(all_projects=True, **query):
+                # Get domain name from project
+                domain_name = None
+                if hasattr(server, "project_id") and server.project_id:
+                    try:
+                        _project = conn.identity.get_project(server.project_id)
+                        if (
+                            _project
+                            and hasattr(_project, "domain_id")
+                            and _project.domain_id
+                        ):
+                            _domain = conn.identity.get_domain(_project.domain_id)
+                            domain_name = (
+                                _domain.name if _domain else _project.domain_id
+                            )
+                    except Exception:
+                        domain_name = None
+
+                result.append(
+                    [
+                        domain_name,
+                        server.project_id if hasattr(server, "project_id") else None,
+                        server.id,
+                        server.name,
+                        server.flavor["original_name"],
+                        server.status,
+                    ]
+                )
+
+            print(
+                tabulate(
+                    result,
+                    headers=["Domain", "Project ID", "ID", "Name", "Flavor", "Status"],
                     tablefmt="psql",
                 )
             )

osism/commands/stress.py

@@ -0,0 +1,213 @@
+# SPDX-License-Identifier: Apache-2.0
+
+import subprocess
+
+from cliff.command import Command
+from loguru import logger
+
+
+class OpenStackStress(Command):
+    """Run OpenStack stress testing tool"""
+
+    def get_parser(self, prog_name):
+        parser = super(OpenStackStress, self).get_parser(prog_name)
+
+        # Boolean flags
+        parser.add_argument(
+            "--no-cleanup",
+            action="store_true",
+            help="Do not clean up resources after test",
+        )
+        parser.add_argument(
+            "--debug",
+            action="store_true",
+            help="Enable debug mode",
+        )
+        parser.add_argument(
+            "--no-delete",
+            action="store_true",
+            help="Do not delete resources",
+        )
+        parser.add_argument(
+            "--no-volume",
+            action="store_true",
+            help="Do not create volumes",
+        )
+        parser.add_argument(
+            "--no-boot-volume",
+            action="store_true",
+            help="Do not use boot volumes",
+        )
+        parser.add_argument(
+            "--no-wait",
+            action="store_true",
+            help="Do not wait for resources",
+        )
+
+        # Integer parameters with defaults
+        parser.add_argument(
+            "--interval",
+            type=int,
+            default=10,
+            help="Interval in seconds (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--number",
+            type=int,
+            default=1,
+            help="Number of instances (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--parallel",
+            type=int,
+            default=1,
+            help="Parallel operations (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--timeout",
+            type=int,
+            default=600,
+            help="Timeout in seconds (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--volume-number",
+            type=int,
+            default=1,
+            help="Number of volumes per instance (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--volume-size",
+            type=int,
+            default=1,
+            help="Volume size in GB (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--boot-volume-size",
+            type=int,
+            default=20,
+            help="Boot volume size in GB (default: %(default)s)",
+        )
+
+        # String parameters with defaults
+        parser.add_argument(
+            "--cloud",
+            type=str,
+            default="simple-stress",
+            help="Cloud name in clouds.yaml (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--flavor",
+            type=str,
+            default="SCS-1V-2",
+            help="Flavor name (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--image",
+            type=str,
+            default="Ubuntu 24.04",
+            help="Image name (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--subnet-cidr",
+            type=str,
+            default="10.100.0.0/16",
+            help="Subnet CIDR (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--prefix",
+            type=str,
+            default="simple-stress",
+            help="Resource name prefix (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--compute-zone",
+            type=str,
+            default="nova",
+            help="Compute availability zone (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--storage-zone",
+            type=str,
+            default="nova",
+            help="Storage availability zone (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--affinity",
+            type=str,
+            default="soft-anti-affinity",
+            choices=[
+                "soft-affinity",
+                "soft-anti-affinity",
+                "affinity",
+                "anti-affinity",
+            ],
+            help="Server group policy (default: %(default)s)",
+        )
+        parser.add_argument(
+            "--volume-type",
+            type=str,
+            default="__DEFAULT__",
+            help="Volume type (default: %(default)s)",
+        )
+
+        return parser
+
+    def take_action(self, parsed_args):
+        """Execute the OpenStack stress testing tool"""
+
+        # Build the command
+        command = [
+            "python3",
+            "/openstack-simple-stress/openstack_simple_stress/main.py",
+        ]
+
+        # Add boolean flags
+        if parsed_args.no_cleanup:
+            command.append("--no-cleanup")
+        if parsed_args.debug:
+            command.append("--debug")
+        if parsed_args.no_delete:
+            command.append("--no-delete")
+        if parsed_args.no_volume:
+            command.append("--no-volume")
+        if parsed_args.no_boot_volume:
+            command.append("--no-boot-volume")
+        if parsed_args.no_wait:
+            command.append("--no-wait")
+
+        # Add integer parameters
+        command.extend(["--interval", str(parsed_args.interval)])
+        command.extend(["--number", str(parsed_args.number)])
+        command.extend(["--parallel", str(parsed_args.parallel)])
+        command.extend(["--timeout", str(parsed_args.timeout)])
+        command.extend(["--volume-number", str(parsed_args.volume_number)])
+        command.extend(["--volume-size", str(parsed_args.volume_size)])
+        command.extend(["--boot-volume-size", str(parsed_args.boot_volume_size)])
+
+        # Add string parameters
+        command.extend(["--cloud", parsed_args.cloud])
+        command.extend(["--flavor", parsed_args.flavor])
+        command.extend(["--image", parsed_args.image])
+        command.extend(["--subnet-cidr", parsed_args.subnet_cidr])
+        command.extend(["--prefix", parsed_args.prefix])
+        command.extend(["--compute-zone", parsed_args.compute_zone])
+        command.extend(["--storage-zone", parsed_args.storage_zone])
+        command.extend(["--affinity", parsed_args.affinity])
+        command.extend(["--volume-type", parsed_args.volume_type])
+
+        logger.debug(
+            f"Executing OpenStack stress test with command: {' '.join(command)}"
+        )
+
+        # Execute the stress tool
+        try:
+            result = subprocess.run(command, check=False)
+            return result.returncode
+        except FileNotFoundError:
+            logger.error(
+                "OpenStack stress tool not found at /openstack-simple-stress/openstack_simple_stress/main.py"
+            )
+            return 1
+        except Exception as e:
+            logger.error(f"Error executing OpenStack stress tool: {e}")
+            return 1

osism/data/__init__.py

@@ -101,3 +101,37 @@ images:
         build_date: {{ image_builddate }}
 
 """
+
+TEMPLATE_IMAGE_CLUSTERAPI_GARDENER = """---
+images:
+  - name: ubuntu-capi-image-gardener
+    enable: true
+    keep: true
+    separator: "-"
+    format: qcow2
+    login: ubuntu
+    min_disk: 20
+    min_ram: 512
+    status: active
+    visibility: public
+    multi: false
+    meta:
+      architecture: x86_64
+      hw_disk_bus: scsi
+      hw_rng_model: virtio
+      hw_scsi_model: virtio-scsi
+      hw_watchdog_action: reset
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      replace_frequency: never
+      uuid_validity: none
+      provided_until: none
+      os_purpose: k8snode
+    tags: []
+    versions:
+      - version: "v{{ image_version }}"
+        url: "{{ image_url }}"
+        checksum: "{{ image_checksum }}"
+        build_date: {{ image_builddate }}
+
+"""

osism/data/enums.py

@@ -132,7 +132,7 @@ MAP_ROLE2ROLE = {
                                 [
                                     "keystone",
                                     [
-                                        ["neutron", ["wait-for-nova", ["octavia"]]],
+                                        ["neutron", [["wait-for-nova", ["octavia"]]]],
                                         "barbican",
                                         "designate",
                                         "ironic",
@@ -207,7 +207,7 @@ MAP_ROLE2ROLE = {
             [
                 "glance",
                 "cinder",
-                ["neutron", ["octavia"]],
+                ["neutron", [["wait-for-nova", ["octavia"]]]],
                 "designate",
                 ["placement", ["nova"]],
             ],
@@ -220,10 +220,9 @@ MAP_ROLE2ROLE = {
             [
                 "glance",
                 "cinder",
-                "neutron",
                 "barbican",
                 "designate",
-                "octavia",
+                ["neutron", [["wait-for-nova", ["octavia"]]]],
                 "ironic",
                 "kolla-ceph-rgw",
                 "magnum",
@@ -300,4 +299,55 @@ MAP_ROLE2ROLE = {
             ],
         ],
     ],
+    "cloudpod-infrastructure": [
+        "openstackclient",
+        "phpmyadmin",
+        [
+            "common",
+            [
+                ["loadbalancer", ["letsencrypt", "opensearch", "mariadb-ng"]],
+                ["openvswitch", ["ovn"]],
+                "memcached",
+                "redis",
+                "rabbitmq-ng",
+            ],
+        ],
+    ],
+    "cloudpod-openstack": [
+        "horizon",
+        [
+            "keystone",
+            [
+                "glance",
+                "cinder",
+                ["neutron", [["wait-for-nova", ["octavia"]]]],
+                ["placement", ["nova"]],
+                "designate",
+                "skyline",
+                "kolla-ceph-rgw",
+            ],
+        ],
+    ],
+    "cloudpod-ceph": [
+        [
+            "ceph-create-lvm-devices",
+            [
+                "facts",
+                [
+                    "ceph",
+                    [
+                        [
+                            "ceph-pools",
+                            [
+                                [
+                                    "copy-ceph-keys",
+                                    [["cephclient", ["ceph-bootstrap-dashboard"]]],
+                                ]
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ],
+    ],
 }

osism/tasks/__init__.py

@@ -13,6 +13,9 @@ from loguru import logger
 
 from osism import utils
 
+# Regex pattern for extracting hosts from Ansible output
+HOST_PATTERN = re.compile(r"^(ok|changed|failed|skipping|unreachable):\s+\[([^\]]+)\]")
+
 
 class Config:
     broker_connection_retry_on_startup = True
@@ -88,7 +91,7 @@ def get_container_version(worker):
 
 
 def log_play_execution(
-    request_id, worker, environment, role, hosts=None, result="started"
+    request_id, worker, environment, role, hosts=None, arguments=None, result="started"
 ):
     """Log Ansible play execution to central tracking file.
 
@@ -98,6 +101,7 @@ def log_play_execution(
         environment: The environment parameter
         role: The playbook/role that was executed
         hosts: List of hosts the play was executed against (default: empty list)
+        arguments: Command-line arguments passed to ansible-playbook (default: None)
         result: Execution result - "started", "success", or "failure"
     """
     log_file = Path("/share/ansible-execution-history.json")
@@ -105,6 +109,10 @@ def log_play_execution(
     # Get runtime version from YAML version file
     runtime_version = get_container_version(worker)
 
+    # Use provided hosts or empty list
+    if hosts is None:
+        hosts = []
+
     execution_record = {
         "timestamp": datetime.now(timezone.utc).isoformat().replace("+00:00", "Z"),
         "request_id": request_id,
@@ -112,7 +120,8 @@ def log_play_execution(
         "worker_version": runtime_version,
         "environment": environment,
         "role": role,
-        "hosts": hosts if isinstance(hosts, list) else [],
+        "hosts": hosts,
+        "arguments": arguments if arguments else "",
         "result": result,
     }
 
@@ -143,6 +152,7 @@ def run_ansible_in_environment(
     auto_release_time=3600,
 ):
     result = ""
+    extracted_hosts = set()  # Local set for host deduplication
 
     if type(arguments) == list:
         joined_arguments = " ".join(arguments)
@@ -181,7 +191,8 @@ def run_ansible_in_environment(
         worker=worker,
         environment=environment,
         role=role,
-        hosts=None,  # Host extraction would require inventory parsing
+        hosts=None,  # Hosts will be empty at start, filled at completion
+        arguments=joined_arguments,
         result="started",
     )
 
@@ -269,6 +280,13 @@ def run_ansible_in_environment(
 
     while p.poll() is None:
         line = p.stdout.readline().decode("utf-8")
+
+        # Extract hosts from Ansible output
+        match = HOST_PATTERN.match(line.strip())
+        if match:
+            hostname = match.group(2)
+            extracted_hosts.add(hostname)  # Local set (automatic deduplication)
+
         if publish:
             utils.push_task_output(request_id, line)
         result += line
@@ -281,7 +299,8 @@ def run_ansible_in_environment(
         worker=worker,
         environment=environment,
         role=role,
-        hosts=None,  # Host extraction would require inventory parsing
+        hosts=sorted(list(extracted_hosts)),  # Direct pass of extracted hosts
+        arguments=joined_arguments,
         result="success" if rc == 0 else "failure",
     )
 

osism/tasks/openstack.py

@@ -452,3 +452,83 @@ def flavor_manager(
         locking=locking,
         auto_release_time=auto_release_time,
     )
+
+
+@app.task(bind=True, name="osism.tasks.openstack.project_manager")
+def project_manager(
+    self,
+    *arguments,
+    publish=True,
+    locking=False,
+    auto_release_time=3600,
+    cloud=None,
+):
+    # Check if tasks are locked before execution
+    utils.check_task_lock_and_exit()
+
+    command = "/usr/local/bin/python3"
+    script_path = "/openstack-project-manager/openstack_project_manager/create.py"
+    # Prepend script path to arguments
+    full_arguments = [script_path] + list(arguments)
+
+    # Setup cloud environment (changes to /tmp)
+    temp_files_to_cleanup, original_cwd, cloud_setup_success = setup_cloud_environment(
+        cloud
+    )
+
+    try:
+        # Change to working directory required by openstack-project-manager
+        os.chdir("/openstack-project-manager")
+
+        return run_command(
+            self.request.id,
+            command,
+            {},
+            *full_arguments,
+            publish=publish,
+            locking=locking,
+            auto_release_time=auto_release_time,
+            ignore_env=True,
+        )
+    finally:
+        cleanup_cloud_environment(temp_files_to_cleanup, original_cwd)
+
+
+@app.task(bind=True, name="osism.tasks.openstack.project_manager_sync")
+def project_manager_sync(
+    self,
+    *arguments,
+    publish=True,
+    locking=False,
+    auto_release_time=3600,
+    cloud=None,
+):
+    # Check if tasks are locked before execution
+    utils.check_task_lock_and_exit()
+
+    command = "/usr/local/bin/python3"
+    script_path = "/openstack-project-manager/openstack_project_manager/manage.py"
+    # Prepend script path to arguments
+    full_arguments = [script_path] + list(arguments)
+
+    # Setup cloud environment (changes to /tmp)
+    temp_files_to_cleanup, original_cwd, cloud_setup_success = setup_cloud_environment(
+        cloud
+    )
+
+    try:
+        # Change to working directory required by openstack-project-manager
+        os.chdir("/openstack-project-manager")
+
+        return run_command(
+            self.request.id,
+            command,
+            {},
+            *full_arguments,
+            publish=publish,
+            locking=locking,
+            auto_release_time=auto_release_time,
+            ignore_env=True,
+        )
+    finally:
+        cleanup_cloud_environment(temp_files_to_cleanup, original_cwd)

{osism-0.20251003.0.dist-info → osism-0.20251012.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osism
-Version: 0.20251003.0
+Version: 0.20251012.0
 Summary: OSISM manager interface
 Home-page: https://github.com/osism/python-osism
 Author: OSISM GmbH
@@ -59,7 +59,7 @@ Requires-Dist: watchdog==6.0.0
 Requires-Dist: websockets==15.0.1
 Provides-Extra: ansible
 Requires-Dist: ansible-runner==2.4.1; extra == "ansible"
-Requires-Dist: ansible-core==2.19.2; extra == "ansible"
+Requires-Dist: ansible-core==2.19.3; extra == "ansible"
 Provides-Extra: openstack-image-manager
 Requires-Dist: openstack-image-manager==0.20250912.0; extra == "openstack-image-manager"
 Dynamic: author