hcs-cli 0.1.320__tar.gz → 0.1.321__tar.gz

{hcs_cli-0.1.320 → hcs_cli-0.1.321}/PKG-INFO

@@ -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 → hcs_cli-0.1.321}/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-0.1.320 → hcs_cli-0.1.321}/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-0.1.321/hcs_cli/cmds/hoc/stats.py

@@ -0,0 +1,72 @@
+import click
+import datetime
+import json
+import time
+
+from hcs_cli.service.hoc import diagnostic
+from hcs_cli.service import tsctl
+
+
+@click.command(name="stats-aggregate-connects")
+@click.argument("from_", type=int)
+@click.argument("to", type=int)
+@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(from_: int, to: int, wait: bool, verbose: bool):
+    """
+    Aggregate connect events between FROM_ and TO unix timestamps.
+    """
+    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)
+
+
+@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-0.1.320 → hcs_cli-0.1.321}/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-0.1.320 → hcs_cli-0.1.321}/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-0.1.320 → hcs_cli-0.1.321}/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 → hcs_cli-0.1.321}/pyproject.toml

@@ -21,7 +21,7 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "hcs-core>=0.1.320",
+    "hcs-core>=0.1.321",
     "reportlab>=4.0.0",
     "matplotlib>=3.8.0",
     "InquirerPy>=0.3.4",

hcs_cli-0.1.320/hcs_cli/cmds/hoc/stats.py

@@ -1,46 +0,0 @@
-import click
-import time
-import json
-from hcs_cli.service.hoc import diagnostic
-from hcs_cli.service import tsctl
-
-
-@click.command(name="stats-aggregate-connects")
-@click.argument("from_", type=int)
-@click.argument("to", type=int)
-@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(from_: int, to: int, wait: bool, verbose: bool):
-    """
-    Aggregate connect events between FROM_ and TO unix timestamps.
-    """
-    payload = {"from": from_, "to": to}
-    result = diagnostic.aggregateConnects(payload, verbose=verbose)
-    click.echo(result)
-
-    if not result:
-        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
-            print(json.dumps(taskStatus, indent=2))
-            break