hcs-cli 0.1.319__tar.gz → 0.1.320__tar.gz

{hcs_cli-0.1.319 → hcs_cli-0.1.320}/PKG-INFO

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

hcs_cli-0.1.320/hcs_cli/__init__.py

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

{hcs_cli-0.1.319 → hcs_cli-0.1.320}/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-0.1.320/hcs_cli/cmds/hoc/stats.py

@@ -0,0 +1,46 @@
+import click
+import time
+import json
+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:
+        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-0.1.320/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-0.1.319 → hcs_cli-0.1.320}/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-0.1.320/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-0.1.319 → hcs_cli-0.1.320}/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-0.1.320/hcs_cli/cmds/template/expand.py

@@ -0,0 +1,110 @@
+"""
+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_core.util.duration as duration
+from hcs_core.ctxp import recent
+
+import hcs_cli.service.admin as admin
+
+
+@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, 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 = service.template.get(template_id, org_id)
+
+    if not template:
+        return "Template not found: " + template_id, 1
+
+    spare_policy = template.get("sparePolicy", {})
+    new_spare_policy = {
+        "min": spare_policy.get("min", 0),
+        "max": spare_policy.get("max", 0),
+        "limit": spare_policy.get("limit", 0),
+    }
+
+    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 = service.template.wait_for_ready(template_id, org_id, duration.to_seconds(wait))
+    return ret

{hcs_cli-0.1.319 → hcs_cli-0.1.320}/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-0.1.319 → hcs_cli-0.1.320}/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-0.1.319 → hcs_cli-0.1.320}/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-0.1.319 → hcs_cli-0.1.320}/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-0.1.319/hcs_cli/payload/lcm/azure-dummy-nt.json → hcs_cli-0.1.320/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",

{hcs_cli-0.1.319 → hcs_cli-0.1.320}/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-0.1.319 → hcs_cli-0.1.320}/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-0.1.320/hcs_cli/service/inventory/__init__.py

@@ -0,0 +1,15 @@
+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-0.1.319 → hcs_cli-0.1.320}/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-0.1.319 → hcs_cli-0.1.320}/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)