primitive 0.2.70__py3-none-any.whl → 0.2.72__py3-none-any.whl

primitive/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2025-present Dylan Stein <dylan@primitive.tech>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.2.70"
+__version__ = "0.2.72"

primitive/agent/pxe.py

@@ -0,0 +1,71 @@
+from loguru import logger
+
+from primitive.network.redfish import RedfishClient
+from primitive.network.ssh import test_ssh_connection, run_command
+
+
+def pxe_boot_via_redfish(target_hardware_secret: dict):
+    bmc_host = target_hardware_secret.get("bmcHostname", None)
+    bmc_username = target_hardware_secret.get("bmcUsername", None)
+    bmc_password = target_hardware_secret.get("bmcPassword", "")
+
+    if bmc_host is None:
+        logger.error(
+            "No BMC host found in target hardware secret for out-of-band power cycle"
+        )
+        return True
+    if bmc_username is None:
+        logger.error(
+            "No BMC username found in target hardware secret for out-of-band power cycle"
+        )
+        return True
+
+    redfish = RedfishClient(host=bmc_host, username=bmc_username, password=bmc_password)
+    redfish.update_boot_options(
+        system_id="1",
+        boot_source_override_target="Pxe",
+        boot_source_override_enabled="Once",
+        boot_source_override_mode="UEFI",
+    )
+    redfish.compute_system_reset(system_id="1", reset_type="ForceRestart")
+
+
+def pxe_boot_via_efibootmgr(target_hardware_secret: dict):
+    run_command(
+        hostname=target_hardware_secret.get("hostname"),
+        username=target_hardware_secret.get("username"),
+        password=target_hardware_secret.get("password"),
+        command="sudo efibootmgr -n $(efibootmgr | awk '/PXE IPV4/ {print substr($1,5,4)}' | head -n1 || efibootmgr | awk '/ubuntu/ {print substr($1,5,4)}' | head -n1) && sudo reboot",
+        port=22,
+    )
+
+
+def pxe_boot(target_hardware_secret: dict) -> bool:
+    redfish_available = False
+    ssh_available = False
+
+    if target_hardware_secret.get("bmcHostname", None):
+        redfish_available = True
+    else:
+        logger.info(
+            "No BMC credentials found, skipping Redfish PXE boot method. Checking efiboot method."
+        )
+
+    ssh_available = test_ssh_connection(
+        hostname=target_hardware_secret.get("hostname"),
+        username=target_hardware_secret.get("username"),
+        password=target_hardware_secret.get("password"),
+        port=22,
+    )
+
+    if redfish_available:
+        pxe_boot_via_redfish(target_hardware_secret=target_hardware_secret)
+        return True
+    elif ssh_available:
+        pxe_boot_via_efibootmgr(target_hardware_secret=target_hardware_secret)
+        return True
+    else:
+        logger.error(
+            "No available method to PXE boot target hardware. Missing BMC credentials and SSH is not available."
+        )
+    return False

primitive/agent/runner.py

@@ -10,6 +10,7 @@ from datetime import datetime, timezone
 
 from loguru import logger
 
+from primitive.agent.pxe import pxe_boot
 from primitive.network.ssh import wait_for_ssh
 from primitive.utils.cache import get_artifacts_cache, get_logs_cache, get_sources_cache
 from primitive.utils.logging import fmt, log_context
@@ -287,33 +288,9 @@ class Runner:
 
             if cmd == "pxeboot":
                 logger.info("Setting next boot to PXE and rebooting")
-                from primitive.network.redfish import RedfishClient
-
-                bmc_host = self.target_hardware_secret.get("bmcHostname", None)
-                bmc_username = self.target_hardware_secret.get("bmcUsername", None)
-                bmc_password = self.target_hardware_secret.get("bmcPassword", "")
 
-                if bmc_host is None:
-                    logger.error(
-                        "No BMC host found in target hardware secret for out-of-band power cycle"
-                    )
-                    return True
-                if bmc_username is None:
-                    logger.error(
-                        "No BMC username found in target hardware secret for out-of-band power cycle"
-                    )
-                    return True
+                pxe_boot(target_hardware_secret=self.target_hardware_secret)
 
-                redfish = RedfishClient(
-                    host=bmc_host, username=bmc_username, password=bmc_password
-                )
-                redfish.update_boot_options(
-                    system_id="1",
-                    boot_source_override_target="Pxe",
-                    boot_source_override_enabled="Once",
-                    boot_source_override_mode="UEFI",
-                )
-                redfish.compute_system_reset(system_id="1", reset_type="ForceRestart")
                 if self.target_hardware_id:
                     await self.primitive.hardware.aupdate_hardware(
                         hardware_id=self.target_hardware_id,

primitive/hardware/actions.py

@@ -421,7 +421,10 @@ class Hardware(BaseAction):
     def _get_ubuntu_installed_packages(self):
         try:
             lines = (
-                subprocess.check_output(["apt", "list", "--installed"])
+                subprocess.check_output(
+                    ["apt", "list", "--installed"],
+                    stderr=subprocess.DEVNULL,
+                )
                 .decode("utf-8")
                 .strip()
                 .split("\n")
@@ -793,7 +796,7 @@ class Hardware(BaseAction):
         if slug is not None:
             filters["slug"] = {"exact": slug}
         if id is not None:
-            filters["id"] = {"exact": id}
+            filters["id"] = id
         # if nested_children is True:
         #     filters["hasParent"] = {"exact": False}
 
@@ -1206,3 +1209,11 @@ class Hardware(BaseAction):
         logger.info(message)
 
         return result
+
+    def push_own_system_info(self):
+        if self.primitive.messaging.ready:
+            message = {"system_info": self.primitive.hardware.get_system_info()}
+            self.primitive.messaging.send_message(
+                message_type=MESSAGE_TYPES.SYSTEM_INFO,
+                message=message,
+            )

primitive/messaging/provider.py

@@ -27,6 +27,7 @@ CELERY_TASK_NAME = "hardware.tasks.task_receive_hardware_message"
 
 class MESSAGE_TYPES(enum.Enum):
     CHECK_IN = "CHECK_IN"
+    SYSTEM_INFO = "SYSTEM_INFO"
     METRICS = "METRICS"
     SWITCH_AND_INTERFACES_INFO = "SWITCH_AND_INTERFACES_INFO"
     OWN_NETWORK_INTERFACES = "OWN_NETWORK_INTERFACES"

primitive/monitor/actions.py

@@ -94,7 +94,7 @@ class Monitor(BaseAction):
                         if hardware.get("isController", False):
                             self.primitive.hardware.get_and_set_switch_info()
                             self.primitive.network.push_switch_and_interfaces_info()
-                        self.primitive.network.push_own_network_interfaces()
+                        self.primitive.hardware.push_own_system_info()
                         self.primitive.hardware._sync_children(hardware=hardware)
 
                         sleep_amount = 5

primitive/network/actions.py

@@ -8,6 +8,7 @@ from paramiko import SSHClient
 from typing import TypedDict
 import re
 
+from primitive.hardware.actions import does_executable_exist
 from primitive.messaging.provider import MESSAGE_TYPES
 from primitive.utils.actions import BaseAction
 
@@ -372,6 +373,9 @@ class Network(BaseAction):
         return ip_to_mac_address_info
 
     def get_ip_arp_table_via_ip_command(self):
+        if does_executable_exist("ip") is False:
+            return []
+
         command = "ip --json neigh show"
         ip_result = None
         with Popen(command.split(" "), stdout=PIPE) as process:
@@ -458,6 +462,7 @@ class Network(BaseAction):
         return False
 
     def push_switch_and_interfaces_info(self, interfaces_info: dict | None = None):
+        logger.debug("Pushing switch and interfaces info")
         if self.primitive.messaging.ready and self.switch_connection_info is not None:
             switch_info = self.get_switch_info()
             interfaces_info = interfaces_info or self.get_interfaces_info()
@@ -473,13 +478,4 @@ class Network(BaseAction):
                     message_type=MESSAGE_TYPES.SWITCH_AND_INTERFACES_INFO,
                     message=message,
                 )
-
-    def push_own_network_interfaces(self):
-        if self.primitive.messaging.ready:
-            message = {
-                "network_interfaces": self.primitive.hardware._get_network_interfaces()
-            }
-            self.primitive.messaging.send_message(
-                message_type=MESSAGE_TYPES.OWN_NETWORK_INTERFACES,
-                message=message,
-            )
+                logger.debug("Switch and interfaces info pushed")

primitive/network/ssh.py

@@ -27,7 +27,13 @@ def test_ssh_connection(hostname, username, password=None, key_filename=None, po
     try:
         if password:
             ssh_client.connect(
-                hostname=hostname, port=port, username=username, password=password
+                hostname=hostname,
+                port=port,
+                username=username,
+                password=password,
+                banner_timeout=60,
+                timeout=60,
+                auth_timeout=60,
             )
         elif key_filename:
             ssh_client.connect(
@@ -35,26 +41,29 @@ def test_ssh_connection(hostname, username, password=None, key_filename=None, po
                 port=port,
                 username=username,
                 key_filename=key_filename,
+                banner_timeout=60,
+                timeout=60,
+                auth_timeout=60,
             )
         else:
-            print(
+            logger.error(
                 "Error: Either password or key_filename must be provided for authentication."
             )
             return False
 
-        print(f"Successfully connected to {hostname} as {username}")
+        logger.info(f"Successfully connected to {hostname} as {username}")
         return True
     except paramiko.AuthenticationException:
-        print(f"Authentication failed for {username} on {hostname}")
+        logger.debug(f"Authentication failed for {username} on {hostname}")
         return False
     except paramiko.SSHException as exception:
-        print(f"SSH error connecting to {hostname}: {exception}")
+        logger.debug(f"SSH error connecting to {hostname}: {exception}")
         return False
     except socket.error as exception:
-        print(f"Socket error connecting to {hostname}: {exception}")
+        logger.debug(f"Socket error connecting to {hostname}: {exception}")
         return False
     except Exception as exception:
-        print(f"An unexpected error occurred: {exception}")
+        logger.debug(f"An unexpected error occurred: {exception}")
         return False
     finally:
         ssh_client.close()

primitive/operating_systems/actions.py

@@ -17,13 +17,16 @@ import os
 from loguru import logger
 
 from primitive.utils.checksums import get_checksum_from_file, calculate_sha256
+from primitive.utils.text import slugify
 
 
 class OperatingSystems(BaseAction):
     def __init__(self, primitive):
         super().__init__(primitive)
+        self.operating_systems_key_prefix = "operating-systems"
         self.remote_operating_systems = {
             "ubuntu-24-04-3": {
+                "slug": "ubuntu-24-04-3",
                 "iso": "https://releases.ubuntu.com/24.04.3/ubuntu-24.04.3-desktop-amd64.iso",
                 "checksum": "https://releases.ubuntu.com/24.04.3/SHA256SUMS",
                 "checksum_file_type": self.OperatingSystemChecksumFileType.SHA256SUMS,
@@ -33,13 +36,17 @@ class OperatingSystems(BaseAction):
     class OperatingSystemChecksumFileType(Enum):
         SHA256SUMS = "SHA256SUMS"
 
-    def get_remote_operating_system_names(self):
-        return list(self.remote_operating_systems.keys())
+    def list_remotes(self):
+        return self.remote_operating_systems.values()
 
-    def _download_remote_operating_system_iso(self, remote_operating_system_name):
-        operating_system_dir = Path(
-            get_operating_systems_cache() / remote_operating_system_name
-        )
+    def get_remote_info(self, slug: str):
+        return self.remote_operating_systems[slug]
+
+    def _download_remote_operating_system_iso(
+        self, remote_operating_system_name: str, directory: str | None = None
+    ):
+        cache_dir = Path(directory) if directory else get_operating_systems_cache()
+        operating_system_dir = Path(cache_dir / remote_operating_system_name)
         iso_dir = Path(operating_system_dir / "iso")
         os.makedirs(iso_dir, exist_ok=True)
 
@@ -73,10 +80,11 @@ class OperatingSystems(BaseAction):
 
         return iso_file_path
 
-    def _download_remote_operating_system_checksum(self, remote_operating_system_name):
-        operating_system_dir = Path(
-            get_operating_systems_cache() / remote_operating_system_name
-        )
+    def _download_remote_operating_system_checksum(
+        self, remote_operating_system_name: str, directory: str | None = None
+    ):
+        cache_dir = Path(directory) if directory else get_operating_systems_cache()
+        operating_system_dir = Path(cache_dir / remote_operating_system_name)
         checksum_dir = Path(operating_system_dir / "checksum")
         os.makedirs(checksum_dir, exist_ok=True)
 
@@ -103,8 +111,10 @@ class OperatingSystems(BaseAction):
 
         return checksum_file_path
 
-    def download_from_remote(self, remote_operating_system_name: str):
-        remote_operating_system_names = self.get_remote_operating_system_names()
+    def download_remote(
+        self, remote_operating_system_name: str, directory: str | None = None
+    ):
+        remote_operating_system_names = list(self.remote_operating_systems.keys())
 
         if remote_operating_system_name not in remote_operating_system_names:
             logger.error(
@@ -115,20 +125,30 @@ class OperatingSystems(BaseAction):
             )
 
         iso_file_path = self._download_remote_operating_system_iso(
-            remote_operating_system_name
+            remote_operating_system_name,
+            directory=directory,
         )
         checksum_file_path = self._download_remote_operating_system_checksum(
-            remote_operating_system_name
+            remote_operating_system_name,
+            directory=directory,
         )
 
-        return iso_file_path, checksum_file_path
+        logger.info("Validating iso checksum")
+        checksum_valid = self.primitive.operating_systems._validate_checksum(
+            remote_operating_system_name, str(iso_file_path), str(checksum_file_path)
+        )
 
-    def get_checksum_file_type(self, operating_system_name: str):
-        return self.remote_operating_systems[operating_system_name][
-            "checksum_file_type"
-        ]
+        if not checksum_valid:
+            raise Exception(
+                "Checksums did not match:  file may have been corrupted during download."
+                + f"\nTry deleting the directory {get_operating_systems_cache()}/{remote_operating_system_name} and running this command again."
+            )
+
+        logger.info("Checksum valid")
 
-    def validate_checksum(
+        return iso_file_path, checksum_file_path
+
+    def _validate_checksum(
         self,
         operating_system_name: str,
         iso_file_path: str,
@@ -138,7 +158,7 @@ class OperatingSystems(BaseAction):
         checksum_file_type = (
             checksum_file_type
             if checksum_file_type
-            else self.get_checksum_file_type(operating_system_name)
+            else self.get_remote_info(operating_system_name)["checksum_file_type"]
         )
 
         match checksum_file_type:
@@ -157,8 +177,130 @@ class OperatingSystems(BaseAction):
         local_checksum = calculate_sha256(iso_file_path)
         return remote_checksum == local_checksum
 
+    def _upload_iso_file(
+        self, iso_file_path: Path, organization_id: str, operating_system_slug: str
+    ):
+        iso_upload_result = self.primitive.files.upload_file_direct(
+            path=iso_file_path,
+            organization_id=organization_id,
+            key_prefix=f"{self.operating_systems_key_prefix}/{operating_system_slug}",
+        )
+
+        if not iso_upload_result or iso_upload_result.data is None:
+            logger.error("Unable to upload iso file")
+            raise Exception("Unable to upload iso file")
+
+        iso_upload_data = iso_upload_result.data
+        iso_file_id = iso_upload_data.get("fileUpdate", {}).get("id")
+
+        if not iso_file_id:
+            logger.error("Unable to upload iso file")
+            raise Exception("Unable to upload iso file")
+
+        return iso_file_id
+
+    def _upload_checksum_file(
+        self, checksum_file_path: Path, organization_id: str, operating_system_slug: str
+    ):
+        checksum_upload_response = self.primitive.files.upload_file_via_api(
+            path=checksum_file_path,
+            organization_id=organization_id,
+            key_prefix=f"{self.operating_systems_key_prefix}/{operating_system_slug}",
+        )
+
+        if not checksum_upload_response.ok:
+            logger.error("Unable to upload checksum file")
+            raise Exception("Unable to upload checksum file")
+
+        checksum_file_id = (
+            checksum_upload_response.json()
+            .get("data", {})
+            .get("fileUpload", {})
+            .get("id", {})
+        )
+
+        if not checksum_file_id:
+            logger.error("Unable to upload checksum file")
+            raise Exception("Unable to upload checksum file")
+
+        return checksum_file_id
+
     @guard
-    def create_operating_system(
+    def create(
+        self,
+        slug: str,
+        iso_file: str,
+        checksum_file: str,
+        checksum_file_type: str,
+        organization_id: str,
+    ):
+        formatted_slug = slugify(slug)
+        is_slug_available = self.primitive.operating_systems._is_slug_available(
+            slug=formatted_slug,
+            organization_id=organization_id,
+        )
+
+        if not is_slug_available:
+            raise Exception(
+                f"Operating system with slug {formatted_slug} already exists."
+            )
+
+        is_known_checksum_file_type = (
+            checksum_file_type
+            in self.primitive.operating_systems.OperatingSystemChecksumFileType._value2member_map_
+        )
+
+        if not is_known_checksum_file_type:
+            raise Exception(
+                f"Operating system checksum file type {checksum_file_type} is not supported."
+                + f" Supported types are: {''.join([type.value for type in self.primitive.operating_systems.OperatingSystemChecksumFileType])}"
+            )
+
+        iso_file_path = Path(iso_file)
+        checksum_file_path = Path(checksum_file)
+
+        if not iso_file_path.is_file():
+            raise Exception(
+                f"ISO file {iso_file_path} does not exist or is not a file."
+            )
+
+        if not checksum_file_path.is_file():
+            raise Exception(
+                f"Checksum file {checksum_file_path} does not exist or is not a file."
+            )
+
+        logger.info("Uploading iso file. This may take a while...")
+        iso_file_id = self.primitive.operating_systems._upload_iso_file(
+            iso_file_path=iso_file_path,
+            organization_id=organization_id,
+            operating_system_slug=formatted_slug,
+        )
+
+        logger.info("Uploading checksum file")
+        checksum_file_id = self.primitive.operating_systems._upload_checksum_file(
+            checksum_file_path=checksum_file_path,
+            organization_id=organization_id,
+            operating_system_slug=formatted_slug,
+        )
+
+        logger.info("Creating operating system in primitive.")
+        operating_system_create_response = (
+            self.primitive.operating_systems._create_query(
+                slug=formatted_slug,
+                checksum_file_id=checksum_file_id,
+                checksum_file_type=checksum_file_type,
+                organization_id=organization_id,
+                iso_file_id=iso_file_id,
+            )
+        )
+
+        if "id" not in operating_system_create_response:
+            raise Exception("Failed to create operating system")
+
+        return operating_system_create_response
+
+    @guard
+    def _create_query(
         self,
         slug: str,
         organization_id: str,
@@ -181,7 +323,7 @@ class OperatingSystems(BaseAction):
         return result.data.get("operatingSystemCreate")
 
     @guard
-    def get_operating_system_list(
+    def list(
         self,
         organization_id: str,
         slug: str | None = None,
@@ -205,26 +347,97 @@ class OperatingSystems(BaseAction):
             query, variable_values=variables, get_execution_result=True
         )
 
-        return result
+        edges = result.data.get("operatingSystemList").get("edges", [])
+
+        nodes = [edge.get("node") for edge in edges]
+
+        return nodes
 
     @guard
-    def get_operating_system(
-        self, organization_id: str, slug: str | None = None, id: str | None = None
+    def download(
+        self,
+        organization_id: str,
+        id: str | None = None,
+        slug: str | None = None,
+        directory: str | None = None,
     ):
+        operating_system = self.primitive.operating_systems.get(
+            organization_id=organization_id, slug=slug, id=id
+        )
+
+        is_cached = self.primitive.operating_systems.is_operating_system_cached(
+            slug=operating_system["slug"],
+            directory=directory,
+        )
+
+        if is_cached:
+            raise Exception(
+                "Operating system already exists in cache, aborting download."
+            )
+
+        download_directory = (
+            Path(directory) / operating_system["slug"]
+            if directory
+            else (get_operating_systems_cache() / operating_system["slug"])
+        )
+        checksum_directory = download_directory / "checksum"
+        checksum_file_path = (
+            checksum_directory / operating_system["checksumFile"]["fileName"]
+        )
+        iso_directory = download_directory / "iso"
+        iso_file_path = iso_directory / operating_system["isoFile"]["fileName"]
+
+        if not iso_directory.exists():
+            iso_directory.mkdir(parents=True)
+
+        if not checksum_directory.exists():
+            checksum_directory.mkdir(parents=True)
+
+        logger.info("Downloading operating system iso")
+        self.primitive.files.download_file(
+            file_id=operating_system["isoFile"]["id"],
+            output_path=iso_directory,
+            organization_id=organization_id,
+        )
+
+        logger.info("Downloading operating system checksum")
+        self.primitive.files.download_file(
+            file_id=operating_system["checksumFile"]["id"],
+            output_path=checksum_directory,
+            organization_id=organization_id,
+        )
+
+        logger.info("Validating iso checksum")
+        checksum_file_type = (
+            self.primitive.operating_systems.OperatingSystemChecksumFileType[
+                operating_system["checksumFileType"]
+            ]
+        )
+        checksum_valid = self.primitive.operating_systems._validate_checksum(
+            operating_system["slug"],
+            iso_file_path,
+            checksum_file_path,
+            checksum_file_type=checksum_file_type,
+        )
+
+        if not checksum_valid:
+            raise Exception(
+                "Checksums did not match:  file may have been corrupted during download."
+                + f"\nTry deleting the directory {get_operating_systems_cache()}/{operating_system['slug']} and running this command again."
+            )
+
+        return download_directory
+
+    @guard
+    def get(self, organization_id: str, slug: str | None = None, id: str | None = None):
         if not (slug or id):
             raise Exception("Slug or id must be provided.")
         if slug and id:
             raise Exception("Only one of slug or id must be provided.")
 
-        operating_system_list_result = self.get_operating_system_list(
-            organization_id=organization_id, slug=slug, id=id
-        )
-
-        edges = operating_system_list_result.data.get("operatingSystemList").get(
-            "edges", []
-        )
+        operating_systems = self.list(organization_id=organization_id, slug=slug, id=id)
 
-        if len(edges) == 0:
+        if len(operating_systems) == 0:
             if slug:
                 logger.error(f"No operating system found for slug '{slug}'.")
                 raise Exception(f"No operating system  found for slug {slug}.")
@@ -232,10 +445,10 @@ class OperatingSystems(BaseAction):
                 logger.error(f"No operating system found for ID {id}.")
                 raise Exception(f"No operating system  found for ID {id}.")
 
-        return edges[0].get("node")
+        return operating_systems[0]
 
     @guard
-    def is_slug_available(self, slug: str, organization_id: str):
+    def _is_slug_available(self, slug: str, organization_id: str):
         query = gql(operating_system_list_query)
 
         variables = {

primitive/operating_systems/commands.py

@@ -1,11 +1,7 @@
-from pathlib import Path
-
 import click
 import typing
 from loguru import logger
 
-from ..utils.cache import get_operating_systems_cache
-from ..utils.text import slugify
 
 if typing.TYPE_CHECKING:
     from ..client import Primitive
@@ -18,22 +14,14 @@ def cli(context):
     pass
 
 
-@cli.command("download")
-@click.option("--id", help="Operating system ID", required=False)
-@click.option("--slug", help="Operating system slug", required=False)
-@click.option("--organization-slug", help="Organization slug", required=False)
+@cli.command("list")
 @click.option(
-    "--directory",
-    help="Directory to download the operating system files to",
+    "--organization-slug",
+    help="Organization slug to list operating systems for",
     required=False,
 )
 @click.pass_context
-def download(context, id, slug, organization_slug, directory):
-    if not (id or slug):
-        raise click.UsageError("You must provide either --id or --slug.")
-    if id and slug:
-        raise click.UsageError("You can only specify one of --id or --slug.")
-
+def operating_systems_list_command(context, organization_slug):
     primitive: Primitive = context.obj.get("PRIMITIVE")
 
     organization = (
@@ -44,81 +32,114 @@ def download(context, id, slug, organization_slug, directory):
 
     if not organization:
         if organization_slug:
-            logger.error(f"No organization found with slug {slug}")
+            logger.error(f"No organization found with slug {organization_slug}")
         else:
             logger.error("Failed to fetch default organization")
 
-    try:
-        operating_system = primitive.operating_systems.get_operating_system(
-            organization_id=organization["id"], slug=slug, id=id
-        )
-    except Exception:
-        logger.error("Unable to fetch operating system")
-        return
-
-    is_cached = primitive.operating_systems.is_operating_system_cached(
-        slug=operating_system["slug"],
-        directory=directory,
+    operating_systems = primitive.operating_systems.list(
+        organization_id=organization["id"]
     )
+    operating_system_slugs = [
+        operating_system["slug"] for operating_system in operating_systems
+    ]
 
-    if is_cached:
-        logger.info("Operating system already exists in cache, aborting download.")
-        return
-
-    operating_system_directory = (
-        Path(directory) / operating_system["slug"]
-        if directory
-        else (get_operating_systems_cache() / operating_system["slug"])
+    newline = "\n"
+    logger.info(
+        f"Operating systems: {newline}- {f'{newline}- '.join(operating_system_slugs)}"
     )
-    checksum_directory = operating_system_directory / "checksum"
-    checksum_file_path = (
-        checksum_directory / operating_system["checksumFile"]["fileName"]
-    )
-    iso_directory = operating_system_directory / "iso"
-    iso_file_path = iso_directory / operating_system["isoFile"]["fileName"]
 
-    if not iso_directory.exists():
-        iso_directory.mkdir(parents=True)
 
-    if not checksum_directory.exists():
-        checksum_directory.mkdir(parents=True)
+@cli.command("create")
+@click.option("--slug", help="Slug for created operating system", required=True)
+@click.option(
+    "--iso-file", help="Path to operating system iso file to upload", required=True
+)
+@click.option(
+    "--checksum-file",
+    help="Path to operating system checksum file to upload",
+    required=True,
+)
+@click.option(
+    "--checksum-file-type", help="The type of the checksum file", required=True
+)
+@click.option(
+    "--organization-slug",
+    help="Organization to create the operating system in",
+    required=False,
+)
+@click.pass_context
+def create_command(
+    context, slug, iso_file, checksum_file, checksum_file_type, organization_slug
+):
+    primitive: Primitive = context.obj.get("PRIMITIVE")
 
-    logger.info("Downloading operating system iso")
-    primitive.files.download_file(
-        file_id=operating_system["isoFile"]["id"],
-        output_path=iso_directory,
-        organization_id=organization["id"],
+    organization = (
+        primitive.organizations.get_organization(slug=organization_slug)
+        if organization_slug
+        else primitive.organizations.get_default_organization()
     )
 
-    logger.info("Downloading operating system checksum")
-    primitive.files.download_file(
-        file_id=operating_system["checksumFile"]["id"],
-        output_path=checksum_directory,
-        organization_id=organization["id"],
-    )
+    if not organization:
+        if organization_slug:
+            logger.error(f"No organization found with slug {organization_slug}")
+            return
+        else:
+            logger.error("Failed to fetch default organization")
+            return
 
-    logger.info("Validating iso checksum")
     try:
-        checksum_file_type = (
-            primitive.operating_systems.OperatingSystemChecksumFileType[
-                operating_system["checksumFileType"]
-            ]
-        )
-        checksum_valid = primitive.operating_systems.validate_checksum(
-            operating_system["slug"],
-            iso_file_path,
-            checksum_file_path,
+        primitive.operating_systems.create(
+            slug=slug,
+            iso_file=iso_file,
+            checksum_file=checksum_file,
             checksum_file_type=checksum_file_type,
+            organization_id=organization["id"],
         )
-    except Exception:
-        logger.error("Failed to validate checksum.")
+    except Exception as error:
+        logger.error(error)
         return
 
-    if not checksum_valid:
-        logger.error(
-            "Checksums did not match:  file may have been corrupted during download."
-            + f"\nTry deleting the directory {get_operating_systems_cache()}/{operating_system['slug']} and running this command again."
+    logger.success("Operating system created in primitive.")
+
+
+@cli.command("download")
+@click.option("--id", help="Operating system ID", required=False)
+@click.option("--slug", help="Operating system slug", required=False)
+@click.option("--organization-slug", help="Organization slug", required=False)
+@click.option(
+    "--directory",
+    help="Directory to download the operating system files to",
+    required=False,
+)
+@click.pass_context
+def download(context, id, slug, organization_slug, directory):
+    if not (id or slug):
+        raise click.UsageError("You must provide either --id or --slug.")
+    if id and slug:
+        raise click.UsageError("You can only specify one of --id or --slug.")
+
+    primitive: Primitive = context.obj.get("PRIMITIVE")
+
+    organization = (
+        primitive.organizations.get_organization(slug=organization_slug)
+        if organization_slug
+        else primitive.organizations.get_default_organization()
+    )
+
+    if not organization:
+        if organization_slug:
+            logger.error(f"No organization found with slug {organization_slug}")
+            return
+        else:
+            logger.error("Failed to fetch default organization")
+            return
+
+    try:
+        operating_system_directory = primitive.operating_systems.download(
+            id=id, slug=slug, organization_id=organization["id"], directory=directory
         )
+    except Exception as error:
+        logger.error(error)
         return
 
     logger.success(
@@ -133,6 +154,30 @@ def remotes(context):
     pass
 
 
+@remotes.command("download")
+@click.pass_context
+@click.argument("operating-system")
+@click.option(
+    "--directory",
+    help="Directory to download the operating system files to",
+    required=False,
+)
+def operating_system_remotes_download_command(
+    context, operating_system, directory=None
+):
+    primitive: Primitive = context.obj.get("PRIMITIVE")
+
+    try:
+        primitive.operating_systems.download_remote(
+            remote_operating_system_name=operating_system, directory=directory
+        )
+    except Exception as error:
+        logger.error(error)
+        return
+
+    logger.success(f"Successfully downloaded operating system files to {directory}")
+
+
 @remotes.command("mirror")
 @click.pass_context
 @click.argument("operating-system")
@@ -142,13 +187,16 @@ def remotes(context):
     help="Slug of the organization to upload the operating system to",
     required=False,
 )
+@click.option(
+    "--directory",
+    help="Directory to download the operating system files to",
+    required=False,
+)
 def operating_system_mirror_command(
-    context, operating_system, slug=None, organization_slug=None
+    context, operating_system, slug=None, organization_slug=None, directory=None
 ):
     primitive: Primitive = context.obj.get("PRIMITIVE")
 
-    operating_system_slug = slugify(slug) if slug else slugify(operating_system)
-
     organization = (
         primitive.organizations.get_organization(slug=organization_slug)
         if organization_slug
@@ -157,112 +205,42 @@ def operating_system_mirror_command(
 
     if not organization:
         if organization_slug:
-            logger.error(f"No organization found with slug {slug}.")
+            logger.error(f"No organization found with slug {organization_slug}.")
+            return
         else:
             logger.error("Failed to fetch default organization.")
+            return
 
-    is_slug_available = primitive.operating_systems.is_slug_available(
-        slug=operating_system_slug,
-        organization_id=organization["id"],
-    )
-
-    if not is_slug_available:
-        logger.error(
-            f"Operating system slug {operating_system_slug} already exists."
-            + " Please specify the --slug parameter to mirror the operating system with a different slug."
-        )
-        return
-
-    try:
-        iso_file_path, checksum_file_path = (
-            primitive.operating_systems.download_from_remote(operating_system)
-        )
-    except Exception:
-        logger.error("Unable to download operating system")
-        return
-
-    logger.info("Validating iso checksum")
     try:
-        checksum_valid = primitive.operating_systems.validate_checksum(
-            operating_system, iso_file_path, checksum_file_path
+        iso_file_path, checksum_file_path = primitive.operating_systems.download_remote(
+            operating_system, directory=directory
         )
-    except Exception:
-        logger.error("Failed to validate checksum.")
-        return
-
-    if not checksum_valid:
-        logger.error(
-            "Checksums did not match:  file may have been corrupted during download."
-            + f"\nTry deleting the directory {get_operating_systems_cache()}/{operating_system} and running this command again."
-        )
-        return
 
-    logger.info("Checksum valid")
+        checksum_file_type = primitive.operating_systems.get_remote_info(
+            operating_system
+        )["checksum_file_type"]
 
-    logger.info("Uploading operating system files to primitive.")
-    file_key_prefix = "operating-systems"
-
-    iso_upload_result = primitive.files.upload_file_direct(
-        path=iso_file_path,
-        organization_id=organization["id"],
-        key_prefix=file_key_prefix,
-    )
-
-    if iso_upload_result and iso_upload_result.data is not None:
-        iso_upload_data = iso_upload_result.data
-        iso_file_id = iso_upload_data.get("fileUpdate", {}).get("id")
-
-        if not iso_file_id:
-            logger.error("Unable to upload iso file")
-            return
-
-    checksum_upload_response = primitive.files.upload_file_via_api(
-        path=checksum_file_path,
-        organization_id=organization["id"],
-        key_prefix=file_key_prefix,
-    )
-
-    if not checksum_upload_response.ok:
-        logger.error("Unable to upload checksum file")
-        return
-
-    checksum_file_id = (
-        checksum_upload_response.json()
-        .get("data", {})
-        .get("fileUpload", {})
-        .get("id", {})
-    )
-
-    if not checksum_file_id:
-        logger.error("Unable to upload checksum file")
-        return
-
-    logger.info("Creating operating system in primitive.")
-    operating_system_create_response = (
-        primitive.operating_systems.create_operating_system(
-            slug=operating_system_slug,
-            checksum_file_id=checksum_file_id,
-            checksum_file_type=primitive.operating_systems.get_checksum_file_type(
-                operating_system
-            ).value,
+        primitive.operating_systems.create(
+            slug=slug if slug else operating_system,
+            iso_file=iso_file_path,
+            checksum_file=checksum_file_path,
+            checksum_file_type=checksum_file_type.value,
             organization_id=organization["id"],
-            iso_file_id=iso_file_id,
         )
-    )
-
-    if "id" not in operating_system_create_response:
-        logger.error("Failed to create operating system")
+    except Exception as error:
+        logger.error(error)
         return
 
-    logger.success("Operating system created in primitive.")
+    logger.success("Successfully mirrored operating system")
 
 
 @remotes.command("list")
 @click.pass_context
-def operating_system_list_command(context):
+def remote_operating_systems_list_command(context):
     primitive: Primitive = context.obj.get("PRIMITIVE")
-    remote_operating_system_names = (
-        primitive.operating_systems.get_remote_operating_system_names()
+    remotes_list = primitive.operating_systems.list_remotes()
+    remote_slugs = [remote["slug"] for remote in remotes_list]
+    newline = "\n"
+    logger.info(
+        f"Remote operating systems: {newline}- {f'{newline}- '.join(remote_slugs)}"
     )
-    logger.info("Remote operating systems available for download:")
-    logger.info("\n".join(remote_operating_system_names))

{primitive-0.2.70.dist-info → primitive-0.2.72.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.70
+Version: 0.2.72
 Project-URL: Documentation, https://github.com//primitivecorp/primitive-cli#readme
 Project-URL: Issues, https://github.com//primitivecorp/primitive-cli/issues
 Project-URL: Source, https://github.com//primitivecorp/primitive-cli

{primitive-0.2.70.dist-info → primitive-0.2.72.dist-info}/RECORD

@@ -1,11 +1,12 @@
-primitive/__about__.py,sha256=NOrCGYjwMjgYW_AaVMV1_PDAVaXvQrgfkCKN6ly7xDM,130
+primitive/__about__.py,sha256=pYIjjw7lxGTZ015Ir3hYhbZnOjU5lRO-cLrPQE5MBpw,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=ga1TcPKyUkGNGZ76CjIQqTKWn1r9di5k_uRbLljY07w,2745
 primitive/client.py,sha256=EyXLOFwKUT_ZB3at5m4hbdtjgaKVVFoiDdE0bP0_JfI,3966
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/agent/actions.py,sha256=SnYJQKOQgzGL2-zopWT2ioy9w7OP9pqAbS3itMq-614,9528
 primitive/agent/commands.py,sha256=o847pK7v7EWQGG67tky6a33qtwoutX6LZrP2FIS_NOk,388
-primitive/agent/runner.py,sha256=bYDH_kjoR8XrsxNsE2RfkGOJqfqX2M8jXyaFp3zGxqk,17760
+primitive/agent/pxe.py,sha256=XTu9Plj2mlmlL6YjcDqlfS_IGBK4i7aGKhTL-k_wnBU,2542
+primitive/agent/runner.py,sha256=nel7NiqWoIh5HFdoor9YIsPpMBJPHsevg3XtAHrKvc0,16619
 primitive/agent/uploader.py,sha256=DT_Nzt5eOTm_uRcYKm1sjBBaQZzp5iNZ_uN5XktfQ30,3382
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=9NIEXJ1BNJutJs6AMMSjMN_ziONUAUhY_xHwojYJCLA,942
@@ -40,7 +41,7 @@ primitive/graphql/relay.py,sha256=bmij2AjdpURQ6GGVCxwWhauF-r_SxuAU2oJ4sDbLxpI,72
 primitive/graphql/sdk.py,sha256=dE4TD8KiTKw3Y0uiw5XrIcuZGqexE47eSlPaPD6jDGo,1545
 primitive/graphql/utility_fragments.py,sha256=uIjwILC4QtWNyO5vu77VjQf_p0jvP3A9q_6zRq91zqs,303
 primitive/hardware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/hardware/actions.py,sha256=B0mkqNsjeMPFZsAgI23X1I8th2U1cqCg4Ugm3w6dxfk,44255
+primitive/hardware/actions.py,sha256=WdI7dd7TJen6xF8h63kH8PbCXydJfHlFF56QZdAgh5w,44645
 primitive/hardware/android.py,sha256=tu7pBPxWFrIwb_mm5CEdFFf1_veNDOKjOCQg13i_Lh4,2758
 primitive/hardware/commands.py,sha256=ZAbrqGuK4c4aCYPySaTUt51qFsf_F3Zsb0KaLfeVnmA,5045
 primitive/hardware/ui.py,sha256=12rucuZ2s-w5R4bKyxON5dEbrdDnVf5sbj3K_nbdo44,2473
@@ -56,18 +57,18 @@ primitive/jobs/graphql/fragments.py,sha256=I-Ly0TGARt_TdenLQ7877pGLWBzono_IMj7NC
 primitive/jobs/graphql/mutations.py,sha256=8ASvCmwQh7cMeeiykOdYaYVryG8FRIuVF6v_J8JJZuw,219
 primitive/jobs/graphql/queries.py,sha256=57B5mSnAYjNEFFk1P69odON0fqkf7FyhsA316pcxb6g,1712
 primitive/messaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/messaging/provider.py,sha256=NkR4hnQzEZ0SItno1TgYNvzTwgKZq03iNrnIpLK7MTg,4400
-primitive/monitor/actions.py,sha256=HO45Q1Cw9VTd2dITp-ftYJ4wJKt3YHHLdeJSqY-qhos,11085
+primitive/messaging/provider.py,sha256=BCkhRq_F6jKqf26x-9Da3ebCqgpjwxynRHIu7I7iFeQ,4432
+primitive/monitor/actions.py,sha256=Ky4KPNJc5c0LaxZkDs8-7pP2bQ6xNBFxmNf8eAmi7ag,11079
 primitive/monitor/commands.py,sha256=VDlEL_Qpm_ysHxug7VpI0cVAZ0ny6AS91Y58D7F1zkU,409
 primitive/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/network/actions.py,sha256=8JuArc8kRF-UjatxI1SbrD-F72ywGypmwDeijiXLTzw,18994
+primitive/network/actions.py,sha256=iw6X5zKdsFCQ8vAw_glEI6sdtVUeXdauW33PjsKL_QU,18874
 primitive/network/commands.py,sha256=wVszHkmmY85dwlEJR726vqx6rDcfD4XtAptgiHf5p4U,1361
 primitive/network/redfish.py,sha256=uOtAS_Dwc4I4bnWKNSTCQ_xsj5LTtRzW5v2P_fWaSJM,4248
-primitive/network/ssh.py,sha256=vVopUr7PoZsu2-n8BQfwr_IF39HgPbrxz9dKKoJqsdE,4095
+primitive/network/ssh.py,sha256=evtZFWFsKfuN4MeFtPpvzjBM1a5Q0O06rxd6ZkSzoJo,4377
 primitive/network/ui.py,sha256=-AV6OD1O3_nsTrgS-W49R6LfDN0vmXmz0Dli_S--LxE,685
 primitive/operating_systems/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/operating_systems/actions.py,sha256=68YUAowtvJ8jm5HBXHjnQ_K8q0Z83J2hS5rfPkoJ53A,9127
-primitive/operating_systems/commands.py,sha256=blZlHPKd1bfUImXP-AKUc7WGzMZ3Cm9wUI1--Q59JiQ,8523
+primitive/operating_systems/actions.py,sha256=SNeYC4QgG0H-ybmIQaAXhDj6c9yYG6BgIQfzU2wm8hY,16993
+primitive/operating_systems/commands.py,sha256=4qG3Ggf-sqLa0Cr6MErpjd6TOoc5_bE5tgJ8LigKKnw,7288
 primitive/operating_systems/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/operating_systems/graphql/mutations.py,sha256=L2ZeWEfBK22QAv2AsfDQWHKcwH5SWvMvcmOOftiEM7w,699
 primitive/operating_systems/graphql/queries.py,sha256=TJzcYbFP4SowsFJb8Wv8Q1r5_gCZRKbobEzniu9LWFk,738
@@ -112,8 +113,8 @@ primitive/utils/psutil.py,sha256=xa7ef435UL37jyjmUPbEqCO2ayQMpCs0HCrxVEvLcuM,763
 primitive/utils/shell.py,sha256=Z4zxmOaSyGCrS0D6I436iQci-ewHLt4UxVg1CD9Serc,2171
 primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
 primitive/utils/x509.py,sha256=HwHRPqakTHWd40ny-9O_yNknSL1Cxo50O0UCjXHFq04,3796
-primitive-0.2.70.dist-info/METADATA,sha256=6RjEuCX8ocvGe1cuwHtM3UN82KuKN5iLSyCtIlJavjQ,3569
-primitive-0.2.70.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.70.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.70.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.70.dist-info/RECORD,,
+primitive-0.2.72.dist-info/METADATA,sha256=L8m-fkO2D2xT8U2iUqr62x_NCoIvG8Rv3Em-RSlFAlY,3569
+primitive-0.2.72.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.72.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.72.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.72.dist-info/RECORD,,