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

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,39 +75,39 @@ 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
 
     vms = []
     if template_id and template_id.lower() == "all":
-
         cloud = _to_lower(cloud)
 
         def to_search_condition(values):
@@ -179,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/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()