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

hcs_cli/__init__.py

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

hcs_cli/cmds/dev/fs/provided_files/mqtt-secret.yaml

@@ -75,7 +75,7 @@ stringData:
     JcSvTMU2HOuQ/q6vFZq3PRbvroMeXlw2WJrqO3vu04SZwYiP8dcrlHTXQJh+Mp9T
     mQ==
     -----END CERTIFICATE-----
-    mqtt.ca-key: |-
+  mqtt.ca-key: |-
     -----BEGIN PRIVATE KEY-----
     MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDUNJx2Cf0noNHc
     DXB9AFPSFMkkpwxb0wtqaCLiB7v5zkF7CVBl5LnecVk7CM8bJY62H90Lv8Zv/2sl
@@ -104,7 +104,7 @@ stringData:
     boPQ+RK1VKj5UFkUKz5LiohLmCBEQ7sh1HBS2Vje8MFtg0P138sRlbMCvdAEARTZ
     uQfAKLns7QFf9W1C60AVAQ==
     -----END PRIVATE KEY-----
-    mqtt.client-cert: |-
+  mqtt.client-cert: |-
     -----BEGIN CERTIFICATE-----
     MIIFKDCCAxCgAwIBAgIFALjj4O4wDQYJKoZIhvcNAQELBQAwdTELMAkGA1UEBhMC
     VVMxCzAJBgNVBAgMAkNBMR8wHQYDVQQKDBZIb3Jpem9uIENsb3VkIFNlcnZpY2Vz
@@ -204,7 +204,7 @@ stringData:
     JcSvTMU2HOuQ/q6vFZq3PRbvroMeXlw2WJrqO3vu04SZwYiP8dcrlHTXQJh+Mp9T
     mQ==
     -----END CERTIFICATE-----
-    mqtt.client-key: |-
+  mqtt.client-key: |-
     -----BEGIN PRIVATE KEY-----
     MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC40aC4pyy0+++D
     kD1cPRsMWO4ANZ8L4LaaHcg/e/1NbiExd/QlZESNJnnIyD29qY1h9WGEVDHtInsl

hcs_cli/cmds/hoc/stats.py

@@ -1,6 +1,8 @@
 import click
-import time
+import datetime
 import json
+import time
+
 from hcs_cli.service.hoc import diagnostic
 from hcs_cli.service import tsctl
 
@@ -22,25 +24,49 @@ def aggregate_connects(from_: int, to: int, wait: bool, verbose: bool):
         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
+        wait_for_task(result)
+
+
+@click.command(name="stats-aggregate-connects-day-before")
+@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_day_before(wait: bool, verbose: bool):
+    dt = datetime.datetime.utcnow().replace(hour=0, minute=0, second=0, microsecond=0)
+    dt_2_days_ago = dt - datetime.timedelta(days=2)
+    dt_1_day_ago = dt - datetime.timedelta(days=1)
+
+    print(f"Aggregating connect events from {dt_2_days_ago} to {dt_1_day_ago}")
+    from_ = int(dt_2_days_ago.timestamp())
+    to = int(dt_1_day_ago.timestamp())
+    payload = {"from": from_, "to": to}
+    result = diagnostic.aggregateConnects(payload, verbose=verbose)
+    click.echo(result)
+    if not result:
+        return "", 1
+    if wait:
+        wait_for_task(result)
+
+
+def wait_for_task(result: dict):
+    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/cmds/task.py

@@ -222,6 +222,7 @@ def use(namespace: str, group: str, smart_path: str, reset: bool, **kwargs):
     required=False,
     help="Filter tasks by state, for one-time tasks only. Comma separated values. E.g. Init,Running,Canceled,Error,Success",
 )
+@click.option("--v1", is_flag=True, default=False, required=False, help="Use v1 task API.")
 @click.option("--v1log", is_flag=True, default=False, required=False, help="Fetch last log for v1 tasks.")
 @cli.limit
 @cli.search

hcs_cli/payload/lcm/azure-dummy.json

@@ -62,6 +62,7 @@
   "properties": {
     "azureCreateResourceGroup": true,
     "new-task-engine": true,
-    "simulateAgentStatus": "AVAILABLE"
+    "simulateAgentStatus": "AVAILABLE",
+    "countinuousErrorThreshold": 3
   }
 }

hcs_cli/payload/lcm/zero.json

@@ -56,8 +56,9 @@
     }
   },
   "properties": {
-    "new-task-engine": false,
+    "new-task-engine": true,
     "sg-lcm-enforced-provision": true,
-    "autonomous": true
+    "autonomous": true,
+    "countinuousErrorThreshold": 2
   }
 }

{hcs_cli-0.1.320.dist-info → hcs_cli-0.1.321.dist-info}/METADATA

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

{hcs_cli-0.1.320.dist-info → hcs_cli-0.1.321.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hcs_cli/__init__.py,sha256=KGt1FSybqqR9F0iFShUwDeQvzuouHTYizbwM6AZbN64,72
+hcs_cli/__init__.py,sha256=dX6e1kri6Gcqjvlr5u1l5USUlOgjbOKPHS5vP_FG78Y,72
 hcs_cli/__main__.py,sha256=lwPXLjh1OpOs4doVLJJ6_3XHtC-VqDOXiw45hvAQorM,684
 hcs_cli/main.py,sha256=0NmRcidxNxtJatS_prEKQ4_6bqu-l8UkLhAPOXW3uyc,3537
 hcs_cli/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,7 +7,7 @@ hcs_cli/cmds/inspect.py,sha256=QBhBOkf2mHlGhgAhY9FXCfvViL2p4D3BudoKjyADdfE,659
 hcs_cli/cmds/login.py,sha256=dj42jDrKktt4bUqSD0Xj6Jo9ZSI7M9v9R280YavWpuc,11165
 hcs_cli/cmds/logout.py,sha256=BxU-K1cIkdBpAAp6SGuwEqECL6g20l9CqEcSX-3pZag,744
 hcs_cli/cmds/query.py,sha256=hh1TVeSkvRiB07fqIA3GGpEBtP3XMz5XCmAGTXD7FOM,9302
-hcs_cli/cmds/task.py,sha256=7w54riLLH-RFiqd-jeDNUsB9pSY3BtrWYD9AJMlD5-g,19472
+hcs_cli/cmds/task.py,sha256=YIZUjDzHZaNCbmAt589Nzp8s7NMsBI7w_a33l109iy8,19564
 hcs_cli/cmds/test.py,sha256=Kkpe3wV3ViRRAKeMO5IBwjTysEsKzZXP46OXNb-GhxE,1309
 hcs_cli/cmds/upgrade.py,sha256=iJYSyxyNBhiss0u605nD6jpYUdoDhjfIeJP98zSeDf4,931
 hcs_cli/cmds/ad/__init__.py,sha256=wC4uftNZRN3bo9SrRHNNE1tzE0x3B1mCXcIzARm73gI,636
@@ -89,7 +89,7 @@ hcs_cli/cmds/dev/fs/provided_files/__init__.py,sha256=AC-hl0F-5R4V2uejk5FzFDlvT7
 hcs_cli/cmds/dev/fs/provided_files/akka.plan.yml,sha256=IBBuxU-oxiFfEMhpOB7uK9IMoHsRVwlcnKwPPfbPnyw,12486
 hcs_cli/cmds/dev/fs/provided_files/azsim.plan.yml,sha256=rnjNWSnhaYr19tlKoxGjvKTlhs2pYA2NRC-dC3kIzYE,17220
 hcs_cli/cmds/dev/fs/provided_files/azure.plan.yml,sha256=4-ghUgskCyeM-G0kvWb_AW1ywlN9wKN_kC3XSWfryY8,31561
-hcs_cli/cmds/dev/fs/provided_files/mqtt-secret.yaml,sha256=46O-pJOKhJ5LyPFw6wiqWEFmRrv_9JwTKQPxmbq2Ro4,14945
+hcs_cli/cmds/dev/fs/provided_files/mqtt-secret.yaml,sha256=lJI6N4e3ogiZ9BpyjWUHqj3KfbGs7WUdYuaPt1D8TLw,14939
 hcs_cli/cmds/dev/fs/provided_files/mqtt-server-external.yaml,sha256=gtYLY9pgMCeJthYmTXrLjd3xITf4b2keesyQ8VBAar8,612
 hcs_cli/cmds/dev/fs/provided_files/patch-mqtt-hostname.yml,sha256=YuwUPj5QtZo1dKOqNsh72EVXdVBxr2ZQBcW4gyX0agY,212
 hcs_cli/cmds/dev/fs/provided_files/patch-vernemq-ssl-depth.json,sha256=jDuQLeen8aJ656gfJhk16aGyUCbOLt7VJq9AuUezNE4,441
@@ -116,7 +116,7 @@ hcs_cli/cmds/hoc/connect.py,sha256=GvXfbB1JhAZRnl1_H1oxCAhAMCP9jtJgAlhVy9ggYNc,5
 hcs_cli/cmds/hoc/oncall.py,sha256=yc7s94Ti21QDm6WZAbuzB21GsGwced5jLrfmvkV8J2c,575
 hcs_cli/cmds/hoc/org.py,sha256=fi2rjO4hLuJuLSinWG3s8-dTdAj9EIrIFcN82LM8mtI,570
 hcs_cli/cmds/hoc/search.py,sha256=yQk1BTp6sSPer8YdCqNd458CpwuJ5PM50_3yjwv8T7g,5447
-hcs_cli/cmds/hoc/stats.py,sha256=dUhTWzj9w2Pwe18Iw5RX4lN6LVG3zgG8fvbwtXQh29s,1794
+hcs_cli/cmds/hoc/stats.py,sha256=QEnAULDIhvsEgMLJg4Ql9cI6wUqd0zQW2QjwBWwXdno,2641
 hcs_cli/cmds/hoc/template.py,sha256=M9bPYDuPfYQjjR8SYS4r4NknckSAfrMJGW6GeczCZvw,574
 hcs_cli/cmds/hoc/vm.py,sha256=YjijTxpSbnUKyCtsc9wIYDYZULM4RKo2JfROdilmNvk,664
 hcs_cli/cmds/hoc/util/__init__.py,sha256=AC-hl0F-5R4V2uejk5FzFDlvT7uKGfjQyWq0quSznQs,14
@@ -317,7 +317,7 @@ hcs_cli/payload/inventory/deassign.json,sha256=evl-Nt-6Sc4Mm-F9YS734H1x0aIrf7N3W
 hcs_cli/payload/iss/__init__.py,sha256=4kFVMPKtDxlxFWs6qXrhBJjgEJesuGTCjBBm2a4JsBM,600
 hcs_cli/payload/lcm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hcs_cli/payload/lcm/akka.json,sha256=_PUNdUO2CFj5AimOWkgc1zvVxy1hrWNq99YHYP3hxhA,673
-hcs_cli/payload/lcm/azure-dummy.json,sha256=OZ1sDNBkKrM7Yve-D_byrzYdFvvsjX3ITLwv9hefDA0,1583
+hcs_cli/payload/lcm/azure-dummy.json,sha256=fu4hSSGBSoKZD6kHPm62TQ3xSTFhCCD7-NRkDMRHTSI,1619
 hcs_cli/payload/lcm/azure-real.json,sha256=QF9TdNKdLQRWjDC610LbU1-DWzxbncTBu0MEUPIiVxI,1561
 hcs_cli/payload/lcm/edge-proxy.json,sha256=PAlwNpkN9HJ-PZ5PEMM8sc_O_eSABcyktAiOoohlTQk,744
 hcs_cli/payload/lcm/zero-dedicated.json,sha256=U8n2KPjPNLMe0ywyfbpu5gRwYI03CexidJrX_gTMCog,782
@@ -330,16 +330,16 @@ hcs_cli/payload/lcm/zero-fail-prepare.json,sha256=p3uVwSGTwXC6iXhsH66fFjiG6vJeK-
 hcs_cli/payload/lcm/zero-fail-vm-onthread.json,sha256=vty-OqyRhtItWNj1opWfQwL5HK75KTmjg0uFxnAF5yk,1307
 hcs_cli/payload/lcm/zero-fail-vm.json,sha256=VSFgt4dAlRu52uz5BZmavvkr1kBarOt2d345AtA00xw,1307
 hcs_cli/payload/lcm/zero-floating.json,sha256=8fO_5C3eNoBlI8RD8cZPP_XB6ZJeyq_U-7Nw8A8bHO0,780
+hcs_cli/payload/lcm/zero-legacy.json,sha256=E3hA0bCnQx29mQQFtjdKuC2R_-IqaPDGItcL6WPugf4,886
 hcs_cli/payload/lcm/zero-manual.json,sha256=SLez__1qO1eMLZW-9GOnxEXTWrfd5TQFmNCb-J9SGEI,741
 hcs_cli/payload/lcm/zero-multisession.json,sha256=OtB7KC5VlrQvWRjtiYQijTwu-jjtoCcaGFQmVBijerM,788
 hcs_cli/payload/lcm/zero-nanw.json,sha256=ALsXhqTeUN8q4xqiDgWk3RiWZXVUVyyrrUj14_lFisE,720
 hcs_cli/payload/lcm/zero-new-5k-delay.json,sha256=UOh6E0FUks6Ozo0EjjhCAjhD7R7gyKdT2sTEhMy9DcY,1571
 hcs_cli/payload/lcm/zero-new-5k.json,sha256=fgiZbLr2cPoLCfLdn2uNFp_GxROHIiadUlbhDqEbESQ,828
 hcs_cli/payload/lcm/zero-new-snapshot.json,sha256=E3hA0bCnQx29mQQFtjdKuC2R_-IqaPDGItcL6WPugf4,886
-hcs_cli/payload/lcm/zero-new.json,sha256=E3hA0bCnQx29mQQFtjdKuC2R_-IqaPDGItcL6WPugf4,886
 hcs_cli/payload/lcm/zero-reuse-vm-id.json,sha256=WWbPUijukAaS1ADz8AnEhU5U0s6qKUdbBU1v29HbhS4,716
 hcs_cli/payload/lcm/zero-with-max-id-offset.json,sha256=fo6JO-QHV7ln8rKswhhLZ67v_9skeW1HwZXgaNzPsuc,698
-hcs_cli/payload/lcm/zero.json,sha256=RF6pjji0RGjp85UJ32PXrqC3_b8yPPFA1LCiqNAztY0,1353
+hcs_cli/payload/lcm/zero.json,sha256=sS5X5FPkU0mSO-PeGPcJobFoxtC2FJFznqPuXq6ZmW4,1388
 hcs_cli/payload/provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hcs_cli/payload/provider/ad-stes-vsphere.json,sha256=GgjpDxQY4X_fQNY46-fls0248nuhEgPu6qOcA9MbI0Y,717
 hcs_cli/payload/provider/akka.json,sha256=pKRZT9aOx0irx-28iUFNNwdQ-s1sNgVPCMz7RdASKTM,284
@@ -495,7 +495,7 @@ hcs_cli/support/vm_table.py,sha256=hqNUKLVUuBiuDwlqcAQ7uAT1-4z6ZYOIGRcFWn8lnAo,2
 hcs_cli/support/scm/html_util.py,sha256=clgMpM90HxRRs3D9ORYYNB57AYh7y_-UzJrB4KX3dsY,458
 hcs_cli/support/scm/plan-editor.html.template,sha256=qXhHYjBsG8uaVlMkc0gnCePoSV3w5NyTkaLhXV9jlC0,26874
 hcs_cli/support/scm/plan_editor.py,sha256=pZtm9X_R-vs2JxJ_NX7-wTAoY-nhI-gFqhcyVDdEZVM,3108
-hcs_cli-0.1.320.dist-info/METADATA,sha256=e-uiHIvnrihL7rR2qbqQbpO1aZpXIYuZCdrBH5s4dtg,3614
-hcs_cli-0.1.320.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hcs_cli-0.1.320.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
-hcs_cli-0.1.320.dist-info/RECORD,,
+hcs_cli-0.1.321.dist-info/METADATA,sha256=llYPP2ShA7g1sBAPChU2L8BaF62Yq0ozSKHZ0xFVieQ,3614
+hcs_cli-0.1.321.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hcs_cli-0.1.321.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
+hcs_cli-0.1.321.dist-info/RECORD,,