[uss_qualifier] Switch default ASTM NETRID to v22a and reorganize CI tests

.github/workflows/CI.md

@@ -29,6 +29,8 @@ Steps:
 
 Steps:
 
-* test_docker_fully_mocked.sh
+* test_docker_fully_mocked.sh with following configurations:
+1. U-Space (configurations.dev.uspace)
+2. ASTM NETRID v19 (configurations.dev.netrid_v19
 
-### prober tests (`make test` in monitoring/prober)
+### prober tests (`make test` in monitoring/prober)

.github/workflows/ci.yml

@@ -54,10 +54,20 @@ jobs:
       run: |
         cd monitoring/mock_uss
         make test
-    - name: uss_qualifier tests
+    - name: uss_qualifier tests - U-Space Test Suite
       run: |
         cd monitoring/uss_qualifier
         make test
+      env:
+        RID_VERSION: F3411-22a
+        CONFIG_NAME: configurations.dev.uspace
+    - name: uss_qualifier tests - ASTM NetRID F3411-19 Test Suite
+      run: |
+        cd monitoring/uss_qualifier
+        make test
+      env:
+        RID_VERSION: F3411-19
+        CONFIG_NAME: configurations.dev.netrid_v19
     - name: prober tests
       run: |
         cd monitoring/prober

Makefile

@@ -73,10 +73,14 @@ collect-local-logs:
 	-sh -c "build/dev/run_locally.sh logs --timestamps" > logs/dss_sandbox_local.log 2>&1
 	-docker logs atproxy > logs/atproxy.log 2>&1
 	-docker logs mock_uss_scdsc > logs/mock_uss_scdsc.log 2>&1
+	-docker logs mock_uss_scdsc2 > logs/mock_uss_scdsc2.log 2>&1
 	-docker logs mock_uss_ridsp > logs/mock_uss_ridsp.log 2>&1
+	-docker logs mock_uss_ridsp_v22a > logs/mock_uss_ridsp_v22a.log 2>&1
 	-docker logs mock_uss_riddp > logs/mock_uss_riddp.log 2>&1
+	-docker logs mock_uss_riddp_v22a > logs/mock_uss_riddp_v22a.log 2>&1
 	-docker logs mock_uss_geoawareness > logs/mock_uss_geoawareness.log 2>&1
 	-docker logs mock_uss_tracer > logs/mock_uss_tracer.log 2>&1
+	-docker logs mock_uss_tracer_v22a > logs/mock_uss_tracer_v22a.log 2>&1
 	-docker logs mock_uss_atproxy_client > logs/mock_uss_atproxy_client.log 2>&1
 
 .PHONY: stop-locally

monitoring/mock_uss/run_locally_riddp.sh

@@ -6,28 +6,32 @@ if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
 fi
 
 AUTH="DummyOAuth(http://host.docker.internal:8085/token,uss1)"
-DSS="http://host.docker.internal:8082"
+DSS=${MOCK_USS_DSS_URL:-"http://host.docker.internal:8082"}
+RID_VERSION=${MOCK_USS_RID_VERSION:-"F3411-19"}
 PUBLIC_KEY="/var/test-certs/auth2.pem"
 AUD=${MOCK_USS_TOKEN_AUDIENCE:-localhost,host.docker.internal}
-container_name="mock_uss_riddp"
+CONTAINER_NAME=${MOCK_CONTAINER_NAME:-"mock_uss_riddp"}
 
-PORT=8073
+PORT=${PORT:-8073}
+BASE_URL="http://${MOCK_USS_TOKEN_AUDIENCE:-host.docker.internal}:${PORT}"
 
 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}" \
   -e MOCK_USS_AUTH_SPEC="${AUTH}" \
   -e MOCK_USS_DSS_URL="${DSS}" \
+  -e MOCK_USS_BASE_URL="${BASE_URL}" \
   -e MOCK_USS_PUBLIC_KEY="${PUBLIC_KEY}" \
   -e MOCK_USS_TOKEN_AUDIENCE="${AUD}" \
   -e MOCK_USS_SERVICES="riddp" \
+  -e MOCK_USS_RID_VERSION="${RID_VERSION}" \
   -p ${PORT}:5000 \
   -v "${SCRIPT_DIR}/../../build/test-certs:/var/test-certs:ro" \
   "$@" \

monitoring/mock_uss/run_locally_riddp_v22a.sh

@@ -0,0 +1,11 @@
+#!/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_riddp_v22a" \
+MOCK_USS_RID_VERSION="F3411-22a" \
+PORT=8083 \
+"${SCRIPT_DIR}/run_locally_riddp.sh" "$@"

monitoring/mock_uss/run_locally_ridsp.sh

@@ -6,12 +6,13 @@ if [ -z "${DO_NOT_BUILD_MONITORING}" ]; then
 fi
 
 AUTH="DummyOAuth(http://host.docker.internal:8085/token,uss1)"
-DSS="http://host.docker.internal:8082"
+DSS=${MOCK_USS_DSS_URL:-"http://host.docker.internal:8082"}
+RID_VERSION=${MOCK_USS_RID_VERSION:-"F3411-19"}
 PUBLIC_KEY="/var/test-certs/auth2.pem"
 AUD=${MOCK_USS_TOKEN_AUDIENCE:-localhost,host.docker.internal}
-container_name="mock_uss_ridsp"
+CONTAINER_NAME=${MOCK_CONTAINER_NAME:-"mock_uss_ridsp"}
 
-PORT=8071
+PORT=${PORT:-8071}
 BASE_URL="http://${MOCK_USS_TOKEN_AUDIENCE:-host.docker.internal}:${PORT}"
 
 if [ "$CI" == "true" ]; then
@@ -20,16 +21,17 @@ 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}" \
   -e MOCK_USS_AUTH_SPEC="${AUTH}" \
   -e MOCK_USS_DSS_URL="${DSS}" \
   -e MOCK_USS_PUBLIC_KEY="${PUBLIC_KEY}" \
   -e MOCK_USS_TOKEN_AUDIENCE="${AUD}" \
   -e MOCK_USS_BASE_URL="${BASE_URL}" \
   -e MOCK_USS_SERVICES="ridsp" \
+  -e MOCK_USS_RID_VERSION="${RID_VERSION}" \
   -p ${PORT}:5000 \
   -v "${SCRIPT_DIR}/../../build/test-certs:/var/test-certs:ro" \
   "$@" \

monitoring/mock_uss/run_locally_ridsp_v22a.sh

@@ -0,0 +1,11 @@
+#!/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_ridsp_v22a" \
+MOCK_USS_RID_VERSION="F3411-22a" \
+PORT=8081 \
+"${SCRIPT_DIR}/run_locally_ridsp.sh" "$@"

monitoring/mock_uss/run_locally_scdsc.sh

@@ -9,9 +9,9 @@ AUTH="DummyOAuth(http://host.docker.internal:8085/token,uss1)"
 DSS="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_scdsc"
+CONTAINER_NAME=${CONTAINER_NAME:-"mock_uss_scdsc${PORT}"}
 
-PORT=8074
+PORT=${PORT:-8074}
 BASE_URL="http://${MOCK_USS_TOKEN_AUDIENCE:-host.docker.internal}:${PORT}"
 
 if [ "$CI" == "true" ]; then
@@ -20,10 +20,10 @@ 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}" \
   -e MOCK_USS_AUTH_SPEC="${AUTH}" \
   -e MOCK_USS_DSS_URL="${DSS}" \
   -e MOCK_USS_PUBLIC_KEY="${PUBLIC_KEY}" \

monitoring/mock_uss/start_all_local_mocks.sh

@@ -12,15 +12,23 @@ else
 fi
 cd "${BASEDIR}/../.." || exit 1
 
+RID_VERSION=${RID_VERSION:-"F3411-19"}
+RID_EXT=""
+if [ "$RID_VERSION" = "F3411-22a" ]; then
+	RID_EXT="_v22a"
+fi
+
 monitoring/mock_uss/run_locally_scdsc.sh -d
 export DO_NOT_BUILD_MONITORING=true
-monitoring/mock_uss/run_locally_ridsp.sh -d
-monitoring/mock_uss/run_locally_riddp.sh -d
+PORT=8094 CONTAINER_NAME=mock_uss_scdsc2 monitoring/mock_uss/run_locally_scdsc.sh -d
+monitoring/mock_uss/run_locally_ridsp${RID_EXT}.sh -d
+monitoring/mock_uss/run_locally_riddp${RID_EXT}.sh -d
 monitoring/mock_uss/run_locally_geoawareness.sh -d
 monitoring/mock_uss/run_locally_atproxy_client.sh -d
-monitoring/mock_uss/run_locally_tracer.sh -d
+monitoring/mock_uss/run_locally_tracer${RID_EXT}.sh -d
 monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_scdsc
-monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_ridsp
-monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_riddp
+monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_scdsc2
+monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_ridsp${RID_EXT}
+monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_riddp${RID_EXT}
 monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_geoawareness
-monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_tracer
+monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_tracer${RID_EXT}

monitoring/mock_uss/stop_all_local_mocks.sh

@@ -10,4 +10,10 @@ else
 fi
 cd "${BASEDIR}/../.." || exit 1
 
-docker container rm -f mock_uss_scdsc mock_uss_ridsp mock_uss_riddp mock_uss_geoawareness mock_uss_atproxy_client mock_uss_tracer
+RID_VERSION=${RID_VERSION:-"F3411-19"}
+RID_EXT=""
+if [ "$RID_VERSION" = "F3411-22a" ]; then
+	RID_EXT="_v22a"
+fi
+
+docker container rm -f mock_uss_scdsc mock_uss_ridsp${RID_EXT} mock_uss_riddp${RID_EXT} mock_uss_geoawareness mock_uss_atproxy_client mock_uss_tracer${RID_EXT}

monitoring/uss_qualifier/configurations/dev/environment.yaml

@@ -7,22 +7,38 @@ common:
             environment_variable_containing_auth_spec: AUTH_SPEC
 
 net_rid:
-    netrid_service_providers:
+    netrid_service_providers_v19:
         resource_type: resources.netrid.NetRIDServiceProviders
         dependencies:
             auth_adapter: utm_auth
         specification:
             service_providers:
                 - participant_id: uss1
                   injection_base_url: http://host.docker.internal:8071/ridsp/injection
-    netrid_observers:
+    netrid_service_providers_v22a:
+        resource_type: resources.netrid.NetRIDServiceProviders
+        dependencies:
+            auth_adapter: utm_auth
+        specification:
+            service_providers:
+                - participant_id: uss1
+                  injection_base_url: http://host.docker.internal:8081/ridsp/injection
+    netrid_observers_v19:
         resource_type: resources.netrid.NetRIDObserversResource
         dependencies:
             auth_adapter: utm_auth
         specification:
             observers:
                 - participant_id: uss2
                   observation_base_url: http://host.docker.internal:8073/riddp/observation
+    netrid_observers_v22a:
+        resource_type: resources.netrid.NetRIDObserversResource
+        dependencies:
+            auth_adapter: utm_auth
+        specification:
+            observers:
+                - participant_id: uss2
+                  observation_base_url: http://host.docker.internal:8083/riddp/observation
     netrid_dss_instances_v19:
         resource_type: resources.astm.f3411.DSSInstancesResource
         dependencies:
@@ -35,6 +51,18 @@ net_rid:
                 - participant_id: uss2
                   rid_version: F3411-19
                   base_url: http://host.docker.internal:8082
+    netrid_dss_instances_v22a:
+        resource_type: resources.astm.f3411.DSSInstancesResource
+        dependencies:
+            auth_adapter: utm_auth
+        specification:
+            dss_instances:
+                - participant_id: uss1
+                  rid_version: F3411-22a
+                  base_url: http://host.docker.internal:8082/rid/v2/
+                - participant_id: uss2
+                  rid_version: F3411-22a
+                  base_url: http://host.docker.internal:8082/rid/v2/
 
 f3548:
     flight_planners:
@@ -46,9 +74,16 @@ f3548:
                 # uss1 is the mock_uss directly exposing scdsc functionality
                 -   participant_id: uss1
                     injection_base_url: http://host.docker.internal:8074/scdsc
-                # uss2 uses atproxy, with requests being fulfilled by mock_uss with atproxy_client functionality enabled
+
+                # The atproxy has been disabled since it is suspected to be responsible of issue #28. Replaced by another simple mock_uss
+                # # uss2 uses atproxy, with requests being fulfilled by mock_uss with atproxy_client functionality enabled
+                # -   participant_id: uss2
+                #     injection_base_url: http://host.docker.internal:8075/scd
+
+                # uss2 is the mock_uss directly exposing scdsc functionality
                 -   participant_id: uss2
-                    injection_base_url: http://host.docker.internal:8075/scd
+                    injection_base_url: http://host.docker.internal:8094/scdsc
+
     dss:
         resource_type: resources.astm.f3548.v21.DSSInstanceResource
         dependencies:

monitoring/uss_qualifier/configurations/dev/local_test.json

@@ -9,22 +9,22 @@
       },
       "action": {
         "test_suite": {
-          "suite_type": "suites.dev.local_test",
+          "suite_type": "suites.dev.local_test_uspace",
           "resources": {
             "adjacent_circular_flights_data": "adjacent_circular_flights_data",
             "adjacent_circular_storage_config": "adjacent_circular_storage_config",
             "kml_flights_data": "kml_flights_data",
             "kml_storage_config": "kml_storage_config",
-            "service_providers": "netrid_service_providers",
-            "observers": "netrid_observers",
+            "service_providers": "netrid_service_providers_v22a",
+            "observers": "netrid_observers_v22a",
             "evaluation_configuration": "netrid_observation_evaluation_configuration",
             "flight_planners": "flight_planners",
             "conflicting_flights": "conflicting_flights",
             "priority_preemption_flights": "priority_preemption_flights",
             "invalid_flight_intents": "invalid_flight_intents",
             "invalid_flight_auth_flights": "invalid_flight_auth_flights",
             "dss": "dss",
-            "netrid_dss_instances_v19": "netrid_dss_instances_v19"
+            "netrid_dss_instances_v22a": "netrid_dss_instances_v22a"
           }
         }
       }

monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml

@@ -38,7 +38,7 @@ v1:
                         dss_instances:
                             - participant_id: uss1
                               rid_version: F3411-19
-                              base_url: http://host.docker.internal:8082/rid/v2
+                              base_url: http://host.docker.internal:8082
         action:
             test_suite:
                 suite_type: suites.astm.netrid.f3411_19

monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml

@@ -18,15 +18,15 @@ v1:
                     specification:
                         service_providers:
                             - participant_id: uss1
-                              injection_base_url: http://host.docker.internal:8071/ridsp/injection
+                              injection_base_url: http://host.docker.internal:8081/ridsp/injection # USS mock ridsp_v22a
                 observers:
                     resource_type: resources.netrid.NetRIDObserversResource
                     dependencies:
                         auth_adapter: utm_auth
                     specification:
                         observers:
                             - participant_id: uss2
-                              observation_base_url: http://host.docker.internal:8073/riddp/observation
+                              observation_base_url: http://host.docker.internal:8083/riddp/observation # USS mock riddp_v22a
                 observation_evaluation_configuration:
                     resource_type: resources.netrid.EvaluationConfigurationResource
                     specification: {}

monitoring/uss_qualifier/configurations/dev/non_docker/local_test.json

@@ -8,21 +8,21 @@
       },
       "action": {
         "test_suite": {
-          "suite_type": "suites.dev.local_test",
+          "suite_type": "suites.dev.local_test_uspace",
           "resources": {
             "adjacent_circular_flights_data": "adjacent_circular_flights_data",
             "adjacent_circular_storage_config": "adjacent_circular_storage_config",
             "kml_flights_data": "kml_flights_data",
             "kml_storage_config": "kml_storage_config",
-            "service_providers": "netrid_service_providers",
-            "observers": "netrid_observers",
+            "service_providers": "netrid_service_providers_v22a",
+            "observers": "netrid_observers_v22a",
             "evaluation_configuration": "netrid_observation_evaluation_configuration",
             "flight_planners": "flight_planners",
             "conflicting_flights": "conflicting_flights",
             "priority_preemption_flights": "priority_preemption_flights",
             "invalid_flight_auth_flights": "invalid_flight_auth_flights",
             "dss": "dss",
-            "netrid_dss_instances_v19": "netrid_dss_instances_v19"
+            "netrid_dss_instances_v22a": "netrid_dss_instances_v22a"
           }
         }
       }
@@ -41,14 +41,14 @@
           },
           {
             "name": "Service Provider role",
-            "requirement_set": "astm.f3411.v19.service_provider",
+            "requirement_set": "astm.f3411.v22a.service_provider",
             "participants": [
               "uss1"
             ]
           },
           {
             "name": "Display Provider role",
-            "requirement_set": "astm.f3411.v19.service_provider",
+            "requirement_set": "astm.f3411.v22a.service_provider",
             "participants": [
               "uss2"
             ]