hcs-core 0.1.306__tar.gz → 0.1.308__tar.gz

{hcs_core-0.1.306 → hcs_core-0.1.308}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.306
+Version: 0.1.308
 Summary: Horizon Cloud Service CLI module.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues

hcs_core-0.1.308/hcs_core/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.308"

{hcs_core-0.1.306 → hcs_core-0.1.308}/hcs_core/sglib/client_util.py

@@ -288,10 +288,13 @@ def wait_for_res_deleted(
     resource_name: str,
     fn_get: Callable,
     timeout: str,
-    polling_interval_seconds: int = 10,
+    polling_interval: int = 10,
     fn_is_error: Callable = None,
 ):
     timeout_seconds = _parse_timeout(timeout)
+    polling_interval_seconds = _parse_timeout(polling_interval)
+    if polling_interval_seconds < 3:
+        polling_interval_seconds = 3
     start = time.time()
     while True:
         t = fn_get()
@@ -310,7 +313,7 @@ def wait_for_res_deleted(
         sleep_seconds = remaining_seconds
         if sleep_seconds > polling_interval_seconds:
             sleep_seconds = polling_interval_seconds
-        exit.sleep(sleep_seconds)
+        time.sleep(sleep_seconds)
 
 
 # flake8: noqa=E731
@@ -337,21 +340,25 @@ def wait_for_res_status(
         field_name = get_status
         get_status = lambda t: t[field_name]
     if status_map:
-        if isinstance(status_map["ready"], str):
-            status_map["ready"] = [status_map["ready"]]
-        if isinstance(status_map["transition"], str):
-            status_map["transition"] = [status_map["transition"]]
-        if isinstance(status_map["error"], str):
-            status_map["error"] = [status_map["error"]]
         if is_ready:
             raise CtxpException("Can not specify is_ready when status_map is provided.")
         if is_error:
             raise CtxpException("Can not specify is_error when status_map is provided.")
         if is_transition:
             raise CtxpException("Can not specify is_transition when status_map is provided.")
-        is_ready = lambda s: s in status_map["ready"]
-        is_error = lambda s: s in status_map["error"]
-        is_transition = lambda s: s in status_map["transition"]
+
+        ready_status = status_map["ready"]
+        error_status = status_map["error"]
+        transition_status = status_map["transition"]
+        if isinstance(ready_status, str):
+            ready_status = [ready_status]
+        if isinstance(error_status, str):
+            error_status = [error_status]
+        if isinstance(transition_status, str):
+            transition_status = [transition_status]
+        is_ready = lambda s: s in ready_status
+        is_error = lambda s: error_status is None or s in error_status
+        is_transition = lambda s: transition_status is None or s in transition_status
     else:
         if not is_ready:
             raise CtxpException("Either status_map or is_ready must be specified.")
@@ -359,6 +366,9 @@ def wait_for_res_status(
             raise CtxpException("Either status_map or is_error must be specified.")
         if not is_transition:
             raise CtxpException("Either status_map or is_transition must be specified.")
+        ready_status = None
+        error_status = None
+        transition_status = None
 
     while True:
         t = fn_get()
@@ -368,9 +378,9 @@ def wait_for_res_status(
             raise CtxpException(prefix + "Not found.")
         status = get_status(t)
         if is_error(status):
-            msg = prefix + f"Status error. Actual={status}"
-            if status_map:
-                msg += f", expected={status_map['ready']}"
+            msg = prefix + f"Unexpected terminal state. Actual={status}"
+            if ready_status:
+                msg += f", expected={ready_status}"
             print("-- DUMP START --", file=sys.stderr)
             print(json.dumps(t, indent=4), file=sys.stderr)
             print("-- DUMP END --", file=sys.stderr)
@@ -383,7 +393,10 @@ def wait_for_res_status(
         now = time.time()
         remaining_seconds = timeout_seconds - (now - start)
         if remaining_seconds < 1:
-            raise TimeoutError(prefix + "Timeout.")
+            msg = prefix + f"Timeout. Current: {status}."
+            if ready_status:
+                msg += f" Expected: {ready_status}."
+            raise TimeoutError(msg)
         sleep_seconds = remaining_seconds
         if sleep_seconds > polling_interval_seconds:
             sleep_seconds = polling_interval_seconds

{hcs_core-0.1.306 → hcs_core-0.1.308}/hcs_core/sglib/login_support.py

@@ -61,7 +61,7 @@ _auth_success_html = """
     </style>
 </head>
 <body>
-    <h3>You have successfully logged into VMware Horizon Cloud Service.</h3>
+    <h3>You have successfully logged into Omnissa Horizon Cloud Service.</h3>
     <p>You can close this window, and return to the terminal.</p>
     <br/>
     <p><a href="https://github.com/euc-eng/hcs-cli/blob/dev/README.md">HCS CLI</a> is in beta. <a href="https://github.com/euc-eng/hcs-cli/blob/main/doc/hcs-cli-cheatsheet.md">Cheatsheet</a>:</p>

hcs_core-0.1.306/hcs_core/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.306"