hcs-cli 0.1.315__py3-none-any.whl → 0.1.317__py3-none-any.whl

hcs_cli/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.315"
+__version__ = "0.1.317"
 
 from . import service

hcs_cli/provider/hcs/edge.py

@@ -29,90 +29,96 @@ def deploy(data: dict, state: dict, save_state) -> dict:
     id = deployment["id"]
     providerLabel = data.get("providerLabel")
 
-    def is_ready(s):
-        return s in [
-            "CREATE_PENDING",
-            "CREATING",
-            "READY",
-            "POST_PROVISIONING_CONFIG_IN_PROGRESS",
-            "UPDATE_PENDING",
-            "UPDATING",
-            "UPGRADE_PENDING",
-            "UPGRADING",
-        ]
-
-    def is_error(s):
-        return s.endswith("_FAILED") or s in [
-            # 'CREATE_FAILED',
-            "DELETED",
-            # 'DELETE_FAILED',
-            "DELETE_PENDING",
-            "DELETING",
-            "FORCE_DELETE_PENDING",
-            "FORCE_DELETING",
-            "FORCE_REPAIR_ACCEPTED",
-            "FORCE_REPAIR_PENDING",
-            # CONNECT_PENDING,
-            # CREATE_ACCEPTED,
-            # CREATE_FAILED,
-            # CREATE_PENDING,
-            # CREATING,
-            "DELETED",
-            # 'DELETE_FAILED',
-            "DELETE_PENDING",
-            "DELETING",
-            "FORCE_DELETE_PENDING",
-            "FORCE_DELETING",
-            "FORCE_REPAIR_ACCEPTED",
-            "FORCE_REPAIR_PENDING",
-            # 'MIGRATE_FAILED',
-            "MIGRATE_PENDING",
-            "MIGRATING",
-            # POST_PROVISIONING_CONFIG_IN_PROGRESS,
-            # READY,
-            "REPAIRING",
-            "REPAIR_ACCEPTED",
-            # 'REPAIR_FAILED',
-            "REPAIR_PENDING",
-            # 'UPDATE_FAILED',
-            # 'UPDATE_PENDING',
-            # 'UPDATING',
-            # 'UPGRADE_FAILED',
-            # 'UPGRADE_PENDING',
-            # 'UPGRADING',
-        ]
-
-    def is_transition(s):
-        return s.endswith("ING") or s in ["CREATE_ACCEPTED"]
-
-    if providerLabel == "vsphere":
-        polling_interval = "5s"
-        timeout = "2m"
-    elif providerLabel == "azure":
-        # azure
-        polling_interval = "1m"
-        timeout = "20m"
-    elif providerLabel == "akka":
-        polling_interval = "5s"
-        timeout = "2m"
+    _wait = data.get("_wait", True)
+
+    if _wait:
+
+        def is_ready(s):
+            return s in [
+                "CREATE_PENDING",
+                "CREATING",
+                "READY",
+                "POST_PROVISIONING_CONFIG_IN_PROGRESS",
+                "UPDATE_PENDING",
+                "UPDATING",
+                "UPGRADE_PENDING",
+                "UPGRADING",
+            ]
+
+        def is_error(s):
+            return s.endswith("_FAILED") or s in [
+                # 'CREATE_FAILED',
+                "DELETED",
+                # 'DELETE_FAILED',
+                "DELETE_PENDING",
+                "DELETING",
+                "FORCE_DELETE_PENDING",
+                "FORCE_DELETING",
+                "FORCE_REPAIR_ACCEPTED",
+                "FORCE_REPAIR_PENDING",
+                # CONNECT_PENDING,
+                # CREATE_ACCEPTED,
+                # CREATE_FAILED,
+                # CREATE_PENDING,
+                # CREATING,
+                "DELETED",
+                # 'DELETE_FAILED',
+                "DELETE_PENDING",
+                "DELETING",
+                "FORCE_DELETE_PENDING",
+                "FORCE_DELETING",
+                "FORCE_REPAIR_ACCEPTED",
+                "FORCE_REPAIR_PENDING",
+                # 'MIGRATE_FAILED',
+                "MIGRATE_PENDING",
+                "MIGRATING",
+                # POST_PROVISIONING_CONFIG_IN_PROGRESS,
+                # READY,
+                "REPAIRING",
+                "REPAIR_ACCEPTED",
+                # 'REPAIR_FAILED',
+                "REPAIR_PENDING",
+                # 'UPDATE_FAILED',
+                # 'UPDATE_PENDING',
+                # 'UPDATING',
+                # 'UPGRADE_FAILED',
+                # 'UPGRADE_PENDING',
+                # 'UPGRADING',
+            ]
+
+        def is_transition(s):
+            return s.endswith("ING") or s in ["CREATE_ACCEPTED"]
+
+        if providerLabel == "vsphere":
+            polling_interval = "5s"
+            timeout = "2m"
+        elif providerLabel == "azure":
+            # azure
+            polling_interval = "1m"
+            timeout = "20m"
+        elif providerLabel == "akka":
+            polling_interval = "5s"
+            timeout = "2m"
+        else:
+            polling_interval = "1m"
+            timeout = "20m"
+
+        try:
+            deployment = admin.edge.wait_for(
+                id,
+                org_id,
+                is_ready=is_ready,
+                is_error=is_error,
+                is_transition=is_transition,
+                polling_interval=polling_interval,
+                timeout=timeout,
+            )
+        except Exception as e:
+            deployment = admin.edge.get(id, org_id)
+            save_state(deployment)
+            raise PluginException("Error waiting for edge deployment. Status=" + deployment["status"]) from e
     else:
-        polling_interval = "1m"
-        timeout = "20m"
-
-    try:
-        deployment = admin.edge.wait_for(
-            id,
-            org_id,
-            is_ready=is_ready,
-            is_error=is_error,
-            is_transition=is_transition,
-            polling_interval=polling_interval,
-            timeout=timeout,
-        )
-    except Exception as e:
-        deployment = admin.edge.get(id, org_id)
-        save_state(deployment)
-        raise PluginException("Error waiting for edge deployment. Status=" + deployment["status"]) from e
+        pass  # no wait
 
     site_id = data.get("siteId")
     if site_id:

hcs_cli/support/exec_util.py

@@ -2,7 +2,7 @@ import json
 import os
 import shlex
 import subprocess
-from typing import List, Tuple, Union
+from typing import Any, List, Tuple, Union
 
 import click
 
@@ -18,7 +18,14 @@ def _split_command(cmd: Union[str, List[str]]) -> Tuple[List[str], str]:
 
 
 def exec(
-    cmd, log_error=True, raise_on_error=True, inherit_output=False, cwd=None, input: str = None, show_command: bool = True, env: dict = None
+    cmd,
+    log_error=True,
+    raise_on_error=True,
+    inherit_output=False,
+    cwd=None,
+    input: Union[str, dict[Any, Any], list[Any]] = None,
+    show_command: bool = True,
+    env: dict = None,
 ):
     commands, cmd_text = _split_command(cmd)
     text = f"RUNNING: {cmd_text}"
@@ -55,7 +62,7 @@ def run_cli(
     output_json=False,
     raise_on_error=True,
     inherit_output: Union[bool, None] = None,
-    input: str = None,
+    input: Union[str, dict[Any, Any], list[Any]] = None,
     show_command: bool = True,
     log_error: bool = True,
     env: dict = None,

{hcs_cli-0.1.315.dist-info → hcs_cli-0.1.317.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-cli
-Version: 0.1.315
+Version: 0.1.317
 Summary: Horizon Cloud Service CLI.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Requires-Dist: hcs-core>=0.1.315
+Requires-Dist: hcs-core>=0.1.317
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: matplotlib>=3.8.0
 Requires-Dist: paho-mqtt>=2.1.0

{hcs_cli-0.1.315.dist-info → hcs_cli-0.1.317.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hcs_cli/__init__.py,sha256=HpPkz1OWTqjWkMsif4IOB2b2XgE5McDpbjoGJhgMpFs,47
+hcs_cli/__init__.py,sha256=kalA51nvL9r2WycXeW3H-kyqLPN91e0eb_ELOm5f-FM,47
 hcs_cli/__main__.py,sha256=lwPXLjh1OpOs4doVLJJ6_3XHtC-VqDOXiw45hvAQorM,684
 hcs_cli/main.py,sha256=87MoOqaYQ1V7m9LJbek3GR_RojErr4j6watZD8oenk0,3539
 hcs_cli/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -372,7 +372,7 @@ hcs_cli/provider/hcs/ad.py,sha256=Jseu9c8NMMukNz1S6LPq0XJqzACqttAOWgnP3ZQuBqs,19
 hcs_cli/provider/hcs/av_entitlement.py,sha256=e2p3BWhYSppthw4pGtd2UHQZeqdH08fqbPW9VhCYQZI,1318
 hcs_cli/provider/hcs/av_fs.py,sha256=UUke07p7cuUc_Kfoymz-EmO0YBj956PmGlYaKok9fB8,1647
 hcs_cli/provider/hcs/cert.py,sha256=KILh7DF6YTeQ_hr07zIBV0U5mHjtSQ28GhTRF8VyM4E,1631
-hcs_cli/provider/hcs/edge.py,sha256=GoT0duHVvCt_AOr1bkzjutxsAsy0hvWMY3hQOIPlHxQ,5477
+hcs_cli/provider/hcs/edge.py,sha256=WfOCMnStlLWXeS_9aDIHDlyIzUv9lSsdLw3ubcrRlc0,5883
 hcs_cli/provider/hcs/entitlement.py,sha256=3LaNSLcVd9wY9AW2CzblR_0LpyuZVX3BmD4ij4U_YpI,1324
 hcs_cli/provider/hcs/gold_pattern.py,sha256=WvFRPNPgrXZdR_W_NN7D5ni803npVrZKJSmLH0wxdI0,2043
 hcs_cli/provider/hcs/identity_provider.py,sha256=kXsu8jhX77Fo_HSNd85V4sMd-uqD9QUm_yVcK0L6pyE,1415
@@ -475,7 +475,7 @@ hcs_cli/service/vmm/hoc_event.py,sha256=ukkfojIT6MwPxglKMGF8S3-Moa_K7hcRM3WrkrjA
 hcs_cli/support/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hcs_cli/support/constant.py,sha256=dVOiIaiH4rhC-cZJhTruXyv5ieS1j32YUhF8wEFjbEw,171
 hcs_cli/support/debug_util.py,sha256=Bb0gaYN8bSljXdFNnX3mElWWkL_lHP9lFEMP71LsIi0,2679
-hcs_cli/support/exec_util.py,sha256=PizPjM_DMyzoRDQCFOL1nyw-HNCTwicZ0mt2Qnv4Pb4,2996
+hcs_cli/support/exec_util.py,sha256=Epa09iCouAky7NE17O5rG-q3vdw35XJzrIUitPStSsY,3098
 hcs_cli/support/inspect_util.py,sha256=weLylRM1_3O6nz0yUOiJUEBfR9TpUe-jpghmrQblSjE,3192
 hcs_cli/support/param_util.py,sha256=CHXWJvBF9EwFLYPn_CTOpFWdSyCP3w6iLlYByiz-nvE,1492
 hcs_cli/support/patch_util.py,sha256=r4IjpLA5yGqKer-wuSMB7d93BGPVnse_FhHcAxwYg7A,1524
@@ -489,7 +489,7 @@ hcs_cli/support/vm_table.py,sha256=aNyFtrQb2Cy4JBZx3sPt3_GpOHD7R6x4nITlwc9dZ4Q,2
 hcs_cli/support/scm/html_util.py,sha256=clgMpM90HxRRs3D9ORYYNB57AYh7y_-UzJrB4KX3dsY,458
 hcs_cli/support/scm/plan-editor.html.template,sha256=qXhHYjBsG8uaVlMkc0gnCePoSV3w5NyTkaLhXV9jlC0,26874
 hcs_cli/support/scm/plan_editor.py,sha256=pZtm9X_R-vs2JxJ_NX7-wTAoY-nhI-gFqhcyVDdEZVM,3108
-hcs_cli-0.1.315.dist-info/METADATA,sha256=M8ZNfiffa60yHr-KqnBStXM32oCsFmNMk7EXqAN2rGU,3568
-hcs_cli-0.1.315.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hcs_cli-0.1.315.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
-hcs_cli-0.1.315.dist-info/RECORD,,
+hcs_cli-0.1.317.dist-info/METADATA,sha256=HMB8zm8jPlN3k2sXbJDFcC98-xfhppGUM5hdm4N2eqs,3568
+hcs_cli-0.1.317.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hcs_cli-0.1.317.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
+hcs_cli-0.1.317.dist-info/RECORD,,