feat(k8sworker): combine commands

Signed-off-by: Chris Snow <[email protected]>

Author: snowch

README.md

@@ -75,10 +75,12 @@ hpecp lock delete-all
 
 Add K8s worker host:
 ```sh
-hpecp k8sworker create-with-ssh-key --ip 10.1.0.10 --ssh-key-file controller_private.key
-hpecp k8sworker wait-for-status --id /api/v2/worker/1 --status  [storage_pending] --timeout-secs 600
-hpecp k8sworker set-storage --id /api/v2/worker/1 --persistent-disks=/dev/nvme1n1 --ephemeral-disks=/dev/nvme2n1
-hpecp k8sworker wait-for-status --id /api/v2/worker/1 --status  [ready] --timeout-secs 600
+hpecp k8sworker create-with-ssh-key \
+    --ip 10.1.0.10 \
+    --ssh-key-file controller_private.key \
+    --persistent-disks /dev/nvme1n1 \
+    --ephemeral-disks /dev/nvme2n1 \
+    --wait-for-operation-secs 600
 ```
 
 K8s versions:

bin/cli.py

@@ -614,7 +614,14 @@ def __init__(self):
 
     @intercept_exception
     def create_with_ssh_key(
-        self, ip=None, ssh_key=None, ssh_key_file=None, tags=[],
+        self,
+        ip=None,
+        ssh_key=None,
+        ssh_key_file=None,
+        tags=[],
+        ephemeral_disks=None,
+        persistent_disks=None,
+        wait_for_operation_secs=0,
     ):
         """Create a K8s Worker using SSH key authentication.
 
@@ -630,6 +637,15 @@ def create_with_ssh_key(
             The SSH key file path, by default None
         tags : list, optional
             Tags to use, e.g. "{ "tag1": "foo", "tag2": "bar"}", by default []
+        ephemeral_disks : str
+            Comma separated string containing ephemeral disks.
+            e.g: "/dev/nvme2n1,/dev/nvme2n2"
+        persistent_disks : str, optional
+            Comma separated string containing persistent disks, by default
+            None.
+            e.g: "/dev/nvme1n1,/dev/nvme1n2"
+        wait_for_operation_secs: int
+            wait for operations to complete. 0 = don't wait
         """
         if ssh_key is None and ssh_key_file is None:
             print(
@@ -652,6 +668,28 @@ def create_with_ssh_key(
         worker_id = get_client().k8s_worker.create_with_ssh_key(
             ip=ip, ssh_key_data=ssh_key, tags=tags,
         )
+
+        if wait_for_operation_secs > 0:
+            self.wait_for_status(
+                id=worker_id,
+                status=["storage_pending"],
+                timeout_secs=wait_for_operation_secs,
+            )
+
+        if ephemeral_disks is not None or persistent_disks is not None:
+            self.set_storage(
+                id=worker_id,
+                ephemeral_disks=ephemeral_disks,
+                persistent_disks=persistent_disks,
+            )
+
+        if wait_for_operation_secs > 0:
+            self.wait_for_status(
+                id=worker_id,
+                status=["ready"],
+                timeout_secs=wait_for_operation_secs,
+            )
+
         print(worker_id)
 
     # TODO: verify with engineering if setup_log is a valid parameter