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

hcs_cli/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.317"
+__version__ = "0.1.319"
 
 from . import service

hcs_cli/cmds/advisor/html_utils.py

@@ -131,10 +131,10 @@ def prepare_vm_utilization_chart_data(template_info: dict) -> dict:
             utilized_capacity.append(0)
 
         start_date = datetime.fromtimestamp(start_timestamp / 1000)
-        x_axis = [start_date + timedelta(minutes=(timeslot_ms / (1000 * 60)) * i) for i in range(data_length)]
+        x_axis_dt = [start_date + timedelta(minutes=(timeslot_ms / (1000 * 60)) * i) for i in range(data_length)]
 
         # Convert datetime objects to formatted strings for ECharts
-        x_axis = [dt.strftime("%Y-%m-%d %H:%M") for dt in x_axis]
+        x_axis = [dt.strftime("%Y-%m-%d %H:%M") for dt in x_axis_dt]
     else:
         x_axis = []
         provisioned_vms = []
@@ -287,7 +287,7 @@ def _get_pool_html_template(
                 itemStyle: {{
                     color: '#007acc'
                  }},
-                data: {chart_data['provisioned_vms']}
+                data: {chart_data["provisioned_vms"]}
             }},
             {{
                 name: 'Powered-on VMs',
@@ -303,7 +303,7 @@ def _get_pool_html_template(
                 itemStyle: {{
                     color: '#dc3545'
                 }},
-                data: {chart_data['powered_on_vms']}
+                data: {chart_data["powered_on_vms"]}
             }},
             {{
                 name: 'Utilized Capacity',
@@ -319,7 +319,7 @@ def _get_pool_html_template(
                 itemStyle: {{
                     color: '#28a745'
                 }},
-                data: {chart_data['utilized_capacity']}
+                data: {chart_data["utilized_capacity"]}
             }}
         """
     else:  # line chart
@@ -332,7 +332,7 @@ def _get_pool_html_template(
                     focus: 'series'
                 }},
                 color: '#007acc',
-                data: {chart_data['provisioned_vms']}
+                data: {chart_data["provisioned_vms"]}
             }},
             {{
                 name: 'Powered-on VMs',
@@ -342,7 +342,7 @@ def _get_pool_html_template(
                     focus: 'series'
                 }},
                 color: '#dc3545',
-                data: {chart_data['powered_on_vms']}
+                data: {chart_data["powered_on_vms"]}
             }},
             {{
                 name: 'Utilized Capacity',
@@ -352,7 +352,7 @@ def _get_pool_html_template(
                     focus: 'series'
                 }},
                 color: '#28a745',
-                data: {chart_data['utilized_capacity']}
+                data: {chart_data["utilized_capacity"]}
             }}
         """
 
@@ -557,19 +557,21 @@ def _get_pool_html_template(
 </html>
 """
 
-    return yumako.template.replace(
-        template,
-        {
-            "org_name": org_name,
-            "resource_type": resource_type,
-            "resource_id": resource_id,
-            "generation_date": generation_date,
-            "summary_html": summary_html,
-            "usage_table_html": usage_table_html,
-            "recommendations_html": recommendations_html,
-            "x_axis_data": chart_data["x_axis"],
-            "chart_series_data": chart_series,
-        },
+    return str(
+        yumako.template.replace(
+            template,
+            {
+                "org_name": org_name,
+                "resource_type": resource_type,
+                "resource_id": resource_id,
+                "generation_date": generation_date,
+                "summary_html": summary_html,
+                "usage_table_html": usage_table_html,
+                "recommendations_html": recommendations_html,
+                "x_axis_data": chart_data["x_axis"],
+                "chart_series_data": chart_series,
+            },
+        )
     )
 
 
@@ -600,8 +602,8 @@ def _get_org_html_template(org_name: str, generation_date: str, all_recommendati
             recommended_settings = json.dumps(rec["recommended_settings"], indent=2)
             recommendations_html += f"""
                 <tr>
-                    <td>{rec['action']}</td>
-                    <td>{rec['justification']}</td>
+                    <td>{rec["action"]}</td>
+                    <td>{rec["justification"]}</td>
                     <td><pre>{current_settings}</pre></td>
                     <td><pre>{recommended_settings}</pre></td>
                 </tr>
@@ -709,7 +711,9 @@ def _get_org_html_template(org_name: str, generation_date: str, all_recommendati
 </html>
 """
 
-    return yumako.template.replace(
-        template,
-        {"org_name": org_name, "generation_date": generation_date, "recommendations_html": recommendations_html},
+    return str(
+        yumako.template.replace(
+            template,
+            {"org_name": org_name, "generation_date": generation_date, "recommendations_html": recommendations_html},
+        )
     )

hcs_cli/cmds/advisor/recommendation_engine.py

@@ -1,8 +1,6 @@
 """
 Copyright © 2025 Omnissa, LLC.
-"""
 
-"""
 Recommendation engine for generating recommendations for advisor reports.
 """
 
@@ -137,7 +135,7 @@ def calculate_observation_period_days(template_info: dict) -> float:
         observation_hours = (data_length_after_cutoff * timeslot_ms) / (1000 * 60 * 60)
         observation_days = observation_hours / 24
 
-        return max(1.0, observation_days)  # Minimum 1 day
+        return float(max(1.0, observation_days))  # Minimum 1 day
     except Exception:
         return 30.0  # Default to 30 days
 
@@ -259,7 +257,7 @@ def calculate_peak_utilized_capacity(template_info: dict) -> int:
         else:
             peak_capacity = peak_sessions
 
-        return peak_capacity
+        return int(peak_capacity)
     except Exception:
         return 0
 
@@ -377,7 +375,7 @@ def estimate_cost_savings_max_vms_reduction(old_max_vms: int, new_max_vms: int,
         # Total savings = VM savings + disk savings
         total_savings = vm_savings + disk_savings
 
-        return round(total_savings, 2)
+        return float(round(total_savings, 2))
     except Exception:
         return 0.0
 
@@ -478,7 +476,7 @@ def calculate_scheduled_powered_on_hours(template_info: dict, power_schedules: l
         # Calculate total powered-on hours during scheduled periods
         total_scheduled_hours = sum(scheduled_powered_on) * timeslot_hours
 
-        return total_scheduled_hours
+        return float(total_scheduled_hours)
 
     except Exception as e:
         print(f"Warning: Error calculating scheduled powered-on hours: {str(e)}")
@@ -658,7 +656,7 @@ def estimate_cost_savings_min_available_vms(old_min: float, new_min: float, temp
 
         # Calculate savings
         savings = limit * (old_min - new_min) * config.HOURS_PER_MONTH * vm_cost_per_hour
-        return round(savings, 2)
+        return float(round(savings, 2))
     except Exception:
         return 0.0
 
@@ -1067,7 +1065,7 @@ def calculate_schedule_resource_utilization(template_info: dict, power_schedules
         # Calculate utilization percentage
         if scheduled_allocated_hours > 0:
             utilization = (scheduled_utilized_hours / scheduled_allocated_hours) * 100
-            return max(0.0, utilization)
+            return float(max(0.0, utilization))
 
         return 0.0
 
@@ -1088,7 +1086,6 @@ def _is_within_scheduled_period(point_datetime, power_schedules):
         bool: True if point falls within any scheduled period
     """
     try:
-
         # Get day of week (0=Monday, 6=Sunday)
         day_of_week = point_datetime.weekday()
         # Convert to our bit mask format (0=Monday, 6=Sunday)
@@ -1486,7 +1483,7 @@ def is_all_at_once_provisioning(template_info: dict) -> bool:
         min_vms = spare_policy.get("min", 0)
 
         # "All at once" if limit == max == min
-        return limit > 0 and limit == max_vms and max_vms == min_vms
+        return bool(limit > 0 and limit == max_vms and max_vms == min_vms)
     except Exception:
         return False
 

hcs_cli/cmds/api.py

@@ -134,13 +134,14 @@ def api(
             f"Method {method} does not support request body. Use --data or --json or STDIN only with POST, PUT, or PATCH methods."
         )
 
-    if path.startswith(profile.current().hcs.url):
-        path = path[len(profile.current().hcs.url) :]
+    hcs_url = profile.current().hcs.url
+    if path.startswith(hcs_url):
+        path = path[len(hcs_url) :]
         if not path.startswith("/"):
             path = "/" + path
 
     if not path.startswith("/"):
-        raise click.UsageError("Path must start with a '/'. Please provide a valid context path.")
+        raise click.UsageError("Path must start with a '/'. Please provide a valid context path. Provided path=" + path)
 
     service_path = path.split("/")[1]
     api_path = path[len(service_path) + 1 :]
@@ -155,6 +156,7 @@ def api(
         headers = None
 
     # print( f"{method} {api_path} text={raw_data} json={json_data}" )
+
     if method == "GET":
         if all_pages:
 

hcs_cli/cmds/daas/tenant/plan.py

@@ -90,7 +90,7 @@ def _select_order_type(var: dict):
     def fn_get_text(order_type: str):
         o = orders[order_type]
         num_apps = len(o["application"]["info"])
-        desc = f'{o["template"]["type"]}/{o["image"]["os"]},{o["image"]["gen"]}, apps: {num_apps}'
+        desc = f"{o['template']['type']}/{o['image']['os']},{o['image']['gen']}, apps: {num_apps}"
         ret = f"{order_type} ({desc})"
         return ret
 

hcs_cli/cmds/debug/start.py

@@ -52,15 +52,14 @@ def start(service: str, skip: bool, force: bool, **kwargs):
 
 def pod_forwarding(pod_id):
     print("Start forwarding pod")
-    pod_forwarding_command = f"kubectl port-forward {pod_id} 10762:10762"
+    pod_forwarding_command = f"kubectl port-forward {pod_id} 5005:5005"
     global _forwarding_process
     _forwarding_process = subprocess.Popen(shlex.split(pod_forwarding_command), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     print("Started forwarding pod. pid:", _forwarding_process.pid)
 
 
 def run_with_debug(pod_id):
-
-    run_app_command = f"kubectl exec -it {pod_id} -c app -- /bin/bash -c 'java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=10762 -jar app.jar'"
+    run_app_command = f"kubectl exec -it {pod_id} -c app -- /bin/bash -c 'java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar app.jar'"
 
     # Execute the command
     process = subprocess.Popen(shlex.split(run_app_command), stdout=subprocess.PIPE, stderr=subprocess.PIPE)

hcs_cli/cmds/dev/fs/helper/credential_helper.py

@@ -12,6 +12,8 @@ def _get_application_properties_from_configmap(configmap_name: str):
         log.warn(f"ConfigMap {configmap_name} not found.")
         return {}
     app_properties_text = config["data"].get("application.properties")
+    if app_properties_text is None:
+        app_properties_text = config["data"].get("application-group.properties")
     if app_properties_text is not None:
         lines = app_properties_text.split("\n")
         app_properties = {}

hcs_cli/cmds/dev/fs/helper/k8s_util.py

@@ -35,7 +35,6 @@ def kubectl(command: str, ignore_error: bool = False, get_json: bool = False, in
 
 
 def validate_kubeconfig(fs_name: str, try_default_config: bool = True, raise_on_error: bool = True):
-
     if os.path.exists(_fs_kubeconfig):
         log.info("Using feature stack kubeconfig: " + _fs_kubeconfig)
         global _kubectl_command

hcs_cli/cmds/dev/fs/helper/license_info.py

@@ -74,18 +74,42 @@ def createLicenseFeatures():
     log.trivial("Creating license features record for csp org id {}".format(org_id))
     client_id = os.environ.get("CSP_LICENSE_SVC_CLIENT_ID")
     client_secret = os.environ.get("CSP_LICENSE_SVC_CLIENT_SECRET")
-    if not client_id:
-        print("Using admin service credentials from current profile...")  # which has service permission
-        client_id = current_profile.override["admin"]["client-id"]
-        client_secret = current_profile.override["admin"]["client-secret"]
-    client = hcs_client(
-        current_profile.hcs.url,
-        {
-            "url": current_profile.csp.url,
-            "client_id": client_id,
-            "client_secret": client_secret,
-        },
-    )
+    while True:
+        if client_id:
+            log.trivial("Using credentials from env CSP_LICENSE_SVC_CLIENT_ID")
+            break
+        override = current_profile.override
+        if override:
+            license_service_override = current_profile.override.get("license-features")
+            if license_service_override:
+                log.trivial("Using license-features service override from current profile...")
+                client_id = license_service_override["client-id"]
+                client_secret = license_service_override["client-secret"]
+                break
+
+            admin_override = current_profile.override.get("admin")
+            if admin_override:
+                log.trivial("Using admin service override from current profile...")
+                client_id = current_profile.override["admin"]["client-id"]
+                client_secret = current_profile.override["admin"]["client-secret"]
+                break
+
+        log.warn("No admin override found in current profile. Using default credentials.")
+        client_id = None
+        break
+
+    if client_id:
+        client = hcs_client(
+            current_profile.hcs.url,
+            {
+                "url": current_profile.csp.url,
+                "client_id": client_id,
+                "client_secret": client_secret,
+            },
+        )
+    else:
+        # default profile
+        client = hcs_client(url=current_profile.hcs.url, custom_auth=current_profile.csp)
     response_data = client.post("/license-features/v1/licenses", json=data)
     log.good(f"Successfully created license-features: {response_data}")
 

hcs_cli/cmds/dev/fs/init.py

@@ -17,6 +17,7 @@ import inspect
 import json
 import os
 import re
+import tempfile
 import shutil
 import subprocess
 import time
@@ -25,6 +26,7 @@ from pathlib import Path
 
 import click
 import hcs_core.sglib.cli_options as cli
+import yaml
 from dotenv import load_dotenv
 from hcs_core.ctxp import context, profile
 from hcs_core.ctxp.util import error_details
@@ -290,8 +292,34 @@ def _create_infra_azure(fs_name):
 
 @step
 def _create_infra_azsim():
-    azusim_plan_path = _resolve_bundled_file_path("provided_files/azsim.plan.yml")
-    ret = run_cli("hcs plan apply -f " + azusim_plan_path, raise_on_error=False)
+    import requests
+
+    # Fetch credentials from simhub
+    SIMHUB_URL = "https://simhub.steslabs.net/subscription"
+    try:
+        resp = requests.get(SIMHUB_URL)
+        resp.raise_for_status()
+        creds = resp.json()
+    except Exception as e:
+        log.warn(f"Failed to fetch simhub credentials: {e}")
+        return
+    log.info(f"Azure Simulator credentials fetched from simhub: {creds}")
+    # Read the plan template
+    plan_template_path = _resolve_bundled_file_path("provided_files/azsim.plan.yml")
+    with open(plan_template_path, "r") as f:
+        plan = yaml.safe_load(f)
+
+    # Overwrite provider values
+    plan["var"]["provider"]["subscriptionId"] = creds["subscriptionId"]
+
+    # Write to a temp file
+    tmp = tempfile.NamedTemporaryFile(delete=False, suffix=".yml", mode="w")
+    yaml.dump(plan, tmp)
+    tmp.close()
+    dynamic_plan_path = tmp.name
+
+    # Apply the plan
+    ret = run_cli("hcs plan apply -f " + dynamic_plan_path, raise_on_error=False)
     if ret.returncode == 0:
         log.good("Azure simulator infrastructure set up.")
     else:
@@ -469,8 +497,8 @@ def _write_env_file(data, props, env_file):
         for key, value in data.items():
             if key not in ignore_keys:
                 f.write(f"{to_env_key(key)}={value}\n")
-        config_block = f"""HCS_CLIENT_ID={props['csp.service.app.client_id']}
-        HCS_CLIENT_SECRET={props['csp.service.app.client_secret']}
+        config_block = f"""HCS_CLIENT_ID={props["csp.service.app.client_id"]}
+        HCS_CLIENT_SECRET={props["csp.service.app.client_secret"]}
         IDP_TENANT_DOMAIN=test-sanity-domain
         UAG_FQDN=myuag.fqdn
         DESKTOP_SUBNET_CIDR=10.76.0.0/16
@@ -1016,12 +1044,17 @@ def _create_idp():
             log.good("IDP set up.")
         except Exception as e:
             print(e)
-            fail("IDP credentials require 2FA which is currently not supported. Please manually set up your IDP in Astro.")
+            fail(
+                "IDP credentials require 2FA, which is currently not supported via API calls. Please manually set up "
+                "your IDP in Astro. Once you have completed set up, re-run the 'hcs dev fs init' command skipping the"
+                "Common Init step."
+            )
 
 
 @step
 def _restart_services():
     kubectl("rollout restart deployment portal-deployment", ignore_error=True)
+    kubectl("rollout restart deployment infra-vsphere-twin-deployment", ignore_error=True)
     kubectl("rollout restart statefulset vmhub-statefulset", ignore_error=True)
     kubectl("rollout restart statefulset connection-service-statefulset", ignore_error=True)
     kubectl("rollout restart statefulset clouddriver-statefulset", ignore_error=True)

hcs_cli/cmds/dev/fs/profiler.py

@@ -65,7 +65,6 @@ def _run_mongo_commands(command: str):
 
 
 def _enable_mongo_profiler():
-
     mongo_commands = """
 use app
 db.setProfilingLevel(0)