hcs-cli 0.1.319__py3-none-any.whl → 0.1.321__py3-none-any.whl

hcs_cli/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.319"
+__version__ = "0.1.321"
 
-from . import service
+from . import service as service  # noqa: F401

hcs_cli/cmds/dev/fs/clear.py

@@ -13,12 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+import os
 import click
 
 import hcs_cli.cmds.dev.util.log as log
 from hcs_cli.cmds.dev.fs.helper.util import validate_fs_kubeconfig, validate_fs_profile
 from hcs_cli.cmds.dev.fs.init import _resolve_bundled_file_path
 from hcs_cli.support.exec_util import run_cli
+from hcs_core.ctxp import profile
 
 
 @click.command()
@@ -42,6 +44,7 @@ def clear(only_default: bool, **kwargs):
     if not only_default:
         _delete_all()
 
+    os.environ["ORG_ID"] = profile.current().csp.orgId
     akka_plan_path = _resolve_bundled_file_path("provided_files/akka.plan.yml")
     azure_plan_path = _resolve_bundled_file_path("provided_files/azure.plan.yml")
     azsim_plan_path = _resolve_bundled_file_path("provided_files/azsim.plan.yml")
@@ -90,3 +93,8 @@ def _delete_all():
     provider_ids = run_cli("hcs provider list --ids", output_json=True)
     for pid in provider_ids:
         run_cli("hcs provider delete -y " + pid, raise_on_error=False)
+
+    # all lcm internal providers
+    lcm_provider_ids = run_cli("hcs lcm provider list --ids", output_json=True)
+    for lpid in lcm_provider_ids:
+        run_cli("hcs lcm provider delete " + lpid, raise_on_error=False)

hcs_cli/cmds/dev/fs/provided_files/mqtt-secret.yaml

@@ -75,7 +75,7 @@ stringData:
     JcSvTMU2HOuQ/q6vFZq3PRbvroMeXlw2WJrqO3vu04SZwYiP8dcrlHTXQJh+Mp9T
     mQ==
     -----END CERTIFICATE-----
-    mqtt.ca-key: |-
+  mqtt.ca-key: |-
     -----BEGIN PRIVATE KEY-----
     MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDUNJx2Cf0noNHc
     DXB9AFPSFMkkpwxb0wtqaCLiB7v5zkF7CVBl5LnecVk7CM8bJY62H90Lv8Zv/2sl
@@ -104,7 +104,7 @@ stringData:
     boPQ+RK1VKj5UFkUKz5LiohLmCBEQ7sh1HBS2Vje8MFtg0P138sRlbMCvdAEARTZ
     uQfAKLns7QFf9W1C60AVAQ==
     -----END PRIVATE KEY-----
-    mqtt.client-cert: |-
+  mqtt.client-cert: |-
     -----BEGIN CERTIFICATE-----
     MIIFKDCCAxCgAwIBAgIFALjj4O4wDQYJKoZIhvcNAQELBQAwdTELMAkGA1UEBhMC
     VVMxCzAJBgNVBAgMAkNBMR8wHQYDVQQKDBZIb3Jpem9uIENsb3VkIFNlcnZpY2Vz
@@ -204,7 +204,7 @@ stringData:
     JcSvTMU2HOuQ/q6vFZq3PRbvroMeXlw2WJrqO3vu04SZwYiP8dcrlHTXQJh+Mp9T
     mQ==
     -----END CERTIFICATE-----
-    mqtt.client-key: |-
+  mqtt.client-key: |-
     -----BEGIN PRIVATE KEY-----
     MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC40aC4pyy0+++D
     kD1cPRsMWO4ANZ8L4LaaHcg/e/1NbiExd/QlZESNJnnIyD29qY1h9WGEVDHtInsl

hcs_cli/cmds/hoc/stats.py

@@ -0,0 +1,72 @@
+import click
+import datetime
+import json
+import time
+
+from hcs_cli.service.hoc import diagnostic
+from hcs_cli.service import tsctl
+
+
+@click.command(name="stats-aggregate-connects")
+@click.argument("from_", type=int)
+@click.argument("to", type=int)
+@click.option("--wait", type=bool, required=False, is_flag=True, default=False)
+@click.option("--verbose", type=bool, required=False, is_flag=True, default=False)
+def aggregate_connects(from_: int, to: int, wait: bool, verbose: bool):
+    """
+    Aggregate connect events between FROM_ and TO unix timestamps.
+    """
+    payload = {"from": from_, "to": to}
+    result = diagnostic.aggregateConnects(payload, verbose=verbose)
+    click.echo(result)
+
+    if not result:
+        return "", 1
+
+    if wait:
+        wait_for_task(result)
+
+
+@click.command(name="stats-aggregate-connects-day-before")
+@click.option("--wait", type=bool, required=False, is_flag=True, default=False)
+@click.option("--verbose", type=bool, required=False, is_flag=True, default=False)
+def aggregate_connects_day_before(wait: bool, verbose: bool):
+    dt = datetime.datetime.utcnow().replace(hour=0, minute=0, second=0, microsecond=0)
+    dt_2_days_ago = dt - datetime.timedelta(days=2)
+    dt_1_day_ago = dt - datetime.timedelta(days=1)
+
+    print(f"Aggregating connect events from {dt_2_days_ago} to {dt_1_day_ago}")
+    from_ = int(dt_2_days_ago.timestamp())
+    to = int(dt_1_day_ago.timestamp())
+    payload = {"from": from_, "to": to}
+    result = diagnostic.aggregateConnects(payload, verbose=verbose)
+    click.echo(result)
+    if not result:
+        return "", 1
+    if wait:
+        wait_for_task(result)
+
+
+def wait_for_task(result: dict):
+    print("Waiting for task to complete...")
+    totalWaitTime = 0
+    while True:
+        time.sleep(10)
+        taskStatus = tsctl.task.lastlog(result.namespace, result.group, result.taskKey)
+        if "state" in taskStatus and taskStatus.state == "Error":
+            print(f"Task is in {taskStatus.state} state - {taskStatus.error} ")
+            print(json.dumps(taskStatus, indent=2))
+            break
+        if "state" in taskStatus and taskStatus.state == "Success":
+            print("Task completed successfully.")
+            print(json.dumps(taskStatus, indent=2))
+            break
+        if ("state" in taskStatus and taskStatus.state == "") or "state" not in taskStatus:
+            print("Task is still in progress...")
+            totalWaitTime += 10
+            if totalWaitTime >= 600:
+                print("Waited for 10 minutes, exiting.")
+                break
+            continue
+        print(json.dumps(taskStatus, indent=2))
+        break

hcs_cli/cmds/inventory/delete.py

@@ -0,0 +1,48 @@
+"""
+Copyright 2023-2023 VMware Inc.
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import click
+from hcs_core.ctxp import recent
+import hcs_core.sglib.cli_options as cli
+
+from hcs_cli.service import inventory
+from hcs_cli.support.param_util import parse_vm_path
+
+
+@click.command()
+@cli.org_id
+@click.argument("vm_path", type=str, required=False)
+def delete(org: str, vm_path: str):
+    """Delete a VM by path, e.g., template1/vm1, or 'vm1,vm2,vm3'."""
+
+    org_id = cli.get_org_id(org)
+
+    if vm_path.find(",") > 0:
+        vm_ids = [v.strip() for v in vm_path.split(",")]
+        template_id = recent.require("template", None)
+    else:
+        template_id, vm_id = parse_vm_path(vm_path)
+        ret = inventory.get(template_id, vm_id, org_id)
+        if not ret:
+            return "", 1
+        vm_ids = [vm_id]
+
+    ret = {"_requested_ids": vm_ids, "_accepted_ids": [], "_deleted": 0}
+    vms = inventory.begin_deleting_vms_by_id(template_id, org_id, vm_ids)
+    for vm in vms:
+        ret["_accepted_ids"].append(vm["id"])
+    actual_deleted = inventory.finish_deleting_vms(template_id, org_id, vm_ids)
+    ret["_deleted"] = actual_deleted
+    return ret

hcs_cli/cmds/lcm/provider/create.py

@@ -63,6 +63,12 @@ from hcs_cli.support import constant
     required=False,
     help="",
 )
+@click.option(
+    "--subscription-id",
+    type=str,
+    required=False,
+    help="",
+)
 @click.option(
     "--file",
     "-f",
@@ -80,6 +86,7 @@ def create(
     client_id: str,
     client_secret: str,
     tenant_id: str,
+    subscription_id: str,
     file: str,
     org: str,
     **kwargs,
@@ -108,7 +115,7 @@ def create(
             "description": description,
             "credentialId": credential_id,
         }
-    elif client_id or client_secret or tenant_id:
+    elif client_id or client_secret or tenant_id or subscription_id:
         if type != "AZURE":
             raise click.BadParameter("client-id is only supported for Azure provider.")
         if not client_id:
@@ -117,7 +124,8 @@ def create(
             raise click.BadParameter("client-secret is required for client-id.")
         if not tenant_id:
             raise click.BadParameter("tenant-id is required for Azure provider.")
-
+        if not subscription_id:
+            raise click.BadParameter("subscription-id is required for Azure provider.")
         data = {
             "id": id if id else _rand_id(8),
             "type": type,
@@ -126,6 +134,7 @@ def create(
             "description": description,
             "credentialId": credential_id,
             "tenantId": tenant_id,
+            "subscriptionId": subscription_id,
             "credentials": [
                 {
                     "clientId": client_id,

hcs_cli/cmds/lcm/template/expand.py

@@ -0,0 +1,46 @@
+"""
+Copyright 2023-2023 VMware Inc.
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import click
+import hcs_core.sglib.cli_options as cli
+
+import hcs_cli.service.lcm as lcm
+from hcs_cli.cmds.template.expand import expand_impl
+
+
+@click.command(hidden=True)
+@click.option(
+    "--number",
+    "-n",
+    type=int,
+    required=False,
+    default=0,
+    help="Number of VMs to expand. Use negative number to shrink.",
+)
+@click.option(
+    "--to",
+    "-t",
+    type=int,
+    required=False,
+    default=0,
+    help="Expected size of template.",
+)
+@click.argument("template_id", type=str, required=False)
+@cli.org_id
+@cli.wait
+def expand(number: int, to: int, template_id: str, org: str, wait: str):
+    """Update an existing template"""
+
+    return expand_impl(number, to, template_id, org, wait, lcm)

hcs_cli/cmds/lcm/vm/delete.py

@@ -24,8 +24,9 @@ from hcs_cli.support.param_util import parse_vm_path
 @click.argument("vm_path", type=str, required=False)
 @cli.org_id
 @cli.confirm
+@cli.force
 @cli.wait
-def delete(vm_path: str, org: str, confirm: bool, wait: str, **kwargs):
+def delete(vm_path: str, org: str, confirm: bool, force: bool, wait: str, **kwargs):
     """Delete VM"""
     template_id, vm_id = parse_vm_path(vm_path)
     org_id = cli.get_org_id(org)
@@ -37,7 +38,7 @@ def delete(vm_path: str, org: str, confirm: bool, wait: str, **kwargs):
     if not confirm:
         click.confirm(f"Delete VM {template_id}/{vm_id}?", abort=True)
 
-    vm.delete(template_id, vm_id, org_id, **kwargs)
+    vm.delete(template_id, vm_id, org_id, force=force, **kwargs)
 
     if wait == "0":
         return

hcs_cli/cmds/task.py

@@ -222,6 +222,7 @@ def use(namespace: str, group: str, smart_path: str, reset: bool, **kwargs):
     required=False,
     help="Filter tasks by state, for one-time tasks only. Comma separated values. E.g. Init,Running,Canceled,Error,Success",
 )
+@click.option("--v1", is_flag=True, default=False, required=False, help="Use v1 task API.")
 @click.option("--v1log", is_flag=True, default=False, required=False, help="Fetch last log for v1 tasks.")
 @cli.limit
 @cli.search

hcs_cli/cmds/template/expand.py

@@ -27,39 +27,84 @@ import hcs_cli.service.admin as admin
     "-n",
     type=int,
     required=False,
-    default=1,
+    default=0,
     help="Number of VMs to expand. Use negative number to shrink.",
 )
+@click.option(
+    "--to",
+    "-t",
+    type=int,
+    required=False,
+    default=0,
+    help="Expected size of template.",
+)
 @click.argument("template_id", type=str, required=False)
 @cli.org_id
 @cli.wait
-def expand(number: int, template_id: str, org: str, wait: str, **kwargs):
+def expand(number: int, to: int, template_id: str, org: str, wait: str):
     """Update an existing template"""
+    return expand_impl(number, to, template_id, org, wait, admin)
+
+
+def expand_impl(number: int, to: int, template_id: str, org: str, wait: str, service):
+    if to != 0 and number != 0:
+        return "Specify either --to or --number, not both.", 1
+    if to < 0:
+        return "--to must be non-negative.", 1
+    if to > 5000:
+        return "--to exceeds maximum limit of 5000.", 1
 
     org_id = cli.get_org_id(org)
 
     template_id = recent.require("template", template_id)
-    template = admin.template.get(template_id, org_id)
+    template = service.template.get(template_id, org_id)
 
     if not template:
-        return "Template not found: " + template_id
+        return "Template not found: " + template_id, 1
 
     spare_policy = template.get("sparePolicy", {})
-    patch = {
-        "sparePolicy": {
-            "min": spare_policy.get("min", 0) + number,
-            "max": spare_policy.get("max", 0) + number,
-            "limit": spare_policy.get("limit", 0) + number,
-        }
+    new_spare_policy = {
+        "min": spare_policy.get("min", 0),
+        "max": spare_policy.get("max", 0),
+        "limit": spare_policy.get("limit", 0),
     }
-    if patch["sparePolicy"]["min"] < 0:
-        patch["sparePolicy"]["min"] = 0
-    if patch["sparePolicy"]["max"] < 0:
-        patch["sparePolicy"]["max"] = 0
-    if patch["sparePolicy"]["limit"] < 0:
-        patch["sparePolicy"]["limit"] = 0
-
-    ret = admin.template.update(template_id, org_id, patch)
+
+    if to != 0:
+        new_spare_policy["min"] = to
+        new_spare_policy["max"] = to
+        new_spare_policy["limit"] = to
+    else:
+        if number == 0:
+            number = 1  # default to expand by 1
+        new_spare_policy["min"] += number
+        new_spare_policy["max"] += number
+        new_spare_policy["limit"] += number
+
+        if new_spare_policy["limit"] < 0:
+            new_spare_policy["limit"] = 0
+        elif new_spare_policy["limit"] > 5000:
+            new_spare_policy["limit"] = 5000
+
+        if new_spare_policy["min"] < 0:
+            new_spare_policy["min"] = 0
+        elif new_spare_policy["min"] > new_spare_policy["limit"]:
+            new_spare_policy["min"] = new_spare_policy["limit"]
+        if new_spare_policy["max"] < 0:
+            new_spare_policy["max"] = 0
+        elif new_spare_policy["max"] > new_spare_policy["limit"]:
+            new_spare_policy["max"] = new_spare_policy["limit"]
+
+    if (
+        new_spare_policy["min"] == spare_policy.get("min", 0)
+        and new_spare_policy["max"] == spare_policy.get("max", 0)
+        and new_spare_policy["limit"] == spare_policy.get("limit", 0)
+    ):
+        # no change
+        ret = template
+    else:
+        patch = {"sparePolicy": new_spare_policy}
+        ret = service.template.patch(template_id, org_id, patch)
+
     if wait != "0":
-        ret = admin.template.wait_for_ready(template_id, org_id, duration.to_seconds(wait))
+        ret = service.template.wait_for_ready(template_id, org_id, duration.to_seconds(wait))
     return ret

hcs_cli/cmds/template/update.py

@@ -43,7 +43,7 @@ def update(template_id: str, update, org: str, wait: str, **kwargs):
     template = admin.template.get(template_id, org_id)
 
     if not template:
-        return "Template not found: " + template_id
+        return "Template not found: " + template_id, 1
 
     allowed_fields = ["name", "description", "powerPolicy", "sparePolicy", "applicationProperties", "flags"]
 
@@ -52,7 +52,7 @@ def update(template_id: str, update, org: str, wait: str, **kwargs):
     if not patch:
         return template
 
-    ret = admin.template.update(template_id, org_id, patch)
+    ret = admin.template.patch(template_id, org_id, patch)
     if wait != "0":
         ret = admin.template.wait_for_ready(template_id, org_id, duration.to_seconds(wait))
     return ret

hcs_cli/cmds/vm/delete.py

@@ -23,10 +23,11 @@ from hcs_cli.support.param_util import parse_vm_path
 
 @click.command()
 @click.argument("vm_path", type=str, required=False)
+@cli.force
 @cli.org_id
 @cli.confirm
 @cli.wait
-def delete(vm_path: str, org: str, confirm: bool, wait: str, **kwargs):
+def delete(vm_path: str, org: str, confirm: bool, force: bool, wait: str, **kwargs):
     """Delete a VM by ID"""
     org_id = cli.get_org_id(org)
     template_id, vm_id = parse_vm_path(vm_path)
@@ -41,7 +42,7 @@ def delete(vm_path: str, org: str, confirm: bool, wait: str, **kwargs):
     if not confirm:
         click.confirm(f"Delete vm {existing['id']} from template {template['name']} ({template['id']})?", abort=True)
 
-    vm.delete()
+    vm.delete(force=force)
 
     if wait == "0":
         return

hcs_cli/cmds/vm/list.py

@@ -47,47 +47,25 @@ from hcs_cli.support.vm_table import format_vm_table
 @click.option(
     "--agent",
     "-a",
-    type=click.Choice(
-        ["UNAVAILABLE", "ERROR", "AVAILABLE", "INIT", "UNKNOWN", "DOMAIN_ERR", "CUSTOMIZATION_FAILURE"],
-        case_sensitive=False,
-    ),
     required=False,
-    multiple=True,
-    help="Filter VMs by agent status.",
+    help="Filter VMs by agent status, in comma separated values: UNAVAILABLE,ERROR,AVAILABLE,INIT,UNKNOWN,DOMAIN_ERR,CUSTOMIZATION_FAILURE",
 )
 @click.option(
     "--power",
     "-p",
-    type=click.Choice(["PoweredOn", "PoweredOff", "PoweringOn", "PoweringOff", "Unknown"], case_sensitive=False),
     required=False,
-    multiple=True,
-    help="Filter VMs by power state.",
+    help="Filter VMs by power state, in comman separated values: PoweredOn,PoweredOff,PoweringOn,PoweringOff,Unknown",
 )
 @click.option(
     "--lifecycle",
-    type=click.Choice(
-        [
-            "PROVISIONING",
-            "PROVISIONED",
-            "MAINTENANCE",
-            "DELETING",
-            "ERROR",
-            "CUSTOMIZING",
-            "AGENT_UPDATING",
-            "AGENT_REINSTALLING",
-        ],
-        case_sensitive=False,
-    ),
+    type=str,
     required=False,
-    multiple=True,
-    help="Filter VMs by lifecycle status.",
+    help="Filter VMs by lifecycle status, in comma separated values: PROVISIONING,PROVISIONED,MAINTENANCE,DELETING,ERROR,CUSTOMIZING,AGENT_UPDATING,AGENT_REINSTALLING",
 )
 @click.option(
     "--session",
-    type=click.Choice(["AVAILABLE", "UNAVAILABLE", "DRAINING", "QUIESCING", "REPRISTINING"], case_sensitive=False),
     required=False,
-    multiple=False,
-    help="Filter VMs by power state.",
+    help="Filter VMs by session placement status, in comma separated values: AVAILABLE,UNAVAILABLE,DRAINING,QUIESCING,REPRISTINING",
 )
 @cli.formatter(format_vm_table)
 def list_vms(
@@ -97,33 +75,34 @@ def list_vms(
     type: list,
     agent: list,
     power: list,
-    lifecycle: list,
+    lifecycle: str,
     session: str,
     **kwargs,
 ):
     """List template VMs"""
     org_id = cli.get_org_id(org)
 
-    agent = _to_lower(agent)
-    power = _to_lower(power)
-    lifecycle = _to_lower(lifecycle)
+    filttered_agent_states = _parse_multi_state(agent, "agent")
+    filtered_power_states = _parse_multi_state(power, "power")
+    filtered_lifecycle_states = _parse_multi_state(lifecycle, "lifecycle")
+    filtered_session_states = _parse_multi_state(session, "session")
 
     def filter_vm(vm):
-        if agent:
+        if filttered_agent_states:
             s = vm.get("agentStatus")
-            if not s or s.lower() not in agent:
+            if not s or s.upper() not in filttered_agent_states:
                 return False
-        if power:
+        if filtered_power_states:
             s = vm.get("powerState")
-            if not s or s.lower() not in power:
+            if not s or s.upper() not in filtered_power_states:
                 return False
-        if lifecycle:
+        if filtered_lifecycle_states:
             s = vm.get("lifecycleStatus")
-            if not s or s.lower() not in lifecycle:
+            if not s or s.upper() not in filtered_lifecycle_states:
                 return False
-        if session:
+        if filtered_session_states:
             s = vm.get("sessionPlacementStatus")
-            if not s or s.lower() != session.lower():
+            if not s or s.upper() not in filtered_session_states:
                 return False
         return True
 
@@ -178,6 +157,39 @@ def list_vms(
     return vms
 
 
+def _parse_multi_state(param_list: str, name: str):
+    if not param_list:
+        return None
+    param_list = param_list.upper()
+    values = []
+
+    valid_map = {
+        "lifecycle": [
+            "PROVISIONING",
+            "PROVISIONED",
+            "MAINTENANCE",
+            "DELETING",
+            "ERROR",
+            "CUSTOMIZING",
+            "AGENT_UPDATING",
+            "AGENT_REINSTALLING",
+        ],
+        "agent": ["UNAVAILABLE", "ERROR", "AVAILABLE", "INIT", "UNKNOWN", "DOMAIN_ERR", "CUSTOMIZATION_FAILURE"],
+        "power": ["POWEREDON", "POWEREDOFF", "POWERINGON", "POWERINGOFF", "UNKNOWN"],
+        "session": ["AVAILABLE", "UNAVAILABLE", "DRAINING", "QUIESCING", "REPRISTINING"],
+    }
+    if name not in valid_map:
+        raise Exception(f"Unknown multi-state filter name: {name}")
+
+    valid = valid_map[name]
+    for s in param_list.split(","):
+        s = s.strip()
+        if s not in valid:
+            raise Exception(f"Invalid {name} value: {s}. Valid values are: {', '.join(valid)}")
+        values.append(s)
+    return values
+
+
 def _to_lower(values):
     if values:
         return [v.lower() for v in values]

hcs_cli/cmds/vmm/rootca_migrate.py

@@ -556,7 +556,7 @@ def power_policy_on_template(template: dict, enable: bool, verbose: bool):
     patch = calculate_patch(template, allowed_fields, [field])
     for i in range(3):
         try:
-            admin.template.update(template_id, target_org_id, patch)
+            admin.template.patch(template_id, target_org_id, patch)
             admin.template.wait_for_ready(template_id, target_org_id, 60)
             break
         except Exception as ex:

hcs_cli/payload/lcm/azure-dummy.json

@@ -43,9 +43,9 @@
   },
   "image": {
     "imageReference": {
-      "publisher": "Canonical",
-      "offer": "UbuntuServer",
-      "sku": "18.04-LTS",
+      "publisher": "canonical",
+      "offer": "0001-com-ubuntu-server-jammy",
+      "sku": "22_04-lts-gen2",
       "version": "latest"
     },
     "os": "linux",
@@ -61,7 +61,8 @@
   },
   "properties": {
     "azureCreateResourceGroup": true,
-    "new-task-engine": false,
-    "simulateAgentStatus": "AVAILABLE"
+    "new-task-engine": true,
+    "simulateAgentStatus": "AVAILABLE",
+    "countinuousErrorThreshold": 3
   }
 }

hcs_cli/payload/lcm/zero.json

@@ -56,8 +56,9 @@
     }
   },
   "properties": {
-    "new-task-engine": false,
+    "new-task-engine": true,
     "sg-lcm-enforced-provision": true,
-    "autonomous": true
+    "autonomous": true,
+    "countinuousErrorThreshold": 2
   }
 }

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

@@ -42,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/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/vm_table.py

@@ -46,8 +46,8 @@ def format_vm_table(data):
             "agentStatus",
             {
                 "AVAILABLE": "green",
-                "ERROR": lambda d: "bright_black" if d["powerState"] != "PoweredOn" else "red",
-                "UNAVAILABLE": lambda d: "bright_black" if d["powerState"] != "PoweredOn" else "red",
+                "ERROR": lambda d: "bright_black" if d.get("powerState") != "PoweredOn" else "red",
+                "UNAVAILABLE": lambda d: "bright_black" if d.get("powerState") != "PoweredOn" else "red",
             },
         )
 

{hcs_cli-0.1.319.dist-info → hcs_cli-0.1.321.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-cli
-Version: 0.1.319
+Version: 0.1.321
 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.319
+Requires-Dist: hcs-core>=0.1.321
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: matplotlib>=3.8.0
 Requires-Dist: paho-mqtt>=2.1.0

{hcs_cli-0.1.319.dist-info → hcs_cli-0.1.321.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hcs_cli/__init__.py,sha256=GmE3XLJrOylzf4SErEpUcXMCHNNcNCp_3INULHkhrOE,47
+hcs_cli/__init__.py,sha256=dX6e1kri6Gcqjvlr5u1l5USUlOgjbOKPHS5vP_FG78Y,72
 hcs_cli/__main__.py,sha256=lwPXLjh1OpOs4doVLJJ6_3XHtC-VqDOXiw45hvAQorM,684
 hcs_cli/main.py,sha256=0NmRcidxNxtJatS_prEKQ4_6bqu-l8UkLhAPOXW3uyc,3537
 hcs_cli/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,7 +7,7 @@ hcs_cli/cmds/inspect.py,sha256=QBhBOkf2mHlGhgAhY9FXCfvViL2p4D3BudoKjyADdfE,659
 hcs_cli/cmds/login.py,sha256=dj42jDrKktt4bUqSD0Xj6Jo9ZSI7M9v9R280YavWpuc,11165
 hcs_cli/cmds/logout.py,sha256=BxU-K1cIkdBpAAp6SGuwEqECL6g20l9CqEcSX-3pZag,744
 hcs_cli/cmds/query.py,sha256=hh1TVeSkvRiB07fqIA3GGpEBtP3XMz5XCmAGTXD7FOM,9302
-hcs_cli/cmds/task.py,sha256=7w54riLLH-RFiqd-jeDNUsB9pSY3BtrWYD9AJMlD5-g,19472
+hcs_cli/cmds/task.py,sha256=YIZUjDzHZaNCbmAt589Nzp8s7NMsBI7w_a33l109iy8,19564
 hcs_cli/cmds/test.py,sha256=Kkpe3wV3ViRRAKeMO5IBwjTysEsKzZXP46OXNb-GhxE,1309
 hcs_cli/cmds/upgrade.py,sha256=iJYSyxyNBhiss0u605nD6jpYUdoDhjfIeJP98zSeDf4,931
 hcs_cli/cmds/ad/__init__.py,sha256=wC4uftNZRN3bo9SrRHNNE1tzE0x3B1mCXcIzARm73gI,636
@@ -73,7 +73,7 @@ hcs_cli/cmds/dev/onboard.py,sha256=7guWRWbJIDOBiDMdWghAilyERmxQY3HCdt6atnauYXA,1
 hcs_cli/cmds/dev/test.py,sha256=VP-I-H3MdS1j8FaTiZclQt4HCLUPmiXg__4cn1smgM8,976
 hcs_cli/cmds/dev/fs/__init__.py,sha256=8hlQwsU-qFh1L2TmyQ9gokur7vxjCl1fwChEbkK8cgg,633
 hcs_cli/cmds/dev/fs/auth.py,sha256=GsjT-ATwD_G_BUma0PK114KME3RnF_lDKHB0HrjGQKs,909
-hcs_cli/cmds/dev/fs/clear.py,sha256=yD7LrwWky9WczS2JNkCod-CpxetrNOMxr-R-YHfx1do,3645
+hcs_cli/cmds/dev/fs/clear.py,sha256=G3Dk2HjBd5dS7jCz5CYeuqya2I5VoChjY8oguuHemis,3965
 hcs_cli/cmds/dev/fs/init.py,sha256=0ogDcipzMiGPa2IKz5V43Rec3vqjh-wHxv30NoysGpE,39199
 hcs_cli/cmds/dev/fs/profiler.py,sha256=3IPhiCsYebVKaqvmXUocNJXQAX4yQBjxQWPxrRriaRE,3564
 hcs_cli/cmds/dev/fs/tailor.py,sha256=ehTR5GsXKdB_8X3YDQWN-0Xq_rdC0ZilB2LHJ0BLuyc,6969
@@ -89,7 +89,7 @@ hcs_cli/cmds/dev/fs/provided_files/__init__.py,sha256=AC-hl0F-5R4V2uejk5FzFDlvT7
 hcs_cli/cmds/dev/fs/provided_files/akka.plan.yml,sha256=IBBuxU-oxiFfEMhpOB7uK9IMoHsRVwlcnKwPPfbPnyw,12486
 hcs_cli/cmds/dev/fs/provided_files/azsim.plan.yml,sha256=rnjNWSnhaYr19tlKoxGjvKTlhs2pYA2NRC-dC3kIzYE,17220
 hcs_cli/cmds/dev/fs/provided_files/azure.plan.yml,sha256=4-ghUgskCyeM-G0kvWb_AW1ywlN9wKN_kC3XSWfryY8,31561
-hcs_cli/cmds/dev/fs/provided_files/mqtt-secret.yaml,sha256=46O-pJOKhJ5LyPFw6wiqWEFmRrv_9JwTKQPxmbq2Ro4,14945
+hcs_cli/cmds/dev/fs/provided_files/mqtt-secret.yaml,sha256=lJI6N4e3ogiZ9BpyjWUHqj3KfbGs7WUdYuaPt1D8TLw,14939
 hcs_cli/cmds/dev/fs/provided_files/mqtt-server-external.yaml,sha256=gtYLY9pgMCeJthYmTXrLjd3xITf4b2keesyQ8VBAar8,612
 hcs_cli/cmds/dev/fs/provided_files/patch-mqtt-hostname.yml,sha256=YuwUPj5QtZo1dKOqNsh72EVXdVBxr2ZQBcW4gyX0agY,212
 hcs_cli/cmds/dev/fs/provided_files/patch-vernemq-ssl-depth.json,sha256=jDuQLeen8aJ656gfJhk16aGyUCbOLt7VJq9AuUezNE4,441
@@ -116,6 +116,7 @@ hcs_cli/cmds/hoc/connect.py,sha256=GvXfbB1JhAZRnl1_H1oxCAhAMCP9jtJgAlhVy9ggYNc,5
 hcs_cli/cmds/hoc/oncall.py,sha256=yc7s94Ti21QDm6WZAbuzB21GsGwced5jLrfmvkV8J2c,575
 hcs_cli/cmds/hoc/org.py,sha256=fi2rjO4hLuJuLSinWG3s8-dTdAj9EIrIFcN82LM8mtI,570
 hcs_cli/cmds/hoc/search.py,sha256=yQk1BTp6sSPer8YdCqNd458CpwuJ5PM50_3yjwv8T7g,5447
+hcs_cli/cmds/hoc/stats.py,sha256=QEnAULDIhvsEgMLJg4Ql9cI6wUqd0zQW2QjwBWwXdno,2641
 hcs_cli/cmds/hoc/template.py,sha256=M9bPYDuPfYQjjR8SYS4r4NknckSAfrMJGW6GeczCZvw,574
 hcs_cli/cmds/hoc/vm.py,sha256=YjijTxpSbnUKyCtsc9wIYDYZULM4RKo2JfROdilmNvk,664
 hcs_cli/cmds/hoc/util/__init__.py,sha256=AC-hl0F-5R4V2uejk5FzFDlvT7uKGfjQyWq0quSznQs,14
@@ -150,6 +151,7 @@ hcs_cli/cmds/inventory/__init__.py,sha256=MHbL9kVMQm--omd6_50d48o9Ff8vlQ9JWXEtW0
 hcs_cli/cmds/inventory/assign.py,sha256=ijZna58rMq1JLUytb6EyuSqd5CLZrqehfEpTqxKEfYs,4923
 hcs_cli/cmds/inventory/count.py,sha256=AR_9HyO4hMLJp1FhrX4RTbpqF2aLWjiyKASdBi5kfjE,401
 hcs_cli/cmds/inventory/deassign.py,sha256=Nwo3dct1FtVUel6TVG8sQzGL6qYR3yqx3q-WfMgZ_GI,2272
+hcs_cli/cmds/inventory/delete.py,sha256=wwZGmO0nQnXINR0DjuRkpaBkJC9d5MrusLfiUBbh3-k,1679
 hcs_cli/cmds/inventory/get.py,sha256=EpGoHzNA9taubw5ohkoj6bsQQVz2nBn8z05i5vKzH58,1072
 hcs_cli/cmds/inventory/list.py,sha256=Cmm7uhNSsBJVgXqEFuPlTrKMe6yCZU1GLWU4BnFtgZo,3602
 hcs_cli/cmds/inventory/logoff.py,sha256=EUE_RcEnnFhgtBePXcP-CerRHgFfzTqItrCddUVyJTc,4137
@@ -162,7 +164,7 @@ hcs_cli/cmds/lcm/health.py,sha256=aAnNKPQSdV1rezwMdXqVF9sG_n8ajoa8eggwTOJje-4,78
 hcs_cli/cmds/lcm/register.py,sha256=BO7UtE-3xIuwDMd0Go2SXln-YdQAYZJJfRAGAJDSWM8,1664
 hcs_cli/cmds/lcm/test.py,sha256=QV5FN6Xy1ka0GplPtXit3czn5HhEiv0HPt6SFwLL7tM,936
 hcs_cli/cmds/lcm/provider/__init__.py,sha256=PZyypOINS42FE9UF6HUzL4p-5OhlfmemR96f7HykaHE,628
-hcs_cli/cmds/lcm/provider/create.py,sha256=rbKc59k7H1HXoQYnLipMRwlaQOewzUEy6kZcDr-qVoQ,3377
+hcs_cli/cmds/lcm/provider/create.py,sha256=_KhSkng3R0V1H594CFA-qpR6GPIYSlGXKUAZsRqATl4,3677
 hcs_cli/cmds/lcm/provider/delete.py,sha256=jBHBHX7AV1X2jM4WXzCrL84jlyhgWdVtjOLmbbGahvc,1002
 hcs_cli/cmds/lcm/provider/get.py,sha256=6CFNWM8RWXS2eR6G6Xas4Md9qSchbEhb9WLD85YxVbE,921
 hcs_cli/cmds/lcm/provider/list.py,sha256=b4HWh_ZMj7HqqR2lOQLUoKlpt13TdwGpQFYbp0Inb8U,1076
@@ -170,6 +172,7 @@ hcs_cli/cmds/lcm/template/__init__.py,sha256=0MLiuwktWNE_kV36BGSXEv8jAUZQCLHWpfm
 hcs_cli/cmds/lcm/template/cancel.py,sha256=EKjL_EoSem6NNxwB-uDTfvTY-Z3Fh4E-OEUpsm7zCIM,1061
 hcs_cli/cmds/lcm/template/create.py,sha256=fvg9yCkST4JpYCbtX5hOas0rPEQL1XkpsKOEM4lrj34,2692
 hcs_cli/cmds/lcm/template/delete.py,sha256=_lf7gEJFvrdc1_U18_-URvPiXURbw88YxU9eEZ_RLFE,1336
+hcs_cli/cmds/lcm/template/expand.py,sha256=zF5aR6igfQEH8m0QVF_HkIO__HrxYSMk7g4S7eqLiCg,1314
 hcs_cli/cmds/lcm/template/get.py,sha256=siSdvS_KEVIIcRSHFgMs3R2MFbdl1f9-yeVmQiZtlZ8,1048
 hcs_cli/cmds/lcm/template/health.py,sha256=PPXO5-8Vytj7WUgsRVQ05VipC2hdlQXlbxRec1HeOWQ,1428
 hcs_cli/cmds/lcm/template/list.py,sha256=tjupel3IZKkBrvy75czB32wUU5hV70SHZwy9L7AFHPc,3203
@@ -179,7 +182,7 @@ hcs_cli/cmds/lcm/template/update.py,sha256=B4HTlXt-EfOtsIKOChoY5ZX6PWY72wNunk25S
 hcs_cli/cmds/lcm/template/use.py,sha256=E9fQgdAYri9FJwRtIJvSw3hQBSjSaMSLtFrY1fF0sF4,1459
 hcs_cli/cmds/lcm/template/wait.py,sha256=nAfeu6v-hPSK96Ov2-zzczOXgBTfKHA-ho4XycnsBV4,2638
 hcs_cli/cmds/lcm/vm/__init__.py,sha256=SflvFQtT5sCprl6RtseVMrFuOyYHOkZf83AsvdUEFqs,622
-hcs_cli/cmds/lcm/vm/delete.py,sha256=GjdaSbKAFtKmMe3tkbthSDKXmWDkFKCPqLT8AC2G20w,1349
+hcs_cli/cmds/lcm/vm/delete.py,sha256=qx3swt_Ro5ALojQbFC30cdait455EbBU9zOC6s-92vM,1386
 hcs_cli/cmds/lcm/vm/get.py,sha256=CVByeki8devUWLs9X41PIQhnOQBkCQ5OckYZxioRrds,1081
 hcs_cli/cmds/lcm/vm/pair.py,sha256=4TMs9VjWa_X6ph-tqI3rF6lDo5NL3BhhJQpLFcWgegE,1060
 hcs_cli/cmds/lcm/vm/pairing_info.py,sha256=HPAXZM2MZrdmmJt74yJR7S7PmM0F3hkBAfHCjoxI58k,1200
@@ -261,12 +264,12 @@ hcs_cli/cmds/synt/report/list.py,sha256=vk0A-rNPWakKLfuzp3TzTLn47dcMDjAKuujRdaq5
 hcs_cli/cmds/template/__init__.py,sha256=0MLiuwktWNE_kV36BGSXEv8jAUZQCLHWpfmRvu-IHCU,628
 hcs_cli/cmds/template/create.py,sha256=LBK0ijSeAS2PECR81FGRAlh9Zu6kxQQw6173Kxqkd8E,1909
 hcs_cli/cmds/template/delete.py,sha256=GSxtTKqe0DSE6FNt20FMGwFlTKNvygMDTTnxHPwBiRM,1330
-hcs_cli/cmds/template/expand.py,sha256=_Pv9ewmk1iX9h-YzQFn1wIvqWl2SAhVfcOzLF9LCN_U,2082
+hcs_cli/cmds/template/expand.py,sha256=ewdKhhkheB73RD6Z4-bClNxK9NPRBGjXtP92jwxNV7E,3556
 hcs_cli/cmds/template/fix.py,sha256=aMRamRlJHS1ARseU3MKVRft0ilnbN-vtjO8Ia2S8TA4,2813
 hcs_cli/cmds/template/get.py,sha256=M-GSJfsV9RWyFomQdwtkB7_Ga52G8TXlcNseo4crolQ,1017
 hcs_cli/cmds/template/list.py,sha256=106v3Ng-n7AlvSvVa7GYxQQmY7R1qBfP45XnjDTa8Ko,3526
 hcs_cli/cmds/template/list_usage.py,sha256=eVszi1XPLCshLTx9SlaJYsF5d_6MrAflkAqdIS5gP2M,4337
-hcs_cli/cmds/template/update.py,sha256=Ry39U_Brx8UST9yOTLFI4vC98w-o6owPbpRyF4bebc0,1830
+hcs_cli/cmds/template/update.py,sha256=R28_4ElCaAPLuCh6GDWBYtHs6-3ARBb-FLxb1jXyNl0,1832
 hcs_cli/cmds/template/usage.py,sha256=AfhgBpJqVhqi3u3_jjvjQjbUW4Kav6VSRatEEEhf3Q8,9373
 hcs_cli/cmds/template/use.py,sha256=GhWA8N9nUiVJeU-Qco8Rl_g8xO_0uGDNTmJAUMK6H-4,1462
 hcs_cli/cmds/template/wait.py,sha256=YE1-Sbi-4olFk7GNCUmwE1UDFtjey880TeTaGdsGeIs,2459
@@ -276,9 +279,9 @@ hcs_cli/cmds/uag/get.py,sha256=mLBOvpVjnJj6BWtl_0u9j4aUJcF_KQMKvuxwd18gSl8,992
 hcs_cli/cmds/uag/list.py,sha256=h-iEEzpSufqGrBNVUKciMW5kot82URqe3724z3Vz87w,947
 hcs_cli/cmds/vm/__init__.py,sha256=SflvFQtT5sCprl6RtseVMrFuOyYHOkZf83AsvdUEFqs,622
 hcs_cli/cmds/vm/actions.py,sha256=anZZ0iWNyN_STOIgJ-q3iYUkTfjEJe5_yrMWYAgRAzg,3921
-hcs_cli/cmds/vm/delete.py,sha256=qShFy2AYoPd5M_W5fK4RTWnL5gJ91qLUum169O7StiI,1453
+hcs_cli/cmds/vm/delete.py,sha256=_BRnmWnQqSN4fg2zOMVGJOEz162UMj0S-kRsk6EQf8c,1488
 hcs_cli/cmds/vm/get.py,sha256=CblKzcYwufBXYwX6h1jcui6DF_cE0xjbHiJXv-PDcyo,1037
-hcs_cli/cmds/vm/list.py,sha256=6Uw-Zs4GKiuyQohgGtbaXSZJ76qOyn9WK5RuZHVSSZU,5587
+hcs_cli/cmds/vm/list.py,sha256=_WMAn4bQVpdnQUP76FlqRx6Y8Y5rYDRpQ1U_WNUTGF8,6598
 hcs_cli/cmds/vm/pairing_info.py,sha256=6ahK0tINjhyZVeFgSe5jbUITF8F9mUsdvMftIOTT9bI,1177
 hcs_cli/cmds/vm/put.py,sha256=mHrv4niFLLW9ENQFznaTd_Jmwms0DAoIKKlOF-GjBSQ,1199
 hcs_cli/cmds/vm/use.py,sha256=P3jnw5l42rrx7RB0iAWvINbq9XUwsHNn8n5wL_I3CvU,1830
@@ -292,7 +295,7 @@ hcs_cli/cmds/vmm/__init__.py,sha256=jTmyoqXOsPaSLNirVYvb4l_Pc2Qn9OgpMVFI21YuBNo,
 hcs_cli/cmds/vmm/restart_vms.py,sha256=n9FzXBMMigVO55Bl1e6kJBILa9o_PfJ8JGDmJvxEgfk,3278
 hcs_cli/cmds/vmm/rootca_edge_migration_stats.py,sha256=Oe9YBsHCtp_V7tmMVN1M9KdGHDxafE63n-PC-uKq8Uc,27166
 hcs_cli/cmds/vmm/rootca_edge_rotate_certs.py,sha256=KUq4CwgemWyPtJa4ys_d-khZdFmBqKcKvMDA3_VBRkc,12680
-hcs_cli/cmds/vmm/rootca_migrate.py,sha256=Y5oUjIpfeGYVMsRM_KYv17bZbH5c6BXu-CqPM4KAliI,37982
+hcs_cli/cmds/vmm/rootca_migrate.py,sha256=3bJ_FrbqDh3dwzHq1gB0prjmThQ04d3bR8BZQzLaFqU,37981
 hcs_cli/cmds/vmm/rootca_migrate_edge.py,sha256=6r1HvPYaBLfNogCmRbKVCdFlF9hy_DpAtE1Iag2y4ok,18625
 hcs_cli/cmds/vmm/rootca_template_migration_stats.py,sha256=npVzjNpsJpTEG-ax5seSIluz-70Fb0pSiDKNcubB53Y,9376
 hcs_cli/cmds/workflows/__init__.py,sha256=GIkOdlgxB8z97dAhJvlHHaaM9Ey5cH6b-eNAsz6M7oM,650
@@ -314,8 +317,7 @@ hcs_cli/payload/inventory/deassign.json,sha256=evl-Nt-6Sc4Mm-F9YS734H1x0aIrf7N3W
 hcs_cli/payload/iss/__init__.py,sha256=4kFVMPKtDxlxFWs6qXrhBJjgEJesuGTCjBBm2a4JsBM,600
 hcs_cli/payload/lcm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hcs_cli/payload/lcm/akka.json,sha256=_PUNdUO2CFj5AimOWkgc1zvVxy1hrWNq99YHYP3hxhA,673
-hcs_cli/payload/lcm/azure-dummy-nt.json,sha256=CepHhef-lyyE08XZGqq5aohh4VJQ41GknBqyi7qH1_A,1562
-hcs_cli/payload/lcm/azure-dummy.json,sha256=CgIK9bGH4nmUfZoHxbAypIYpFQyrzGMUQ50cRUODFVQ,1563
+hcs_cli/payload/lcm/azure-dummy.json,sha256=fu4hSSGBSoKZD6kHPm62TQ3xSTFhCCD7-NRkDMRHTSI,1619
 hcs_cli/payload/lcm/azure-real.json,sha256=QF9TdNKdLQRWjDC610LbU1-DWzxbncTBu0MEUPIiVxI,1561
 hcs_cli/payload/lcm/edge-proxy.json,sha256=PAlwNpkN9HJ-PZ5PEMM8sc_O_eSABcyktAiOoohlTQk,744
 hcs_cli/payload/lcm/zero-dedicated.json,sha256=U8n2KPjPNLMe0ywyfbpu5gRwYI03CexidJrX_gTMCog,782
@@ -328,16 +330,16 @@ hcs_cli/payload/lcm/zero-fail-prepare.json,sha256=p3uVwSGTwXC6iXhsH66fFjiG6vJeK-
 hcs_cli/payload/lcm/zero-fail-vm-onthread.json,sha256=vty-OqyRhtItWNj1opWfQwL5HK75KTmjg0uFxnAF5yk,1307
 hcs_cli/payload/lcm/zero-fail-vm.json,sha256=VSFgt4dAlRu52uz5BZmavvkr1kBarOt2d345AtA00xw,1307
 hcs_cli/payload/lcm/zero-floating.json,sha256=8fO_5C3eNoBlI8RD8cZPP_XB6ZJeyq_U-7Nw8A8bHO0,780
+hcs_cli/payload/lcm/zero-legacy.json,sha256=E3hA0bCnQx29mQQFtjdKuC2R_-IqaPDGItcL6WPugf4,886
 hcs_cli/payload/lcm/zero-manual.json,sha256=SLez__1qO1eMLZW-9GOnxEXTWrfd5TQFmNCb-J9SGEI,741
 hcs_cli/payload/lcm/zero-multisession.json,sha256=OtB7KC5VlrQvWRjtiYQijTwu-jjtoCcaGFQmVBijerM,788
 hcs_cli/payload/lcm/zero-nanw.json,sha256=ALsXhqTeUN8q4xqiDgWk3RiWZXVUVyyrrUj14_lFisE,720
 hcs_cli/payload/lcm/zero-new-5k-delay.json,sha256=UOh6E0FUks6Ozo0EjjhCAjhD7R7gyKdT2sTEhMy9DcY,1571
 hcs_cli/payload/lcm/zero-new-5k.json,sha256=fgiZbLr2cPoLCfLdn2uNFp_GxROHIiadUlbhDqEbESQ,828
 hcs_cli/payload/lcm/zero-new-snapshot.json,sha256=E3hA0bCnQx29mQQFtjdKuC2R_-IqaPDGItcL6WPugf4,886
-hcs_cli/payload/lcm/zero-new.json,sha256=E3hA0bCnQx29mQQFtjdKuC2R_-IqaPDGItcL6WPugf4,886
 hcs_cli/payload/lcm/zero-reuse-vm-id.json,sha256=WWbPUijukAaS1ADz8AnEhU5U0s6qKUdbBU1v29HbhS4,716
 hcs_cli/payload/lcm/zero-with-max-id-offset.json,sha256=fo6JO-QHV7ln8rKswhhLZ67v_9skeW1HwZXgaNzPsuc,698
-hcs_cli/payload/lcm/zero.json,sha256=RF6pjji0RGjp85UJ32PXrqC3_b8yPPFA1LCiqNAztY0,1353
+hcs_cli/payload/lcm/zero.json,sha256=sS5X5FPkU0mSO-PeGPcJobFoxtC2FJFznqPuXq6ZmW4,1388
 hcs_cli/payload/provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hcs_cli/payload/provider/ad-stes-vsphere.json,sha256=GgjpDxQY4X_fQNY46-fls0248nuhEgPu6qOcA9MbI0Y,717
 hcs_cli/payload/provider/akka.json,sha256=pKRZT9aOx0irx-28iUFNNwdQ-s1sNgVPCMz7RdASKTM,284
@@ -397,7 +399,7 @@ hcs_cli/service/graphql.py,sha256=Vqt4wMeRSPV_2YhGvb9vs0vlac0_fMAhg1BijKX6reg,46
 hcs_cli/service/pool.py,sha256=EjTENTX5wSZ-YhP8ON_tonB54-OhjWCluzIHVR7ed04,1266
 hcs_cli/service/site.py,sha256=th23Ucm8HgU96Rbt2m8ww2YrISj2Oksojc4atkdjRNM,1568
 hcs_cli/service/task.py,sha256=qqAQPqIS66cBp-f_4zsLm2-iEsWwB6rkBgczDVAlo-Y,9565
-hcs_cli/service/template.py,sha256=mOdYVLkWtnRkCPRHi0Bdv0CbyPxypEA5eptnienEVWQ,2807
+hcs_cli/service/template.py,sha256=pCHmMX8zSdq0RX7bCftVog0_hNQU5gIe2o0FevxpKeg,2796
 hcs_cli/service/uag.py,sha256=5TMt6lqxMVOlp6d49aOZsKFfcgGRdE03Ew4yVWwbw7Q,3747
 hcs_cli/service/vm.py,sha256=9yfG_B8omd6lkXEvLbOd1tpFc_j-P40Y5aZG-_-TeC4,5398
 hcs_cli/service/admin/__init__.py,sha256=ASx6VsdgNleP9frkrKadkEg1G2NS0FyC0pAUN2ivssg,88
@@ -406,7 +408,7 @@ hcs_cli/service/admin/azure_infra.py,sha256=8fSP-CozFZKLL_sVHux-ivrM04xab3zYtAcc
 hcs_cli/service/admin/edge.py,sha256=G39cHLPI5fUyWtn1cYVzKlpM29ftO-HTvvpPPzOKUv4,2177
 hcs_cli/service/admin/helper.py,sha256=jjdqy6GMS4aZO9JO0LyWmL0_x02yarNtJCL8a41qSeY,1329
 hcs_cli/service/admin/provider.py,sha256=XgZJ8mAb0dkHloOEuLAU1ST0h_bXNEWVZCEuOpxCoCg,1886
-hcs_cli/service/admin/template.py,sha256=dJczAsK2dICMmhnBQGf0Yxkg_fIizAbXhqMEmg0gNKo,762
+hcs_cli/service/admin/template.py,sha256=EPtQ7BKUJyDJ0r8ZuY0_Y6khSpP_xVmcnITvH62e5DI,1072
 hcs_cli/service/admin/uag.py,sha256=9NA6wB-yoPz0SSmY-fubQHWyoraFeZFTuSMjR4LJHLc,1852
 hcs_cli/service/admin/vm.py,sha256=qm3C8pkj5MksKVuJcG-lbLVWJ1JyvaZRlCqGpH_y1fE,672
 hcs_cli/service/app_management/__init__.py,sha256=61iK5J3VA_Zaro5NoORIax1-Iqyjx02CfGLl7Ofa1Uw,25
@@ -431,7 +433,7 @@ hcs_cli/service/edgehub/__init__.py,sha256=ZKX6VVPT3DdiC--uWzA6pKlQ1TsrxoxtCVjng
 hcs_cli/service/edgehub/edgecontroller.py,sha256=hc5ps1OWrw8cZiUiU27A2tkpxvgC9FATGGE0FkhS33M,1402
 hcs_cli/service/edgehub/edgetwin.py,sha256=_Z4tSop2l_17-_hsDtljLosintKccwDeFEAkjt8ZqyQ,959
 hcs_cli/service/hoc/__init__.py,sha256=fHFaB2296HgzIKwMPkB9BDxezIYI6M4OD-woPsrtOts,48
-hcs_cli/service/hoc/diagnostic.py,sha256=nSpmLtT66WokKABdtoU4oYq2e3eN2j8ClMQvNCNeTV8,1144
+hcs_cli/service/hoc/diagnostic.py,sha256=3sS1Saydsy-kYuF4IQMlz4scv1O4nMjnHOM7Trqh9cY,1465
 hcs_cli/service/hoc/es.py,sha256=XCeYuhGMJE89uRiH49lolCnNWMEi0Ec7VRhxKbEvAO4,3491
 hcs_cli/service/ims/__init__.py,sha256=CTtPWRJqthcWW7jMyqD-4fP09xSGEfVEj75GbrtyDsA,86
 hcs_cli/service/ims/gold_pattern.py,sha256=HAnKOHBlyoCTzpUP4H5NsqpMPX4tYKiQdtdA9yYr-CM,3160
@@ -439,15 +441,15 @@ hcs_cli/service/ims/helper.py,sha256=0LgnJAE8W3_yGG3qG1Y6DMs7VUHHhKcrjRR2Ap8cNN8
 hcs_cli/service/ims/image_copies.py,sha256=zBZbFZS0jr9Ew9KanLc10qwHnV8iy0UdU9aFYum3Jw0,968
 hcs_cli/service/ims/images.py,sha256=FIuasv4fj4EZFVF7_BFfWW7JutZO8cr6X1h5LCb0qs4,2059
 hcs_cli/service/ims/version.py,sha256=xcsb5-YvGY3duZk0wHdVPmuJjyVf01dg26VGgBQaQxY,3330
-hcs_cli/service/inventory/__init__.py,sha256=vncedPyru5baoOZkhe0OuSOetvg-3aUX0dikC3_oiws,166
+hcs_cli/service/inventory/__init__.py,sha256=Y8pcgMOA60I3b4RjLBrLcT5zRs5rgSP5URIjL-x0nxI,651
 hcs_cli/service/inventory/session.py,sha256=VB9oCC297UmmymJ1cnbtdZoLklyi0GtjuKNnPAb5zEQ,2240
-hcs_cli/service/inventory/vm.py,sha256=JNVoZA1LYQS6Rm9JdAC1zu-gSkqpObvfJbUEDA7uvUo,2478
+hcs_cli/service/inventory/vm.py,sha256=xktEVwelVGVBNOuUtq_rPQl356pwvUt7Je_6OsPyJDo,2936
 hcs_cli/service/iss/__init__.py,sha256=LBifjQWYf4lqZWWdKk7wfB5F4HrqD4qpu9q-iLxVtK0,631
 hcs_cli/service/iss/mqtt.py,sha256=MS7KalunXez2sRozlH47eUPuXoKqU0Ib2QOWpcLb_g4,2142
 hcs_cli/service/lcm/__init__.py,sha256=twzd41c4kLiR5mkNlsq5GNJxRE5CUG6vKlAg3qYWoL8,45
 hcs_cli/service/lcm/health.py,sha256=XHa7bmctKmjuSERxEhmNF4BbcwS4XOfjcxJU2dy9udQ,1069
 hcs_cli/service/lcm/provider.py,sha256=rwA7qoN_MGqV93TJ1-i76BuucdvXyH0DQKnoGbc6HAE,1283
-hcs_cli/service/lcm/template.py,sha256=89X69DDkzsn5eVz6ng5CgodNMxz79SFEbXYZbEMTXqM,4217
+hcs_cli/service/lcm/template.py,sha256=phSrxGQn21ZYrRpTw-IdTkN-AfkhlXWDebfHMtpNJds,4330
 hcs_cli/service/lcm/vm.py,sha256=L75cvPYK4J_CAtTYP076q4LN2zZyJHQ8w54NfPIlsqQ,3808
 hcs_cli/service/org_service/__init__.py,sha256=akNxzmiw970PHGDLHiJjcYZnbtbGCpVFVNzXfUVbwIY,54
 hcs_cli/service/org_service/datacenter.py,sha256=XN0uv2qSLQg6kUPo9Jioz9vSr7aFYr4anQ7YgT67mWA,1182
@@ -489,11 +491,11 @@ hcs_cli/support/template_util.py,sha256=tfQuXIo-j9XYysXTaKCaBs4GF5UHxR9TOKFRF5G-
 hcs_cli/support/test_utils.py,sha256=uMiWOOgYSP7HAOPECam57EJjenrSG_2HvtxO4uzC4K0,5680
 hcs_cli/support/test_utils2.py,sha256=g321d4lNbJfy8VaSfwWjlj4_ZJe9NW6B16S8GOT3rEw,18961
 hcs_cli/support/use_util.py,sha256=QBrcNIW-k0g41euTc7-oU1WKEmACJx3YGQflyC3YeFs,2970
-hcs_cli/support/vm_table.py,sha256=aNyFtrQb2Cy4JBZx3sPt3_GpOHD7R6x4nITlwc9dZ4Q,2321
+hcs_cli/support/vm_table.py,sha256=hqNUKLVUuBiuDwlqcAQ7uAT1-4z6ZYOIGRcFWn8lnAo,2329
 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.319.dist-info/METADATA,sha256=QpyIDrY1otHMDrb1idolJ9MdX2K_x5_YpLh13TjtL8c,3614
-hcs_cli-0.1.319.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hcs_cli-0.1.319.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
-hcs_cli-0.1.319.dist-info/RECORD,,
+hcs_cli-0.1.321.dist-info/METADATA,sha256=llYPP2ShA7g1sBAPChU2L8BaF62Yq0ozSKHZ0xFVieQ,3614
+hcs_cli-0.1.321.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hcs_cli-0.1.321.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
+hcs_cli-0.1.321.dist-info/RECORD,,

hcs_cli/payload/lcm/azure-dummy-nt.json

@@ -1,67 +0,0 @@
-{
-  "id": "azure-dummy",
-  "orgId": "aecd10d9-ca4f-4af8-97fa-9d7b6f25e285",
-  "location": "US",
-  "region": "westus2",
-  "name": "azure-dummy",
-  "templateType": "FLOATING",
-  "provisionWithAgentReady": false,
-  "vmNamePattern": "azdummy-",
-  "resourceManagerTemplate": "dev/dummy",
-  "vmRefreshType": "DELETE_VM",
-  "reuseVmIds": false,
-  "useAZ": false,
-  "provider": {
-    "providerAccessId": "dev-azure"
-  },
-  "sparePolicy": {
-    "increment": 600,
-    "limit": 3,
-    "max": 3,
-    "min": 1
-  },
-  "providerType": "AZURE",
-  "hdc": {
-    "vmHubName": "westus2",
-    "vmHubURL": "https://nanw.fs.devframe.cp.horizon.omnissa.com"
-  },
-  "edgeGateway": {
-    "id": "abcdefghijklmnopqrstuvwx",
-    "iotDeviceName": "syntheticIotDeviceName",
-    "adTwinId": "syntheticAdTwinId"
-  },
-  "activeDirectory": {
-    "domain": "nanw.local"
-  },
-  "network": {
-    "vNetName": "nanw-vnet",
-    "subnetName": "default",
-    "vNetResourceGroup": "nanw-infra",
-    "location": "westus2",
-    "publicIpAddressType": "DYNAMIC",
-    "publicIpAddressSku": "Basic"
-  },
-  "image": {
-    "imageReference": {
-      "publisher": "Canonical",
-      "offer": "UbuntuServer",
-      "sku": "18.04-LTS",
-      "version": "latest"
-    },
-    "os": "linux",
-    "guestUsername": "ubuntu",
-    "guestPassword": "dummy-password"
-  },
-  "vmSpec": {
-    "diskSize": 127,
-    "diskType": "Standard_LRS"
-  },
-  "agentCustomization": {
-    "sessionsPerVm": 1
-  },
-  "properties": {
-    "azureCreateResourceGroup": true,
-    "new-task-engine": true,
-    "simulateAgentStatus": "AVAILABLE"
-  }
-}