primitive 0.2.70__tar.gz → 0.2.72__tar.gz

{primitive-0.2.70 → primitive-0.2.72}/.vscode/settings.json

@@ -3,6 +3,7 @@
     "ajob",
     "cafile",
     "Checkin",
+    "efibootmgr",
     "loguru",
     "machdep",
     "Mbit",

{primitive-0.2.70 → primitive-0.2.72}/PKG-INFO

@@ -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 → primitive-0.2.72}/src/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-0.2.72/src/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-0.2.70 → primitive-0.2.72}/src/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-0.2.70 → primitive-0.2.72}/src/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-0.2.70 → primitive-0.2.72}/src/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-0.2.70 → primitive-0.2.72}/src/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-0.2.70 → primitive-0.2.72}/src/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-0.2.70 → primitive-0.2.72}/src/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()