primitive 0.2.66__py3-none-any.whl → 0.2.68__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.66"
+__version__ = "0.2.68"

primitive/agent/runner.py

@@ -9,6 +9,7 @@ from datetime import datetime, timezone
 
 from loguru import logger
 
+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
 from primitive.utils.psutil import kill_process_and_children
@@ -231,6 +232,7 @@ class Runner:
 
         for i, cmd in enumerate(commands):
             if cmd == "oobpowercycle":
+                logger.info("Performing out-of-band power cycle")
                 from primitive.network.redfish import RedfishClient
 
                 bmc_host = self.target_hardware_secret.get("bmcHostname", None)
@@ -253,15 +255,16 @@ class Runner:
                 )
                 redfish.compute_system_reset(system_id="1", reset_type="ForceRestart")
                 if self.target_hardware_id:
-                    self.primitive.hardware.update_hardware(
+                    await self.primitive.hardware.aupdate_hardware(
                         hardware_id=self.target_hardware_id,
                         is_online=False,
                         is_rebooting=True,
-                        start_rebooting_at=datetime.now(timezone.utc),
+                        start_rebooting_at=str(datetime.now(timezone.utc)),
                     )
                 continue
 
             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)
@@ -290,12 +293,19 @@ class Runner:
                 )
                 redfish.compute_system_reset(system_id="1", reset_type="ForceRestart")
                 if self.target_hardware_id:
-                    self.primitive.hardware.update_hardware(
+                    await self.primitive.hardware.aupdate_hardware(
                         hardware_id=self.target_hardware_id,
                         is_online=False,
                         is_rebooting=True,
-                        start_rebooting_at=datetime.now(timezone.utc),
+                        start_rebooting_at=str(datetime.now(timezone.utc)),
                     )
+                wait_for_ssh(
+                    hostname=self.target_hardware_secret.get("hostname"),
+                    username=self.target_hardware_secret.get("username"),
+                    password=self.target_hardware_secret.get("password"),
+                    port=22,
+                )
+                logger.info("PXE boot successful, SSH is now available")
                 continue
 
             args = ["/bin/bash", "-c", cmd]

primitive/hardware/actions.py

@@ -981,3 +981,39 @@ class Hardware(BaseAction):
         logger.info(message)
 
         return result
+
+    @guard
+    async def aupdate_hardware(
+        self,
+        hardware_id: str,
+        is_online: Optional[bool] = None,
+        is_rebooting: Optional[bool] = None,
+        start_rebooting_at: Optional[str] = None,
+    ):
+        new_state: dict = {
+            "id": hardware_id,
+        }
+        if is_online is not None:
+            new_state["isOnline"] = is_online
+        if is_rebooting is not None:
+            new_state["isRebooting"] = is_rebooting
+        if start_rebooting_at is not None:
+            new_state["startRebootingAt"] = start_rebooting_at
+
+        mutation = gql(hardware_update_mutation)
+
+        input = new_state
+        variables = {"input": input}
+        try:
+            result = await self.primitive.session.execute_async(
+                mutation, variable_values=variables, get_execution_result=True
+            )
+        except client_exceptions.ClientConnectorError as exception:
+            message = "Failed to update hardware! "
+            logger.exception(message)
+            raise exception
+
+        message = "Updated hardware successfully! "
+        logger.info(message)
+
+        return result

primitive/network/ssh.py

@@ -0,0 +1,94 @@
+import paramiko
+import socket
+import time
+
+
+def test_ssh_connection(hostname, username, password=None, key_filename=None, port=22):
+    """
+    Tests an SSH connection to a remote host.
+
+    Args:
+        hostname (str): The hostname or IP address of the remote SSH server.
+        username (str): The username for authentication.
+        password (str, optional): The password for authentication. Defaults to None.
+        key_filename (str, optional): Path to the private key file for authentication. Defaults to None.
+        port (int, optional): The SSH port. Defaults to 22.
+
+    Returns:
+        bool: True if the connection is successful, False otherwise.
+    """
+    ssh_client = paramiko.SSHClient()
+    ssh_client.set_missing_host_key_policy(
+        paramiko.AutoAddPolicy()
+    )  # Auto-add new host keys
+
+    try:
+        if password:
+            ssh_client.connect(
+                hostname=hostname, port=port, username=username, password=password
+            )
+        elif key_filename:
+            ssh_client.connect(
+                hostname=hostname,
+                port=port,
+                username=username,
+                key_filename=key_filename,
+            )
+        else:
+            print(
+                "Error: Either password or key_filename must be provided for authentication."
+            )
+            return False
+
+        print(f"Successfully connected to {hostname} as {username}")
+        return True
+    except paramiko.AuthenticationException:
+        print(f"Authentication failed for {username} on {hostname}")
+        return False
+    except paramiko.SSHException as e:
+        print(f"SSH error connecting to {hostname}: {e}")
+        return False
+    except socket.error as e:
+        print(f"Socket error connecting to {hostname}: {e}")
+        return False
+    except Exception as e:
+        print(f"An unexpected error occurred: {e}")
+        return False
+    finally:
+        ssh_client.close()
+
+
+TEN_MINUTES = 60 * 10
+
+
+def wait_for_ssh(
+    hostname, username, password=None, key_filename=None, port=22, timeout=TEN_MINUTES
+):
+    """
+    Waits until an SSH connection to a remote host can be established.
+
+    Args:
+        hostname (str): The hostname or IP address of the remote SSH server.
+        username (str): The username for authentication.
+        password (str, optional): The password for authentication. Defaults to None.
+        key_filename (str, optional): Path to the private key file for authentication. Defaults to None.
+        port (int, optional): The SSH port. Defaults to 22.
+        timeout (int, optional): Maximum time to wait in seconds. Defaults to 300.
+
+    Returns:
+        bool: True if the connection is successful within the timeout, False otherwise.
+    """
+
+    start_time = time.time()
+    while time.time() - start_time < timeout:
+        if test_ssh_connection(
+            hostname, username, password=password, key_filename=key_filename, port=port
+        ):
+            return True
+        print(f"Waiting for SSH to become available on {hostname}...")
+        time.sleep(10)
+
+    print(
+        f"Timeout reached: Unable to connect to {hostname} via SSH within {timeout} seconds."
+    )
+    return False

{primitive-0.2.66.dist-info → primitive-0.2.68.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.66
+Version: 0.2.68
 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.66.dist-info → primitive-0.2.68.dist-info}/RECORD

@@ -1,11 +1,11 @@
-primitive/__about__.py,sha256=ZHOZYKO41emH20Bvp7WJ22vSZsHO5IRCfpWpII9LKbg,130
+primitive/__about__.py,sha256=C8M6D49G3Ebr3FPG2sD1HtX3IjFMyfqC0icwwuBfmp8,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=kLjqyNijkbElbH8XhEtR6vjPc5uwOoh9mKEf2RkcfKk,2608
 primitive/client.py,sha256=n0eQAft3lQyTT_tVE1_1BWSsh8G7gJI2kHBuXLvZVEY,3836
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/agent/actions.py,sha256=ohY81bflsYSTsNgo2o2WP_tZr66haX4z319zf5oib-4,9362
 primitive/agent/commands.py,sha256=o847pK7v7EWQGG67tky6a33qtwoutX6LZrP2FIS_NOk,388
-primitive/agent/runner.py,sha256=oKMCkZpeHGENLXgLIFMgOitrjIpUGYUQmcfTWwSsqSM,15598
+primitive/agent/runner.py,sha256=QoRsehNhpcdCXeidi_YO1W4REjAJ2UR8ZecyePTmc-g,16177
 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 +40,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=kSQ1DufDCwxY5fs3zNMj7evAunEF8vt36a7rgtjI7Uw,37323
+primitive/hardware/actions.py,sha256=yCBIGV9zwkeeW3NykdoOLCXefEC2C-z4LlfQImZY_Mc,38471
 primitive/hardware/android.py,sha256=tu7pBPxWFrIwb_mm5CEdFFf1_veNDOKjOCQg13i_Lh4,2758
 primitive/hardware/commands.py,sha256=XU365RByl75ECAV_GdA4xxLrmZkwo1axlw9ZH0k3yRk,4751
 primitive/hardware/ui.py,sha256=12rucuZ2s-w5R4bKyxON5dEbrdDnVf5sbj3K_nbdo44,2473
@@ -63,6 +63,7 @@ primitive/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 primitive/network/actions.py,sha256=qpkn9U7LTDzdoOntiFP2sBPCQYEraRjAYrkcPzhmw78,17021
 primitive/network/commands.py,sha256=F84KmwkG0DHNLIa7Em8LMm2XDOaKMCWRpcFej8olxM0,1071
 primitive/network/redfish.py,sha256=uOtAS_Dwc4I4bnWKNSTCQ_xsj5LTtRzW5v2P_fWaSJM,4248
+primitive/network/ssh.py,sha256=a4LNMCQEEbYxTczkfRBiFBahGtZ_h6KKOx6rGk2PFfM,3208
 primitive/network/ui.py,sha256=_i4lJ3hhTrPc_KS5EjXPkqqKkzdLCOdxxtk5MiDWsfU,504
 primitive/organizations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/organizations/actions.py,sha256=kVHOhG1oS2sI5p8uldSo5L-RUZsnG36eaulVuKLyZ-M,1863
@@ -104,8 +105,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.66.dist-info/METADATA,sha256=sjynK6BDitz1RZTZyJnxC9T7Pms8jgLwHZmmdUq9Uvk,3569
-primitive-0.2.66.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.66.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.66.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.66.dist-info/RECORD,,
+primitive-0.2.68.dist-info/METADATA,sha256=Z16gZVIM8zx0JvTsSjpQrrbzl69hskD2JDRUtGoA6CQ,3569
+primitive-0.2.68.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.68.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.68.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.68.dist-info/RECORD,,