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

hcs_cli/payload/synt/core/p03-dummy-exception.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "exception": "simulated-error"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "exception": "simulated-error"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe03-dummy-exception",
-        "type": "TEST_DUMMY"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe03-dummy-exception",
+    "type": "TEST_DUMMY"
+  }
+}

hcs_cli/payload/synt/core/p04-dummy-success-repeat.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "repeat": "PT2S"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "repeat": "PT2S"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe04-dummy-success-repeat",
-        "type": "TEST_DUMMY"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe04-dummy-success-repeat",
+    "type": "TEST_DUMMY"
+  }
+}

hcs_cli/payload/synt/core/p05-dummy-fail-repeat.json

@@ -1,18 +1,15 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "returnCode": "123",
+      "repeat": "PT2S"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "returnCode": "123",
-            "repeat": "PT2S"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe05-dummy-fail-repeat",
-        "type": "TEST_DUMMY"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe05-dummy-fail-repeat",
+    "type": "TEST_DUMMY"
+  }
+}

hcs_cli/payload/synt/core/p06-dummy-exception-repeat.json

@@ -1,18 +1,15 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "exception": "simulated-error",
+      "repeat": "PT2S"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "exception": "simulated-error",
-            "repeat": "PT2S"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe06-dummy-exception-repeat",
-        "type": "TEST_DUMMY"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe06-dummy-exception-repeat",
+    "type": "TEST_DUMMY"
+  }
+}

hcs_cli/payload/synt/core/p07-dummy-delay.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "delay": "PT5S"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "delay": "PT5S"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe07-dummy-delay",
-        "type": "TEST_DUMMY"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe07-dummy-delay",
+    "type": "TEST_DUMMY"
+  }
+}

hcs_cli/payload/synt/core/p08-dummy-property.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "my-message": "hello"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "my-message": "hello"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe08-dummy-property",
-        "type": "TEST_DUMMY"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe08-dummy-property",
+    "type": "TEST_DUMMY"
+  }
+}

hcs_cli/payload/synt/ext/p20-connect-success.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "www.omnissa.com:443"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "www.omnissa.com:443"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe20-connect-success",
-        "type": "TEST_CONNECT"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe20-connect-success",
+    "type": "TEST_CONNECT"
+  }
+}

hcs_cli/payload/synt/ext/p21-connect-fail.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "www.vmware123456.com:12345"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "www.vmware123456.com:12345"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe21-connect-fail",
-        "type": "TEST_CONNECT"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe21-connect-fail",
+    "type": "TEST_CONNECT"
+  }
+}

hcs_cli/payload/synt/ext/p30-ssl-success.json

@@ -1,18 +1,15 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "https://www.omnissa.com/",
+      "verify_ssl": true
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "https://www.omnissa.com/",
-            "verify_ssl": true
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe30-ssl-success",
-        "type": "TEST_SSL"
-    }
+    "enabled": true,
+    "labels": {},
+    "name": "probe30-ssl-success",
+    "type": "TEST_SSL"
+  }
 }

hcs_cli/payload/synt/ext/p31-ssl-fail.json

@@ -1,18 +1,15 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "https://self-signed.badssl.com/",
+      "verify_ssl": true
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "https://self-signed.badssl.com/",
-            "verify_ssl": true
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe31-ssl-fail",
-        "type": "TEST_SSL"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe31-ssl-fail",
+    "type": "TEST_SSL"
+  }
+}

hcs_cli/payload/synt/ext/p40-http-success.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "https://www.omnissa.com/"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "https://www.omnissa.com/"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe40-http-success",
-        "type": "TEST_HTTP"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe40-http-success",
+    "type": "TEST_HTTP"
+  }
+}

hcs_cli/payload/synt/ext/p41-http-fail.json

@@ -1,17 +1,14 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "https://www.omnissa.com/some-inexist-url"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "https://www.omnissa.com/some-inexist-url"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe41-http-fail",
-        "type": "TEST_HTTP"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe41-http-fail",
+    "type": "TEST_HTTP"
+  }
+}

hcs_cli/payload/synt/ext/p42-http-status-code.json

@@ -1,21 +1,15 @@
 {
-    "alertPolicy": {},
-    "notificationConfig": {},
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "https://www.omnissa.com/some-inexist-url",
-            "expected_status_codes": [
-                404,
-                403,
-                202,
-                200,
-                301
-            ]
-        },
-        "enabled": true,
-        "labels": {},
-        "name": "probe42-http-status-code",
-        "type": "TEST_HTTP"
-    }
-}
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "https://www.omnissa.com/some-inexist-url",
+      "expected_status_codes": [404, 403, 202, 200, 301]
+    },
+    "enabled": true,
+    "labels": {},
+    "name": "probe42-http-status-code",
+    "type": "TEST_HTTP"
+  }
+}

hcs_cli/payload/synt/ext1/p10-ping-success.json

@@ -1,18 +1,15 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "localhost",
+      "count": 1
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "localhost",
-            "count": 1
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe10-ping-success",
-        "type": "TEST_PING"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe10-ping-success",
+    "type": "TEST_PING"
+  }
+}

hcs_cli/payload/synt/ext1/p11-ping-fail.json

@@ -1,18 +1,15 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "127.0.0.333",
+      "count": 1
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "127.0.0.333",
-            "count": 1
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe11-ping-fail",
-        "type": "TEST_PING"
-    }
+    "enabled": true,
+    "labels": {},
+    "name": "probe11-ping-fail",
+    "type": "TEST_PING"
+  }
 }

hcs_cli/payload/synt/ext1/p12-ping-success-repeat.json

@@ -1,19 +1,16 @@
 {
-    "alertPolicy": {
+  "alertPolicy": {},
+  "notificationConfig": {},
+  "outpostIds": [],
+  "testConfig": {
+    "data": {
+      "target": "localhost",
+      "count": 1,
+      "repeat": "PT2S"
     },
-    "notificationConfig": {
-    },
-    "outpostIds": [],
-    "testConfig": {
-        "data": {
-            "target": "localhost",
-            "count": 1,
-            "repeat": "PT2S"
-        },
-        "enabled": true,
-        "labels": {
-        },
-        "name": "probe12-ping-success-repeat",
-        "type": "TEST_PING"
-    }
-}
+    "enabled": true,
+    "labels": {},
+    "name": "probe12-ping-success-repeat",
+    "type": "TEST_PING"
+  }
+}

hcs_cli/provider/hcs/cert.py

@@ -22,7 +22,6 @@ from hcs_core.util import pki_util
 
 
 def deploy(data: dict, state: dict, save_state) -> dict:
-
     cn = data["cn"]
 
     temp_dir = tempfile.gettempdir()

hcs_cli/provider/hcs/edge.py

@@ -150,7 +150,7 @@ def refresh(data: dict, state: dict) -> dict:
         if id:
             edge = admin.edge.get(id, org_id)
     if not edge:
-        edges = admin.edge.list(org_id, search=f'name $eq {data["name"]}')
+        edges = admin.edge.list(org_id, search=f"name $eq {data['name']}")
         if edges:
             edge = edges[0]
 

hcs_cli/provider/hcs/uag.py

@@ -26,6 +26,11 @@ def deploy(data: dict, state: dict, save_state) -> dict:
     else:
         deployment = state
     id = deployment["id"]
+
+    _wait = data.get("_wait", True)
+    if not _wait:
+        return deployment
+
     try:
         deployment = admin.uag.wait_for_ready(id, org_id, "10m")
     except Exception as e:
@@ -43,7 +48,7 @@ def refresh(data: dict, state: dict) -> dict:
             ret = admin.uag.get(id, org_id)
             if ret:
                 return ret
-    search = f'name $eq {data["name"]}'
+    search = f"name $eq {data['name']}"
     uags = admin.uag.list(org_id, search=search)
     if uags:
         return uags[0]

hcs_cli/service/hoc/diagnostic.py

@@ -11,13 +11,11 @@ _client = hdc_service_client("hoc-diagnostic")
 
 
 def search(payload: dict, size: int = 100):
-
     pointer_timestamp = timeutil.iso_date_to_timestamp(payload["from"])
     end_timestamp = timeutil.iso_date_to_timestamp(payload["to"])
 
     count = 0
     while pointer_timestamp < end_timestamp and count < size:
-
         payload["from"] = timeutil.timestamp_to_iso_date(pointer_timestamp)
         # log.info(f"range: from={payload['from']}, to={payload['to']}")
 
@@ -33,7 +31,6 @@ def search(payload: dict, size: int = 100):
 
         # _old = count
         for item in page:
-
             data = item["data"]
 
             count += 1

hcs_cli/service/inventory/__init__.py

@@ -1,2 +1,2 @@
-from .session import assign, deassign, logoff, sessions
+from .session import assign, assignV2, create_manual_session, deassign, logoff, logoffV2, sessions, update_session
 from .vm import count, get, list, raw_list, update

hcs_cli/service/inventory/session.py

@@ -28,22 +28,38 @@ def sessions(template_id: str, vm_id: str, org_id: str, **kwargs):
 
 
 def assign(payload):
-    # https://horizonv2-sg.devframe.cp.horizon.vmware.com/inventory/swagger-ui/#/Inventory/assign
+    # https://horizonv2-sg.devframe.cp.horizon.omnissa.com/inventory/swagger-ui/#/Inventory/assign
     url = "/v1/assign"
     return _client.post(url, payload)
 
 
 def assignV2(payload):
-    # https://horizonv2-sg.devframe.cp.horizon.vmware.com/inventory/swagger-ui/#/Inventory/assign
+    # https://horizonv2-sg.devframe.cp.horizon.omnissa.com/inventory/swagger-ui/#/Inventory/assign
     url = "/v2/assign"
     return _client.post(url, payload)
 
 
-def deassign(payload):
-    # https://horizonv2-sg.devframe.cp.horizon.vmware.com/inventory/swagger-ui/#/Inventory/deassign
-    url = "/v1/deassign"
+def deassign(template_id: str, org_id: str, payload):
+    # https://horizonv2-sg.devframe.cp.horizon.omnissa.com/inventory/swagger-ui/#/Inventory/deassign
+    url = f"/v1/{template_id}/deassign?org_id={org_id}"
     return _client.post(url, payload)
 
 
-def logoff(template_id: str, vm_id: str, org_id: str):
-    return "TODO: hcs_cli.service.inventory.logoff"
+def logoff(template_id: str, org_id: str, payload: dict):
+    url = f"/v1/{template_id}/logoff?org_id={org_id}"
+    return _client.post(url, payload)
+
+
+def logoffV2(org_id: str, payload: dict):
+    url = f"/v2/logoff?org_id={org_id}"
+    return _client.post(url, payload)
+
+
+def update_session(org_id: str, template_id: str, payload: dict):
+    url = f"/v1/{template_id}/sessionUpdate?org_id={org_id}"
+    return _client.post(url, payload)
+
+
+def create_manual_session(org_id: str, template_id: str, edge_id: str, payload: dict):
+    url = f"/v1/{template_id}/session?org_id={org_id}&edge_id={edge_id}"
+    return _client.post(url, payload)

hcs_cli/service/lcm/vm.py

@@ -102,7 +102,6 @@ def wait_for(
 
 
 def wait_for_deleted(template_id: str, vm_id: str, org_id: str, timeout: str):
-
     name = f"{template_id}/{vm_id}"
 
     def fn_get():

hcs_cli/service/task.py

@@ -114,7 +114,6 @@ _scm_client = hdc_service_client("scm")
 
 
 def query(namespace: str, fn_filter: Callable = None, **kwargs) -> List[TaskModel]:
-
     kwargs["size"] = kwargs.get("size", 50)
 
     def _get_page(query_string):

hcs_cli/support/debug_util.py

@@ -44,7 +44,6 @@ def restart_service(service_name: str, old_pod_id: str):
 
 
 def kubectl_patch(service_name: str, patch_params: list):
-
     service_full_name = get_service_full_name(service_name)
     # Formulate the Kubernetes patch command
     patch_command = ["kubectl", "patch", service_full_name] + patch_params

hcs_cli/support/plan_util.py

@@ -22,7 +22,6 @@ from hcs_core.plan import PlanException
 
 
 def load_plan(file):
-
     if not file:
         file = _try_locating_plan_file()
     else: