hcs-cli 0.1.318__py3-none-any.whl → 0.1.320__py3-none-any.whl

hcs_cli/payload/synt/core/p08-dummy-property.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "my-message": "hello"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "my-message": "hello"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe08-dummy-property",
-        "type": "TEST_DUMMY"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe08-dummy-property",
+    "type": "TEST_DUMMY"
+  }
+}

hcs_cli/payload/synt/ext/p20-connect-success.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "www.omnissa.com:443"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "www.omnissa.com:443"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe20-connect-success",
-        "type": "TEST_CONNECT"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe20-connect-success",
+    "type": "TEST_CONNECT"
+  }
+}

hcs_cli/payload/synt/ext/p21-connect-fail.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "www.vmware123456.com:12345"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "www.vmware123456.com:12345"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe21-connect-fail",
-        "type": "TEST_CONNECT"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe21-connect-fail",
+    "type": "TEST_CONNECT"
+  }
+}

hcs_cli/payload/synt/ext/p30-ssl-success.json

@@ -1,18 +1,15 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "https://www.omnissa.com/",
+      "verify_ssl": true
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "https://www.omnissa.com/",
-            "verify_ssl": true
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe30-ssl-success",
-        "type": "TEST_SSL"
-    }
+    "enabled": true,
+    "labels": {},
+    "name": "probe30-ssl-success",
+    "type": "TEST_SSL"
+  }
 }

hcs_cli/payload/synt/ext/p31-ssl-fail.json

@@ -1,18 +1,15 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "https://self-signed.badssl.com/",
+      "verify_ssl": true
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "https://self-signed.badssl.com/",
-            "verify_ssl": true
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe31-ssl-fail",
-        "type": "TEST_SSL"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe31-ssl-fail",
+    "type": "TEST_SSL"
+  }
+}

hcs_cli/payload/synt/ext/p40-http-success.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "https://www.omnissa.com/"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "https://www.omnissa.com/"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe40-http-success",
-        "type": "TEST_HTTP"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe40-http-success",
+    "type": "TEST_HTTP"
+  }
+}

hcs_cli/payload/synt/ext/p41-http-fail.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "https://www.omnissa.com/some-inexist-url"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "https://www.omnissa.com/some-inexist-url"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe41-http-fail",
-        "type": "TEST_HTTP"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe41-http-fail",
+    "type": "TEST_HTTP"
+  }
+}

hcs_cli/payload/synt/ext/p42-http-status-code.json

@@ -1,21 +1,15 @@
 {
-    "alertPolicy": {},
-    "notificationConfig": {},
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "https://www.omnissa.com/some-inexist-url",
-            "expected_status_codes": [
-                404,
-                403,
-                202,
-                200,
-                301
-            ]
-        },
-        "enabled": true,
-        "labels": {},
-        "name": "probe42-http-status-code",
-        "type": "TEST_HTTP"
-    }
-}
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "https://www.omnissa.com/some-inexist-url",
+      "expected_status_codes": [404, 403, 202, 200, 301]
+    },
+    "enabled": true,
+    "labels": {},
+    "name": "probe42-http-status-code",
+    "type": "TEST_HTTP"
+  }
+}

hcs_cli/payload/synt/ext1/p10-ping-success.json

@@ -1,18 +1,15 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "localhost",
+      "count": 1
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "localhost",
-            "count": 1
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe10-ping-success",
-        "type": "TEST_PING"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe10-ping-success",
+    "type": "TEST_PING"
+  }
+}

hcs_cli/payload/synt/ext1/p11-ping-fail.json

@@ -1,18 +1,15 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "127.0.0.333",
+      "count": 1
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "127.0.0.333",
-            "count": 1
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe11-ping-fail",
-        "type": "TEST_PING"
-    }
+    "enabled": true,
+    "labels": {},
+    "name": "probe11-ping-fail",
+    "type": "TEST_PING"
+  }
 }

hcs_cli/payload/synt/ext1/p12-ping-success-repeat.json

@@ -1,19 +1,16 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "localhost",
+      "count": 1,
+      "repeat": "PT2S"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "localhost",
-            "count": 1,
-            "repeat": "PT2S"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe12-ping-success-repeat",
-        "type": "TEST_PING"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe12-ping-success-repeat",
+    "type": "TEST_PING"
+  }
+}

hcs_cli/provider/hcs/cert.py

@@ -22,7 +22,6 @@ from hcs_core.util import pki_util
 
 
 def deploy(data: dict, state: dict, save_state) -> dict:
-
     cn = data["cn"]
 
     temp_dir = tempfile.gettempdir()

hcs_cli/provider/hcs/edge.py

@@ -150,7 +150,7 @@ def refresh(data: dict, state: dict) -> dict:
         if id:
             edge = admin.edge.get(id, org_id)
     if not edge:
-        edges = admin.edge.list(org_id, search=f'name $eq {data["name"]}')
+        edges = admin.edge.list(org_id, search=f"name $eq {data['name']}")
         if edges:
             edge = edges[0]
 

hcs_cli/provider/hcs/uag.py

@@ -48,7 +48,7 @@ def refresh(data: dict, state: dict) -> dict:
             ret = admin.uag.get(id, org_id)
             if ret:
                 return ret
-    search = f'name $eq {data["name"]}'
+    search = f"name $eq {data['name']}"
     uags = admin.uag.list(org_id, search=search)
     if uags:
         return uags[0]

hcs_cli/service/admin/template.py

@@ -16,4 +16,13 @@ limitations under the License.
 # Deprecated.
 # To be removed in the future.
 
-from ..template import action, create, delete, get, items, list, update, wait_for, wait_for_deleted, wait_for_ready
+from ..template import action as action
+from ..template import create as create
+from ..template import delete as delete
+from ..template import get as get
+from ..template import items as items
+from ..template import list as list
+from ..template import patch as patch
+from ..template import wait_for as wait_for
+from ..template import wait_for_deleted as wait_for_deleted
+from ..template import wait_for_ready as wait_for_ready

hcs_cli/service/hoc/diagnostic.py

@@ -11,13 +11,11 @@ _client = hdc_service_client("hoc-diagnostic")
 
 
 def search(payload: dict, size: int = 100):
-
     pointer_timestamp = timeutil.iso_date_to_timestamp(payload["from"])
     end_timestamp = timeutil.iso_date_to_timestamp(payload["to"])
 
     count = 0
     while pointer_timestamp < end_timestamp and count < size:
-
         payload["from"] = timeutil.timestamp_to_iso_date(pointer_timestamp)
         # log.info(f"range: from={payload['from']}, to={payload['to']}")
 
@@ -33,7 +31,6 @@ def search(payload: dict, size: int = 100):
 
         # _old = count
         for item in page:
-
             data = item["data"]
 
             count += 1
@@ -45,3 +42,14 @@ def search(payload: dict, size: int = 100):
             pointer_timestamp = max(data["d"]["utcTime"] + 1, pointer_timestamp + 1000)
 
         # log.info(f"events={count - _old}")
+
+
+def aggregateConnects(payload: dict, verbose: bool = False):
+    url = "/v1/stats/connect/aggregateConnects"
+    if verbose:
+        print(f"POST: {url}")
+        print(payload)
+    response = _client.post(url, json=payload)
+    if isinstance(response, str):
+        response = json.loads(response)
+    return response

hcs_cli/service/inventory/__init__.py

@@ -1,2 +1,15 @@
-from .session import assign, assignV2, create_manual_session, deassign, logoff, logoffV2, sessions, update_session
-from .vm import count, get, list, raw_list, update
+from .session import assign as assign
+from .session import assignV2 as assignV2
+from .session import create_manual_session as create_manual_session
+from .session import deassign as deassign
+from .session import logoff as logoff
+from .session import logoffV2 as logoffV2
+from .session import sessions as sessions
+from .session import update_session as update_session
+from .vm import count as count
+from .vm import get as get
+from .vm import list as list
+from .vm import raw_list as raw_list
+from .vm import update as update
+from .vm import begin_deleting_vms_by_id as begin_deleting_vms_by_id
+from .vm import finish_deleting_vms as finish_deleting_vms

hcs_cli/service/inventory/vm.py

@@ -65,6 +65,18 @@ def finish_adding_vms(template_id: str, org_id: str, num_sessions: int, template
     return _client.post(url, vms)
 
 
+def begin_deleting_vms_by_id(template_id: str, org_id: str, vm_ids: list, **kwargs):
+    url = f"/v1/{template_id}/beginDeletingVMsById?org_id={org_id}"
+    url = with_query(url, **kwargs)
+    return _client.post(url, json=vm_ids)
+
+
+def finish_deleting_vms(template_id: str, org_id: str, vm_ids: list, **kwargs):
+    url = f"/v1/{template_id}/finishDeletingVMs?org_id={org_id}"
+    url = with_query(url, **kwargs)
+    return _client.post(url, json=vm_ids)
+
+
 def count(template_id: str, org_id: str = None, **kwargs):
     url = f"/v1/{template_id}/count"
     kwargs["countVM"] = True

hcs_cli/service/lcm/template.py

@@ -53,13 +53,16 @@ def create(template: dict):
     return _client.post(url=url, json=template)
 
 
+def patch(id: str, org_id: str, patch_to: dict, **kwargs):
+    url = f"/v1/templates/{id}?org_id={org_id}"
+    # print(url)
+    # import json
+    # print(json.dumps(patch_to))
+    return _client.patch(url, json=patch_to)
+
+
 def update(template: dict):
-    url = "/v1/templates"
-    # workaround for AKKA
-    if template["providerType"] == "AKKA":
-        pass
-    else:
-        url += "/" + template["providerType"].lower()
+    url = "/v1/templates/" + template["providerType"].lower()
     return _client.post(url=url, json=template)
 
 

hcs_cli/service/lcm/vm.py

@@ -102,7 +102,6 @@ def wait_for(
 
 
 def wait_for_deleted(template_id: str, vm_id: str, org_id: str, timeout: str):
-
     name = f"{template_id}/{vm_id}"
 
     def fn_get():

hcs_cli/service/task.py

@@ -114,7 +114,6 @@ _scm_client = hdc_service_client("scm")
 
 
 def query(namespace: str, fn_filter: Callable = None, **kwargs) -> List[TaskModel]:
-
     kwargs["size"] = kwargs.get("size", 50)
 
     def _get_page(query_string):

hcs_cli/service/template.py

@@ -32,7 +32,7 @@ def delete(id: str, org_id: str, force: bool = True):
     return _crud.delete(id, org_id, force=force)
 
 
-def update(id: str, org_id: str, patch_to: dict, **kwargs):
+def patch(id: str, org_id: str, patch_to: dict):
     url = f"/v2/templates/{id}?org_id={org_id}"
     # print(url)
     # import json

hcs_cli/support/debug_util.py

@@ -44,7 +44,6 @@ def restart_service(service_name: str, old_pod_id: str):
 
 
 def kubectl_patch(service_name: str, patch_params: list):
-
     service_full_name = get_service_full_name(service_name)
     # Formulate the Kubernetes patch command
     patch_command = ["kubectl", "patch", service_full_name] + patch_params

hcs_cli/support/plan_util.py

@@ -22,7 +22,6 @@ from hcs_core.plan import PlanException
 
 
 def load_plan(file):
-
     if not file:
         file = _try_locating_plan_file()
     else:

hcs_cli/support/predefined_payload.py

@@ -2,6 +2,7 @@ import json
 import os
 import os.path as path
 import sys
+from typing import cast
 
 
 def load(name: str, as_json: bool = False) -> str:
@@ -11,7 +12,7 @@ def load(name: str, as_json: bool = False) -> str:
     if path.exists(file_name):
         with open(file_name, "rt") as f:
             if as_json:
-                return json.load(f)
+                return cast(str, json.load(f))
             return f.read()
 
     # payload file not found.
@@ -24,6 +25,8 @@ def load(name: str, as_json: bool = False) -> str:
                 continue
             if file.endswith(".json"):
                 file = file[:-5]
+            elif file.endswith(".json.template"):
+                file = file[:-14]
             items.append(file)
     items.sort()
     for file in items:

hcs_cli/support/template_util.py

@@ -7,7 +7,6 @@ from typing import Callable
 def with_template_file(
     name: str, substitutions: dict, fn: Callable, base_path: str = None, use_temp_file: bool = False, delete_after: bool = False
 ):
-
     if base_path:
         if os.path.isfile(base_path):
             base_path = os.path.dirname(os.path.realpath(base_path))

hcs_cli/support/test_utils.py

@@ -16,7 +16,7 @@ limitations under the License.
 import json
 import os
 import subprocess
-from typing import Callable
+from typing import Any, Callable
 from unittest import TestCase
 
 
@@ -68,7 +68,7 @@ class CliTest(TestCase):
     def verify(
         self,
         cmd: str,
-        expected_stdout: any,
+        expected_stdout: Any,
         expected_return_code: int = 0,
         expect_stderr_empty: bool = True,
         verify_stderr: Callable = None,