[loadtest] Modernize & fix ISA.py

Author: the-glu

.basedpyright/baseline.json

@@ -962,24 +962,6 @@
                 }
             }
         ],
-        "./monitoring/loadtest/locust_files/ISA.py": [
-            {
-                "code": "reportCallIssue",
-                "range": {
-                    "startColumn": 25,
-                    "endColumn": 60,
-                    "lineCount": 1
-                }
-            },
-            {
-                "code": "reportArgumentType",
-                "range": {
-                    "startColumn": 43,
-                    "endColumn": 53,
-                    "lineCount": 1
-                }
-            }
-        ],
         "./monitoring/mock_uss/auth.py": [
             {
                 "code": "reportArgumentType",

monitoring/loadtest/locust_files/ISA.py

@@ -1,15 +1,12 @@
-#!env/bin/python3
-
+import argparse
 import datetime
 import random
 import threading
 import uuid
 
 import client
-from locust import between, task
-
-from monitoring.monitorlib import rid_v1
-from monitoring.monitorlib.testing import make_fake_url
+import locust
+from utils import format_time
 
 VERTICES = [
     {"lng": 130.6205, "lat": -23.6558},
@@ -19,38 +16,65 @@
 ]
 
 
+@locust.events.init_command_line_parser.add_listener
+def init_parser(parser: argparse.ArgumentParser):
+    """Setup config params, populated by locust.conf."""
+
+    parser.add_argument(
+        "--uss-base-url",
+        type=str,
+        help="Base URL of the USS",
+        required=True,
+    )
+
+
 class ISA(client.USS):
-    wait_time = between(0.01, 1)
+    wait_time = locust.between(0.01, 1)
     lock = threading.Lock()
 
-    @task(10)
+    @locust.task(10)
     def create_isa(self):
         time_start = datetime.datetime.now(datetime.UTC)
         time_end = time_start + datetime.timedelta(minutes=60)
         isa_uuid = str(uuid.uuid4())
 
         resp = self.client.put(
-            f"/identification_service_areas/{isa_uuid}",
+            f"/rid/v2/dss/identification_service_areas/{isa_uuid}",
             json={
                 "extents": {
-                    "spatial_volume": {
-                        "footprint": {
+                    "volume": {
+                        "outline_polygon": {
                             "vertices": VERTICES,
                         },
-                        "altitude_lo": 20,
-                        "altitude_hi": 400,
+                        "altitude_lower": {
+                            "value": 20,
+                            "reference": "W84",
+                            "units": "M",
+                        },
+                        "altitude_upper": {
+                            "value": 400,
+                            "reference": "W84",
+                            "units": "M",
+                        },
+                    },
+                    "time_start": {
+                        "value": format_time(time_start),
+                        "format": "RFC3339",
+                    },
+                    "time_end": {
+                        "value": format_time(time_end),
+                        "format": "RFC3339",
                     },
-                    "time_start": time_start.strftime(rid_v1.DATE_FORMAT),
-                    "time_end": time_end.strftime(rid_v1.DATE_FORMAT),
                 },
-                "flights_url": make_fake_url(),
+                "uss_base_url": self.uss_base_url,
             },
             name="/identification_service_areas/[isa_uuid]",
         )
         if resp.status_code == 200:
-            self.isa_dict[isa_uuid] = resp.json()["service_area"]["version"]
+            with self.lock:
+                self.isa_dict[isa_uuid] = resp.json()["service_area"]["version"]
 
-    @task(5)
+    @locust.task(5)
     def update_isa(self):
         target_isa, target_version = self.checkout_isa()
         if not target_isa:
@@ -60,62 +84,77 @@ def update_isa(self):
         time_start = datetime.datetime.now(datetime.UTC)
         time_end = datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=2)
         resp = self.client.put(
-            f"/identification_service_areas/{target_isa}/{target_version}",
+            f"/rid/v2/dss/identification_service_areas/{target_isa}/{target_version}",
             json={
                 "extents": {
-                    "spatial_volume": {
-                        "footprint": {
+                    "volume": {
+                        "outline_polygon": {
                             "vertices": VERTICES,
                         },
-                        "altitude_lo": 20,
-                        "altitude_hi": 400,
+                        "altitude_lower": {
+                            "value": 20,
+                            "reference": "W84",
+                            "units": "M",
+                        },
+                        "altitude_upper": {
+                            "value": 400,
+                            "reference": "W84",
+                            "units": "M",
+                        },
+                    },
+                    "time_start": {
+                        "value": format_time(time_start),
+                        "format": "RFC3339",
+                    },
+                    "time_end": {
+                        "value": format_time(time_end),
+                        "format": "RFC3339",
                     },
-                    "time_start": time_start.strftime(rid_v1.DATE_FORMAT),
-                    "time_end": time_end.strftime(rid_v1.DATE_FORMAT),
                 },
-                "flights_url": make_fake_url(),
+                "uss_base_url": self.uss_base_url,
             },
             name="/identification_service_areas/[target_isa]/[target_version]",
         )
         if resp.status_code == 200:
-            self.isa_dict[target_isa] = resp.json()["service_area"]["version"]
+            with self.lock:
+                self.isa_dict[target_isa] = resp.json()["service_area"]["version"]
 
-    @task(100)
+    @locust.task(100)
     def get_isa(self):
-        target_isa = (
-            random.choice(list(self.isa_dict.keys())) if self.isa_dict else None
-        )
-        if not target_isa:
+        if not self.isa_dict:
             print("Nothing to pick from isa_dict for GET")
             return
+        with self.lock:
+            target_isa = random.choice(list(self.isa_dict.keys()))
         self.client.get(
-            f"/identification_service_areas/{target_isa}",
+            f"/rid/v2/dss/identification_service_areas/{target_isa}",
             name="/identification_service_areas/[target_isa]",
         )
 
-    @task(1)
+    @locust.task(1)
     def delete_isa(self):
         target_isa, target_version = self.checkout_isa()
         if not target_isa:
             print("Nothing to pick from isa_dict for DELETE")
             return
         self.client.delete(
-            f"/identification_service_areas/{target_isa}/{target_version}",
+            f"/rid/v2/dss/identification_service_areas/{target_isa}/{target_version}",
             name="/identification_service_areas/[target_isa]/[target_version]",
         )
 
     def checkout_isa(self):
-        self.lock.acquire()
-        target_isa = (
-            random.choice(list(self.isa_dict.keys())) if self.isa_dict else None
-        )
-        target_version = self.isa_dict.pop(target_isa, None)
-        self.lock.release()
+        with self.lock:
+            if not self.isa_dict:
+                return None, None
+            target_isa = random.choice(list(self.isa_dict.keys()))
+            target_version = self.isa_dict.pop(target_isa, None)
         return target_isa, target_version
 
     def on_start(self):
+        self.uss_base_url = self.environment.parsed_options.uss_base_url
         # insert atleast 1 ISA for update to not fail
         self.create_isa()
 
     def on_stop(self):
-        self.isa_dict = {}
+        while self.isa_dict:  # Drain ISAs
+            self.delete_isa()