[tracer] Add support for RID v22a

monitoring/Dockerfile

@@ -22,6 +22,7 @@ RUN rm -rf __pycache__
 ADD ./interfaces /app/interfaces
 ADD ./monitoring /app/monitoring
 COPY ./monitoring/health_check.sh /app/health_check.sh
+RUN chmod 766 /app/health_check.sh
 WORKDIR /app/monitoring
 
 # Additional preparations for uss_qualifier/webapp

monitoring/mock_uss/run_locally_tracer.sh

@@ -20,25 +20,26 @@ POLL='--rid-isa-poll-interval=15 --scd-operation-poll-interval=15 --scd-constrai
 TRACER_OPTIONS="$AREA $LOGS $MONITOR $POLL"
 
 
+PORT=${PORT:-8078}
 AUTH="DummyOAuth(http://host.docker.internal:8085/token,tracer)"
-DSS="http://host.docker.internal:8082"
+DSS=${MOCK_USS_DSS_URL:-"http://host.docker.internal:8082"}
 PUBLIC_KEY="/var/test-certs/auth2.pem"
-AUD=${MOCK_USS_TOKEN_AUDIENCE:-localhost,host.docker.internal}
-container_name="mock_uss_tracer"
+AUD=${MOCK_USS_TOKEN_AUDIENCE:-host.docker.internal:${PORT}}
+RID_VERSION=${MOCK_USS_RID_VERSION:-"F3411-19"}
+CONTAINER_NAME=${MOCK_CONTAINER_NAME:-"mock_uss_tracer"}
 
-PORT=8078
-BASE_URL="http://${MOCK_USS_TOKEN_AUDIENCE:-host.docker.internal}:${PORT}"
+BASE_URL="http://${AUD:-host.docker.internal}"
 
 if [ "$CI" == "true" ]; then
   docker_args="--add-host host.docker.internal:host-gateway" # Required to reach other containers in Ubuntu (used for Github Actions)
 else
   docker_args="-it"
 fi
 
-docker container rm -f ${container_name} || echo "No pre-existing ${container_name} container to remove"
+docker container rm -f "${CONTAINER_NAME}" || echo "No pre-existing ${CONTAINER_NAME} container to remove"
 
 # shellcheck disable=SC2086
-docker run ${docker_args} --name ${container_name} \
+docker run ${docker_args} --name "${CONTAINER_NAME}" \
   -u "$(id -u):$(id -g)" \
   -e MOCK_USS_AUTH_SPEC="${AUTH}" \
   -e MOCK_USS_DSS_URL="${DSS}" \
@@ -47,6 +48,7 @@ docker run ${docker_args} --name ${container_name} \
   -e MOCK_USS_BASE_URL="${BASE_URL}" \
   -e MOCK_USS_TRACER_OPTIONS="${TRACER_OPTIONS}" \
   -e MOCK_USS_SERVICES="tracer" \
+  -e MOCK_USS_RID_VERSION="${RID_VERSION}" \
   -p ${PORT}:5000 \
   -v "${SCRIPT_DIR}/../../build/test-certs:/var/test-certs:ro" \
   -v "$(pwd)/$OUTPUT_DIR:/app/monitoring/mock_uss/$OUTPUT_DIR" \

monitoring/mock_uss/run_locally_tracer_v22a.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
+  "${SCRIPT_DIR}/../build.sh" || exit 1
+fi
+
+MOCK_CONTAINER_NAME="mock_uss_tracer_v22a" \
+MOCK_USS_RID_VERSION="F3411-22a" \
+MOCK_USS_DSS_URL="http://host.docker.internal:8082" \
+PORT=8088 \
+"${SCRIPT_DIR}/run_locally_tracer.sh" "$@"

monitoring/mock_uss/templates/tracer/base.html

@@ -12,7 +12,7 @@
   <div>
     Tracer:
     <a href="{{ url_for('tracer_list_logs') }}">Home</a>
-    <a href="{{ url_for('tracer_rid_v19_get_rid_poll') }}">RID v19 Flights</a>
+    <a href="{{ url_for('tracer_rid_get_poll') }}">RID {{ rid_version }} Flights</a>
   </div>
   <hr>
   <div>

monitoring/mock_uss/templates/tracer/rid_poll.html

@@ -1,7 +1,7 @@
 {% extends "tracer/base.html" %}
 
 {% block content %}
-<form action="{{ url_for('tracer_rid_v19_request_rid_poll') }}" method="POST">
+<form action="{{ url_for('tracer_rid_request_poll') }}" method="POST">
   <p>
     <label for="area">Area (lat,lng,lat,lng):</label>
     <input type="text" id="area" name="area" size="40">

monitoring/mock_uss/tracer/config.py

@@ -1,9 +1,16 @@
 from monitoring.mock_uss import import_environment_variable, require_config_value
 from monitoring.mock_uss.config import KEY_DSS_URL, KEY_BASE_URL
+from monitoring.monitorlib.rid import RIDVersion
 
 
 KEY_TRACER_OPTIONS = "MOCK_USS_TRACER_OPTIONS"
+KEY_RID_VERSION = "MOCK_USS_RID_VERSION"
 
 import_environment_variable(KEY_TRACER_OPTIONS)
 require_config_value(KEY_DSS_URL)
 require_config_value(KEY_BASE_URL)
+import_environment_variable(
+    KEY_RID_VERSION,
+    default=RIDVersion.f3411_19,
+    mutator=RIDVersion,
+)

monitoring/mock_uss/tracer/context.py

@@ -13,6 +13,7 @@
     TASK_POLL_OPS,
     TASK_POLL_CONSTRAINTS,
 )
+from monitoring.mock_uss.tracer.config import KEY_RID_VERSION
 from monitoring.monitorlib import ids, versioning
 from monitoring.monitorlib import fetch
 import monitoring.monitorlib.fetch.rid
@@ -30,6 +31,8 @@
 RID_SUBSCRIPTION_ID_CODE = "tracer RID Subscription"
 SCD_SUBSCRIPTION_ID_CODE = "tracer SCD Subscription"
 
+RID_VERSION = webapp.config[KEY_RID_VERSION]
+
 resources: Optional[ResourceSet] = None
 
 
@@ -106,9 +109,17 @@ def _subscribe(
     if base_url.endswith("/"):
         base_url = base_url[0:-1]
     if monitor_rid:
-        _subscribe_rid(resources, base_url + "/tracer/f3411v19")
+        if RID_VERSION == RIDVersion.f3411_19:
+            _subscribe_rid(resources, base_url + "/tracer/f3411v19")
+        elif RID_VERSION == RIDVersion.f3411_22a:
+            _subscribe_rid(resources, base_url + "/tracer/f3411v22a/v2")
+        else:
+            raise NotImplementedError(
+                f"Cannot subscribe to DSS using RID version {RID_VERSION}"
+            )
+
     if monitor_scd:
-        _subscribe_scd(resources, base_url)
+        _subscribe_scd(resources, base_url + "/tracer/f3548v21")
 
 
 def _unsubscribe(resources: ResourceSet, monitor_rid: bool, monitor_scd: bool) -> None:
@@ -135,8 +146,8 @@ def _subscribe_rid(resources: ResourceSet, uss_base_url: str) -> None:
         end_time=resources.end_time,
         uss_base_url=uss_base_url,
         subscription_id=_rid_subscription_id(),
-        rid_version=RIDVersion.f3411_19,
-        utm_client=resources.dss_client,
+        rid_version=RID_VERSION,
+        utm_client=resources.dss_clients["rid"],
     )
     resources.logger.log_new(RID_SUBSCRIPTION_KEY, create_result)
     if not create_result.success:
@@ -145,7 +156,7 @@ def _subscribe_rid(resources: ResourceSet, uss_base_url: str) -> None:
 
 def _clear_existing_rid_subscription(resources: ResourceSet, suffix: str) -> None:
     existing_result = fetch.rid.subscription(
-        _rid_subscription_id(), RIDVersion.f3411_19, resources.dss_client
+        _rid_subscription_id(), RID_VERSION, resources.dss_clients["rid"]
     )
     logfile = resources.logger.log_new(
         "{}_{}_get".format(RID_SUBSCRIPTION_KEY, suffix), existing_result
@@ -159,8 +170,8 @@ def _clear_existing_rid_subscription(resources: ResourceSet, suffix: str) -> Non
         del_result = mutate.rid.delete_subscription(
             subscription_id=_rid_subscription_id(),
             subscription_version=existing_result.subscription.version,
-            rid_version=RIDVersion.f3411_19,
-            utm_client=resources.dss_client,
+            rid_version=RID_VERSION,
+            utm_client=resources.dss_clients["rid"],
         )
         logfile = resources.logger.log_new(
             "{}_{}_del".format(RID_SUBSCRIPTION_KEY, suffix), del_result
@@ -183,11 +194,11 @@ def _subscribe_scd(resources: ResourceSet, base_url: str) -> None:
     _clear_existing_scd_subscription(resources, "old")
 
     create_result = mutate.scd.put_subscription(
-        resources.dss_client,
+        resources.dss_clients["scd"],
         resources.area,
         resources.start_time,
         resources.end_time,
-        base_url + "/tracer/f3548v21",
+        base_url,
         _scd_subscription_id(),
     )
     logfile = resources.logger.log_new(SCD_SUBSCRIPTION_KEY, create_result)
@@ -198,7 +209,9 @@ def _subscribe_scd(resources: ResourceSet, base_url: str) -> None:
 
 
 def _clear_existing_scd_subscription(resources: ResourceSet, suffix: str) -> None:
-    get_result = fetch.scd.subscription(resources.dss_client, _scd_subscription_id())
+    get_result = fetch.scd.subscription(
+        resources.dss_clients["scd"], _scd_subscription_id()
+    )
     logfile = resources.logger.log_new(
         "{}_{}_get".format(SCD_SUBSCRIPTION_KEY, suffix), get_result
     )
@@ -209,7 +222,7 @@ def _clear_existing_scd_subscription(resources: ResourceSet, suffix: str) -> Non
 
     if get_result.subscription is not None:
         del_result = mutate.scd.delete_subscription(
-            resources.dss_client,
+            resources.dss_clients["scd"],
             _scd_subscription_id(),
             get_result.subscription.version,
         )

monitoring/mock_uss/tracer/polling.py

@@ -13,13 +13,15 @@ def indent(s: str, level: int) -> str:
     return "\n".join(" " * level + line for line in s.split("\n"))
 
 
-def poll_rid_isas(resources: ResourceSet, box: s2sphere.LatLngRect) -> Any:
+def poll_rid_isas(
+    resources: ResourceSet, box: s2sphere.LatLngRect, rid_version: RIDVersion
+) -> Any:
     return fetch.rid.isas(
         box,
         resources.start_time,
         resources.end_time,
-        RIDVersion.f3411_19,
-        resources.dss_client,
+        rid_version,
+        resources.dss_clients["rid"],
     )
 
 
@@ -29,7 +31,7 @@ def poll_scd_operations(resources: ResourceSet) -> Any:
             str, fetch.scd.FetchedEntity
         ] = {}
     return fetch.scd.operations(
-        resources.dss_client,
+        resources.dss_clients["scd"],
         resources.area,
         resources.start_time,
         resources.end_time,
@@ -41,7 +43,7 @@ def poll_scd_constraints(resources: ResourceSet) -> Any:
     if "constraints" not in resources.scd_cache:
         resources.scd_cache["constraints"]: Dict[str, fetch.scd.FetchedEntity] = {}
     return fetch.scd.constraints(
-        resources.dss_client,
+        resources.dss_clients["scd"],
         resources.area,
         resources.start_time,
         resources.end_time,

monitoring/mock_uss/tracer/resources.py

@@ -1,13 +1,16 @@
 import argparse
 import datetime
 import shlex
+from typing import List, Dict
 
 import s2sphere
 
 from monitoring import mock_uss
+from monitoring.mock_uss.config import KEY_DSS_URL
+from monitoring.mock_uss.tracer.config import KEY_RID_VERSION
+from monitoring.monitorlib.rid import RIDVersion
 from monitoring.monitorlib import auth, infrastructure, geo
 from monitoring.mock_uss import webapp, tracer
-import monitoring.mock_uss.tracer.config
 from monitoring.mock_uss.tracer import tracerlog
 
 
@@ -25,13 +28,13 @@ class ResourceSet(object):
 
     def __init__(
         self,
-        dss_client: infrastructure.UTMClientSession,
+        dss_clients: Dict[str, infrastructure.UTMClientSession],
         area: s2sphere.LatLngRect,
         logger: tracerlog.Logger,
         start_time: datetime.datetime,
         end_time: datetime.datetime,
     ):
-        self.dss_client = dss_client
+        self.dss_clients = dss_clients
         self.area = area
         self.logger = logger
         self.start_time = start_time
@@ -102,9 +105,22 @@ def from_arguments(cls, args: argparse.Namespace):
         adapter: auth.AuthAdapter = auth.make_auth_adapter(
             webapp.config[mock_uss.config.KEY_AUTH_SPEC]
         )
-        dss_client = infrastructure.UTMClientSession(
-            webapp.config[mock_uss.config.KEY_DSS_URL], adapter
-        )
+
+        if webapp.config[KEY_RID_VERSION] == RIDVersion.f3411_19:
+            _dss_rid_base_url = webapp.config[KEY_DSS_URL]
+        elif webapp.config[KEY_RID_VERSION] == RIDVersion.f3411_22a:
+            _dss_rid_base_url = webapp.config[KEY_DSS_URL] + "/rid/v2"
+        else:
+            raise NotImplementedError(
+                f"Cannot construct DSS base URL using RID version {webapp.config[KEY_RID_VERSION]}"
+            )
+        _dss_scd_base_url = webapp.config[KEY_DSS_URL]
+
+        dss_clients = {
+            "rid": infrastructure.UTMClientSession(_dss_rid_base_url, adapter),
+            "scd": infrastructure.UTMClientSession(_dss_scd_base_url, adapter),
+        }
+
         area: s2sphere.LatLngRect = geo.make_latlng_rect(args.area)
         start_time = datetime.datetime.fromisoformat(args.start_time)
         end_time = start_time + datetime.timedelta(hours=args.trace_hours)
@@ -122,4 +138,4 @@ def from_arguments(cls, args: argparse.Namespace):
             if args.output_folder
             else None
         )
-        return ResourceSet(dss_client, area, logger, start_time, end_time)
+        return ResourceSet(dss_clients, area, logger, start_time, end_time)