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

hcs_cli/cmds/scm/plan.py

@@ -16,11 +16,13 @@ limitations under the License.
 import json
 import re
 import sys
+from datetime import datetime, timedelta
 from os import path
 
 import click
 import hcs_core.sglib.cli_options as cli
-from hcs_core.ctxp import data_util, recent
+import yumako
+from hcs_core.ctxp import data_util, recent, util
 from hcs_core.sglib.client_util import wait_for_res_status
 
 import hcs_cli.service.scm as scm
@@ -33,6 +35,98 @@ def plan():
     pass
 
 
+def _get_next_slot_name():
+    """
+    Get the current and next half-hour aligned slot names and time delta based on current UTC time.
+
+    Slots are half-hour aligned (HH:00 or HH:30).
+
+    Returns:
+        tuple: (current_slot_name, next_slot_name, timedelta_to_next_slot)
+               where slot names are in format 'weekday/HH:MM' (e.g., 'monday/18:00')
+               and timedelta_to_next_slot is a timedelta object
+    """
+    current_time_utc = datetime.utcnow()
+
+    # Weekday names mapping (0=Monday, 6=Sunday in Python's weekday())
+    weekday_names = ["monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"]
+
+    # Get current half-hour aligned slot (round down)
+    current_minute = current_time_utc.minute
+    if current_minute < 30:
+        # Current slot is this hour:00
+        current_slot_time = current_time_utc.replace(minute=0, second=0, microsecond=0)
+    else:
+        # Current slot is this hour:30
+        current_slot_time = current_time_utc.replace(minute=30, second=0, microsecond=0)
+
+    current_weekday_name = weekday_names[current_slot_time.weekday()]
+    current_time_str = current_slot_time.strftime("%H:%M")
+    current_slot_name = f"{current_weekday_name}/{current_time_str}"
+
+    # Get next half-hour aligned slot
+    if current_minute < 30:
+        # Next slot is this hour:30
+        next_time = current_time_utc.replace(minute=30, second=0, microsecond=0)
+    else:
+        # Next slot is next hour:00
+        next_time = current_time_utc + timedelta(hours=1)
+        next_time = next_time.replace(minute=0, second=0, microsecond=0)
+
+    next_weekday_name = weekday_names[next_time.weekday()]
+    next_time_str = next_time.strftime("%H:%M")
+    next_slot_name = f"{next_weekday_name}/{next_time_str}"
+
+    timedelta_to_next = next_time - current_time_utc
+
+    return current_slot_name, next_slot_name, timedelta_to_next
+
+
+def _format_scm_plan_task_table(data):
+    fields_mapping = {
+        "location": "Location",
+        "_slot": "Slot",
+        "_timeCreatedStale": "Time Created",
+    }
+
+    current_slot_name, next_slot_name, timedelta_to_next = _get_next_slot_name()
+    time_str_to_next = yumako.time.display(timedelta_to_next.total_seconds())
+
+    for d in data:
+        d["_timeCreatedStale"] = yumako.time.stale(d["timeCreated"] / 1000)
+        meta = d["meta"]
+        input = d["input"]
+        my_slot_name = meta["scm_plan_day"] + "/" + meta["scm_plan_slot"]
+        d["_slot"] = my_slot_name
+
+        if d["worker"] == "com.vmware.horizon.sg.scm.task.CapacityOptimization":
+            d["_idealCapacity"] = input["idealCapacity"]
+            d["_forecastCapacity"] = input["forecastCapacity"]
+            d["_taskKey"] = d["key"]
+
+            if my_slot_name == next_slot_name:
+                d["_nextExecution"] = click.style(f"In {time_str_to_next}", fg="bright_blue")
+            else:
+                d["_nextExecution"] = ""
+            fields_mapping["_nextExecution"] = "Next"
+
+            if my_slot_name == current_slot_name:
+                # d['_lastExecutedStale'] = 'TODO'
+                # d['_lastExecutionStatus'] = 'TODO'
+                # fields_mapping['_lastExecutedStale'] = 'Executed'
+                # fields_mapping['_lastExecutionStatus'] = 'Status'
+                pass
+
+            fields_mapping["_idealCapacity"] = "Ideal"
+            fields_mapping["_forecastCapacity"] = "Forecast"
+            fields_mapping["_taskKey"] = "Task Key"
+        else:
+            # TODO other worker types
+            pass
+
+    return util.format_table(data, fields_mapping)
+
+
 @plan.command
 @click.option("--template", help="Filter plan by template.")
 @click.option("--task", help="Filter plan by task class name.")
@@ -99,7 +193,7 @@ def delete(org: str, name: str, confirm: bool, **kwargs):
 
 @plan.command
 @cli.org_id
-@cli.limit
+@cli.limit(default=336)
 @click.option("--day", required=False, help="Search by day-identifier. Example: Monday")
 @click.option("--time", required=False, help="Search by time. Example: 13:30")
 @click.option("--slot", required=False, help="Search by time slot. Example: Mon/13:30")
@@ -111,6 +205,7 @@ def delete(org: str, name: str, confirm: bool, **kwargs):
     help="Search by task state, as comma-separated values. E.g. 'init,running,success,error', or 'all'.",
 )
 @click.argument("name", required=False)
+@cli.formatter(_format_scm_plan_task_table)
 def tasks(org: str, limit: int, day: str, time: str, slot: str, name: str, state: str, **kwargs):
     """Get tasks of a named calendar plan."""
     org = cli.get_org_id(org)
@@ -134,6 +229,40 @@ def tasks(org: str, limit: int, day: str, time: str, slot: str, name: str, state
     ret = scm.plan.tasks(org_id=org, id=name, limit=limit, day=day, slot=time, states=state, **kwargs)
     if ret is None:
         return "", 1
+
+    # sort tasks by slot.
+    for t in ret:
+        meta = t["meta"]
+        d = meta["scm_plan_day"]
+        if d == "sunday":
+            d = "0"
+        elif d == "monday":
+            d = "1"
+        elif d == "tuesday":
+            d = "2"
+        elif d == "wednesday":
+            d = "3"
+        elif d == "thursday":
+            d = "4"
+        elif d == "friday":
+            d = "5"
+        elif d == "saturday":
+            d = "6"
+        else:
+            raise ValueError("Invalid day name in task meta: " + d)
+        t["_slot"] = d + "/" + meta["scm_plan_slot"]
+    ret = sorted(ret, key=lambda x: x["_slot"])
+    for t in ret:
+        del t["_slot"]
+
+    # identify the current task result
+    # current_slot_name, next_slot_name, timedelta_to_next = _get_next_slot_name()
+    # for t in ret:
+    #     meta = t['meta']
+    #     my_slot_name = meta['scm_plan_day'] + '/' + meta['scm_plan_slot']
+    #     if current_slot_name == my_slot_name:
+    #         break
+
     return ret
 
 
@@ -343,7 +472,6 @@ def run(org: str, name: str, slot: str, config: str, wait: str, **kwargs):
 
 
 def _wait_for_task(org_id: str, name: str, task_key: str, timeout: str):
-
     return wait_for_res_status(
         resource_name=name + "/" + task_key,
         fn_get=lambda: scm.plan.get_task(org_id, name, task_key),

hcs_cli/cmds/task.py

@@ -13,8 +13,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import json
-
 import click
 import hcs_core.sglib.cli_options as cli
 import yumako
@@ -29,9 +27,9 @@ def _format_task_table(data):
         schedule = d.get("schedule")
         if schedule:
             if schedule.get("intervalMs"):
-                recurring = f'Every {yumako.time.display(schedule["intervalMs"] / 1000)}'
+                recurring = f"Every {yumako.time.display(schedule['intervalMs'] / 1000)}"
             elif schedule.get("cronExpression"):
-                recurring = f'{schedule["cronExpression"]}'
+                recurring = f"{schedule['cronExpression']}"
             else:
                 recurring = "<No>"
         else:

hcs_cli/cmds/template/list_usage.py

@@ -111,8 +111,8 @@ def list_usage(org: str, **kwargs):
             "addedVmHours": summary.get("addedVmHours"),
             "offloadVmHours": summary.get("offloadVmHours"),
             "reducedVmHours": summary.get("reducedVmHours"),
-            "historyVmUtilizationPercent": f'{summary.get("historyVmUtilizationPercent", 0)}%',
-            "predictionVmUtilizationPercent": f'{summary.get("predictionVmUtilizationPercent", 0)}%',
+            "historyVmUtilizationPercent": f"{summary.get('historyVmUtilizationPercent', 0)}%",
+            "predictionVmUtilizationPercent": f"{summary.get('predictionVmUtilizationPercent', 0)}%",
         }
 
         ret2.append(item)

hcs_cli/cmds/template/usage.py

@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+import json
 import os
 import tempfile
 import time
@@ -32,17 +33,28 @@ def _timestamp_to_date(timestamp: int):
 
 
 @click.command(hidden=True)
+@click.option(
+    "--local-plan-file",
+    type=str,
+    required=False,
+    help="Instead of reading from API, read from local file for the template usage data. Debug only.",
+)
 @click.argument("id", type=str, required=False)
 @cli.org_id
-def usage(id: str, org: str, **kwargs):
+def usage(id: str, org: str, local_plan_file: str = None, **kwargs):
     """Show usage visualization"""
 
     org_id = cli.get_org_id(org)
     id = recent.require("template", id)
 
-    usage = scm.template_usage(org_id, id)
-    if not usage:
-        return "No usage data found", 1
+    if local_plan_file:
+        with open(local_plan_file, "r") as f:
+            plan_data = json.load(f)
+            usage = plan_data["meta"]
+    else:
+        usage = scm.template_usage(org_id, id)
+        if not usage:
+            return "No usage data found", 1
 
     x_axis = []
     consumed_capacity = []
@@ -61,8 +73,9 @@ def usage(id: str, org: str, **kwargs):
         x_axis.append(_timestamp_to_date(t))
         max_capacity = history["maxCapacity"][i]
         min_free = history["minFree"][i]
-        consumed_capacity.append(max_capacity - min_free)
-        spare_capacity.append(min_free)
+        # consumed_capacity.append(max_capacity - min_free)
+        consumed_capacity.append(history["poweredOnAssignedVms"][i])
+        spare_capacity.append(max_capacity - consumed_capacity[-1])
         no_spare_error.append(history["noSpare"][i])
 
     start_timestamp = prediction["startTimestamp"]
@@ -72,7 +85,7 @@ def usage(id: str, org: str, **kwargs):
         max_capacity = prediction["maxCapacity"][i]
         min_free = prediction["minFree"][i]
         ideal_capacity = prediction["idealCapacity"][i]
-        consumed_capacity_predicated.append(ideal_capacity - min_free)
+        consumed_capacity_predicated.append(ideal_capacity)
         spare_capacity_predicated.append(min_free)
         optimized_capacity.append(ideal_capacity)
         no_spare_error_predicated.append(prediction["noSpare"][i])

hcs_cli/cmds/vm/list.py

@@ -129,7 +129,6 @@ def list_vms(
 
     vms = []
     if template_id and template_id.lower() == "all":
-
         cloud = _to_lower(cloud)
 
         def to_search_condition(values):

hcs_cli/config/hcs-deployments.yaml

@@ -1,16 +1,16 @@
 prod:
   - env: prod-global
     alias: prod
-    description: 
+    description:
     azure-reion: WestUS2
-    primary: 
+    primary:
     portal-url:
       - https://cloud-sg.horizon.omnissa.com
       - https://cloud.vmwarehorizon.com/
     hdc:
       url: https://cloud-sg.horizon.omnissa.com
       mqtt: cloud-sg-us-hdc-mqtt.horizon.omnissa.com
-    regions: 
+    regions:
       - name: EastUS2
         url: https://cloud-sg-us-r-eastus2.horizon.omnissa.com
         #mqtt: http://prod-sg-mqtt-eastus2.trafficmanager.net
@@ -25,16 +25,16 @@ prod:
       url: https://hv2-cloud-us-2.horizon.omnissa.com
   - env: prod-na-cp102
     alias: prod-us
-    description: 
+    description:
     azure-reion: WestUS2
-    primary: 
+    primary:
     portal-url:
       - https://cloud-sg.horizon.omnissa.com
       - https://cloud.vmwarehorizon.com/
     hdc:
       url: https://cloud-sg-us.horizon.omnissa.com
       mqtt: cloud-sg-us-hdc-mqtt.horizon.omnissa.com
-    regions: 
+    regions:
       - name: EastUS2
         url: https://cloud-sg-us-r-eastus2.horizon.omnissa.com
         mqtt: cloud-sg-us-r-eastus2-mqtt-a.horizon.omnissa.com
@@ -45,7 +45,7 @@ prod:
       url: https://hv2-cloud-us-2.horizon.omnissa.com
   - env: prod-centralus-cp102
     alias: prod-us-standby
-    description: 
+    description:
     azure-reion: CentralUS
     primary: false
     portal-url:
@@ -53,8 +53,8 @@ prod:
       - https://cloud.vmwarehorizon.com/
     hdc:
       url: https://cloud-sg-centralus.horizon.omnissa.com
-      mqtt: 
-    regions: 
+      mqtt:
+    regions:
       - name: EastUS2
         url: https://cloud-sg-us-r-eastus2.horizon.omnissa.com
         mqtt: cloud-sg-us-r-eastus2-mqtt-a.horizon.omnissa.com
@@ -65,16 +65,16 @@ prod:
       url: https://hv2-cloud-us-2.horizon.omnissa.com
   - env: prod-eu-cp102
     alias: prod-eu
-    description: 
+    description:
     azure-reion: NorthEurope
-    primary: 
+    primary:
     portal-url:
       - https://cloud-sg.horizon.omnissa.com
       - https://cloud.vmwarehorizon.com/
     hdc:
       url: https://cloud-sg-eu.horizon.omnissa.com
       mqtt: cloud-sg-eu-hdc-mqtt.horizon.omnissa.com
-    regions: 
+    regions:
       - name: NothEurope
         url: https://cloud-sg-eu-r-northeurope.horizon.omnissa.com
         mqtt: cloud-sg-eu-r-northeurope-mqtt-a.horizon.omnissa.com
@@ -88,8 +88,8 @@ prod:
       url: https://hv2-cloud-eu-2.horizon.omnissa.com
   - env: prod-westeu-cp102
     alias: prod-eu-standby
-    description: 
-    azure-reion: 
+    description:
+    azure-reion:
     primary: false
     portal-url:
       - https://cloud-sg.horizon.omnissa.com
@@ -97,7 +97,7 @@ prod:
     hdc:
       url: https://cloud-sg-westeu.horizon.omnissa.com
       mqtt: null
-    regions: 
+    regions:
       - name: NothEurope
         url: https://cloud-sg-eu-r-northeurope.horizon.omnissa.com
         mqtt: cloud-sg-eu-r-northeurope-mqtt-a.horizon.omnissa.com
@@ -111,16 +111,16 @@ prod:
       url: https://hv2-cloud-eu-2.horizon.omnissa.com
   - env: prod-jp-cp102
     alias: prod-jp
-    description: 
+    description:
     azure-reion: JapanEast
-    primary: 
+    primary:
     portal-url:
       - https://cloud-sg.horizon.omnissa.com
       - https://cloud.vmwarehorizon.com/
     hdc:
       url: https://cloud-sg-jp.horizon.omnissa.com
       mqtt: cloud-sg-jp-hdc-mqtt.horizon.omnissa.com
-    regions: 
+    regions:
       - name: JapanEast
         url: https://cloud-sg-jp-r-japaneast.horizon.omnissa.com
         mqtt: cloud-sg-jp-r-japaneast-mqtt-a.horizon.omnissa.com
@@ -134,8 +134,8 @@ prod:
       url: https://hv2-cloud-jp-2.horizon.omnissa.com
   - env: prod-westjp-cp102
     alias: prod-jp-standby
-    description: 
-    azure-reion: 
+    description:
+    azure-reion:
     primary: false
     portal-url:
       - https://cloud-sg.horizon.omnissa.com
@@ -143,7 +143,7 @@ prod:
     hdc:
       url: https://cloud-sg-westjp.horizon.omnissa.com
       mqtt: null
-    regions: 
+    regions:
       - name: JapanEast
         url: https://cloud-sg-jp-r-japaneast.horizon.omnissa.com
         mqtt: cloud-sg-jp-r-japaneast-mqtt-a.horizon.omnissa.com
@@ -158,55 +158,55 @@ prod:
 staging:
   - env: staging1-northcentralus-cp102
     alias: stg-us
-    description: 
+    description:
     azure-reion: North Central US
-    primary: 
-    portal-url: 
+    primary:
+    portal-url:
       - https://cloud.stg.vmwarehorizon.com/
       - https://staging1-cp102.horizon.omnissa.com/
     hdc:
       url: https://staging1-northcentralus-cp102.horizon.omnissa.com/
       mqtt: staging1-northcentralus-cp102-mqtt.horizon.omnissa.com
-    regions: 
+    regions:
       - name: staging1-northcentralus-cp102a
         url: https://staging1-northcentralus-cp102a.horizon.omnissa.com/
-        mqtt: 
+        mqtt:
       - name: staging1-northcentralus-cp102b
-        url: https://staging1-northcentralus-cp102b.horizon.omnissa.com/ 
+        url: https://staging1-northcentralus-cp102b.horizon.omnissa.com/
         mqtt:
     edgehub:
       url: https://test-hv2-cloud-us-2.horizon.omnissa.com
   - env: staging1-northeurope-cp102
     alias: stg-eu
-    description: 
+    description:
     azure-reion: North Europe
-    primary: 
+    primary:
     portal-url:
       - https://cloud.stg.vmwarehorizon.com/
       - https://staging1-cp102.horizon.omnissa.com/
     hdc:
       url: https://staging1-northeurope-cp102.horizon.omnissa.com/
       mqtt: staging1-northeurope-cp102-mqtt.horizon.omnissa.com
-    regions: 
+    regions:
       - name: staging1-northeurope-cp102a
         url: https://staging1-northeurope-cp102a.horizon.omnissa.com/
-        mqtt: 
+        mqtt:
       - name: staging1-northeurope-cp102b
         url: https://staging1-northeurope-cp102b.horizon.omnissa.com/
         mqtt:
     edgehub:
       url: https://test-hv2-cloud-eu-2.horizon.omnissa.com
 dev:
-  - env: 'dev1b-westus2-cp102'
+  - env: "dev1b-westus2-cp102"
     alias: bat
     description: BAT
-    azure-reion: 'West US 2'
-    primary: 
+    azure-reion: "West US 2"
+    primary:
     portal-url: []
     hdc:
       url: https://dev1b-westus2-cp102.azcp.horizon.omnissa.com/
       mqtt: dev1b-westus2-cp102-mqtt.azcp.horizon.omnissa.com
-    regions: 
+    regions:
       - name: westus2
         url: https://dev1b-westus2-cp102a.azcp.horizon.omnissa.com/
         mqtt:
@@ -215,13 +215,13 @@ dev:
   - env: dev1b-westus2-cp103
     alias: integration
     description: Integration/Nightly
-    azure-reion: 'West US 2'
-    primary: 
+    azure-reion: "West US 2"
+    primary:
     portal-url: []
     hdc:
       url: https://dev1b-westus2-cp103.azcp.horizon.omnissa.com/
       mqtt: dev1b-westus2-cp103-mqtt.azcp.horizon.omnissa.com
-    regions: 
+    regions:
       - name: westus2
         url: https://dev1b-westus2-cp103a.azcp.horizon.omnissa.com/
         mqtt: dev1b-westus2-cp103a-mqtt.azcp.horizon.omnissa.com
@@ -230,16 +230,16 @@ dev:
   - env: dev1b-westus2-cp104
     alias: chaos
     description: Chaos
-    azure-reion: 'West US 2'
-    primary: 
+    azure-reion: "West US 2"
+    primary:
     portal-url: []
     hdc:
       url: https://dev1b-westus2-cp104.azcp.horizon.omnissa.com/
       mqtt: null
     regions:
       - name: westus2
-        url: 
-        mqtt: 
+        url:
+        mqtt:
     edgehub:
       url: https://dev-westus2-cp101.azcp.horizon.omnissa.com
   - env: stress1b-westus2-cp102
@@ -247,14 +247,14 @@ dev:
     description: Stress
     azure-reion: West US 2
     primary:
-    portal-url: [] 
+    portal-url: []
     hdc:
       url: https://stress1b-westus2-cp102.azcp.horizon.omnissa.com/
       mqtt: null
-    regions: 
+    regions:
       - name: westus2-cp102a
         url: https://stress1b-westus2-cp102a.azcp.horizon.omnissa.com/
-        mqtt: 
+        mqtt:
       - name: westus2-cp102b
         url: https://stress1b-westus2-cp102b.azcp.horizon.omnissa.com/
         mqtt:
@@ -265,14 +265,14 @@ dev:
     description: Service Gateway master
     azure-reion: West US 2
     primary:
-    portal-url: [] 
+    portal-url: []
     hdc:
       url: https://horizonv2-sg.devframe.cp.horizon.omnissa.com/
-      mqtt: 
-    regions: 
+      mqtt:
+    regions:
       - name: westus2
         url: https://horizonv2-sg.devframe.cp.horizon.omnissa.com/
-        mqtt: 
+        mqtt:
     edgehub:
       url: https://horizonv2-em.devframe.cp.horizon.omnissa.com/
   - env: hm-master
@@ -280,13 +280,13 @@ dev:
     description: horizonv2-monitoring master stack
     azure-reion: West US 2
     primary:
-    portal-url: [] 
+    portal-url: []
     hdc:
       url: https://horizonv2-monitoring.devframe.cp.horizon.omnissa.com/
-    regions: 
+    regions:
       - name: westus2
         url: https://horizonv2-monitoring.devframe.cp.horizon.omnissa.com/
-        mqtt: 
+        mqtt:
     edgehub:
       url: https://horizonv2-em.devframe.cp.horizon.omnissa.com/
 

hcs_cli/main.py

@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-
 import logging
 import os
 import os.path as path
@@ -65,7 +64,6 @@ CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
 @click.option("--no-upgrade-check", is_flag=True, default=False, help="Check new version of HCS CLI.")
 @click.option("--no-telemetry", is_flag=True, default=False, help="Disable telemetry collection")
 def cli(profile: str, no_upgrade_check: bool, no_telemetry: bool, **kwargs):
-
     if not no_upgrade_check:
         _check_upgrade()