From 64a8f7bbfef6728dda5f815258ef8185431583d2 Mon Sep 17 00:00:00 2001 From: Michael Barroco Date: Fri, 23 Jun 2023 11:16:53 +0200 Subject: [PATCH] [uss_qualifier] Add rid mock v22a and switch local_test default rid version to v22a --- monitoring/mock_uss/run_locally_riddp.sh | 12 ++++--- monitoring/mock_uss/run_locally_riddp_v22a.sh | 11 +++++++ monitoring/mock_uss/run_locally_ridsp.sh | 12 ++++--- monitoring/mock_uss/run_locally_ridsp_v22a.sh | 11 +++++++ monitoring/mock_uss/start_all_local_mocks.sh | 2 ++ monitoring/mock_uss/stop_all_local_mocks.sh | 2 +- .../configurations/dev/environment.yaml | 32 ++++++++++++++++-- .../configurations/dev/local_test.json | 7 ++-- .../configurations/dev/netrid_v22a.yaml | 4 +-- .../dev/non_docker/local_test.json | 6 ++-- .../dev/non_docker/resources.yaml | 33 +++++++++++++++++-- .../uss_qualifier/suites/dev/local_test.yaml | 4 +-- 12 files changed, 110 insertions(+), 26 deletions(-) create mode 100755 monitoring/mock_uss/run_locally_riddp_v22a.sh create mode 100755 monitoring/mock_uss/run_locally_ridsp_v22a.sh diff --git a/monitoring/mock_uss/run_locally_riddp.sh b/monitoring/mock_uss/run_locally_riddp.sh index 05fa961bfb..82846d027d 100755 --- a/monitoring/mock_uss/run_locally_riddp.sh +++ b/monitoring/mock_uss/run_locally_riddp.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_riddp" +CONTAINER_NAME=${MOCK_CONTAINER_NAME:-"mock_uss_riddp"} -PORT=8073 +PORT=${PORT:-8073} if [ "$CI" == "true" ]; then docker_args="--add-host host.docker.internal:host-gateway" # Required to reach other containers in Ubuntu (used for Github Actions) @@ -19,15 +20,16 @@ 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_SERVICES="riddp" \ + -e MOCK_USS_RID_VERSION="${RID_VERSION}" \ -p ${PORT}:5000 \ -v "${SCRIPT_DIR}/../../build/test-certs:/var/test-certs:ro" \ "$@" \ diff --git a/monitoring/mock_uss/run_locally_riddp_v22a.sh b/monitoring/mock_uss/run_locally_riddp_v22a.sh new file mode 100755 index 0000000000..a220e6da57 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/monitoring/mock_uss/run_locally_ridsp.sh b/monitoring/mock_uss/run_locally_ridsp.sh index 7f3b10fd9a..3aa0515c63 100755 --- a/monitoring/mock_uss/run_locally_ridsp.sh +++ b/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_riddp"} -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" \ "$@" \ diff --git a/monitoring/mock_uss/run_locally_ridsp_v22a.sh b/monitoring/mock_uss/run_locally_ridsp_v22a.sh new file mode 100755 index 0000000000..c2ce3d60f6 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/monitoring/mock_uss/start_all_local_mocks.sh b/monitoring/mock_uss/start_all_local_mocks.sh index e6811b2177..6c62ce5a30 100755 --- a/monitoring/mock_uss/start_all_local_mocks.sh +++ b/monitoring/mock_uss/start_all_local_mocks.sh @@ -22,5 +22,7 @@ monitoring/mock_uss/run_locally_tracer.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_ridsp_v22a +monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_riddp_v22a monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_geoawareness monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_tracer diff --git a/monitoring/mock_uss/stop_all_local_mocks.sh b/monitoring/mock_uss/stop_all_local_mocks.sh index d1f9eea1d2..b9b4c4009f 100755 --- a/monitoring/mock_uss/stop_all_local_mocks.sh +++ b/monitoring/mock_uss/stop_all_local_mocks.sh @@ -10,4 +10,4 @@ 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 +docker container rm -f mock_uss_scdsc mock_uss_ridsp mock_uss_ridsp_v22a mock_uss_riddp mock_uss_riddp_v22a mock_uss_geoawareness mock_uss_atproxy_client mock_uss_tracer diff --git a/monitoring/uss_qualifier/configurations/dev/environment.yaml b/monitoring/uss_qualifier/configurations/dev/environment.yaml index 400f5154a2..a9d5fe9e33 100644 --- a/monitoring/uss_qualifier/configurations/dev/environment.yaml +++ b/monitoring/uss_qualifier/configurations/dev/environment.yaml @@ -7,7 +7,7 @@ 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 @@ -15,7 +15,15 @@ net_rid: 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 @@ -23,6 +31,14 @@ net_rid: 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: diff --git a/monitoring/uss_qualifier/configurations/dev/local_test.json b/monitoring/uss_qualifier/configurations/dev/local_test.json index bdcd00924b..675eaf9227 100644 --- a/monitoring/uss_qualifier/configurations/dev/local_test.json +++ b/monitoring/uss_qualifier/configurations/dev/local_test.json @@ -15,8 +15,8 @@ "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", @@ -24,7 +24,8 @@ "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_v19": "netrid_dss_instances_v19", + "netrid_dss_instances_v22a": "netrid_dss_instances_v22a" } } } diff --git a/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml b/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml index ee9d666860..c017609e4d 100644 --- a/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml +++ b/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml @@ -18,7 +18,7 @@ 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: @@ -26,7 +26,7 @@ v1: 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: {} diff --git a/monitoring/uss_qualifier/configurations/dev/non_docker/local_test.json b/monitoring/uss_qualifier/configurations/dev/non_docker/local_test.json index 264d872392..6d24538e2e 100644 --- a/monitoring/uss_qualifier/configurations/dev/non_docker/local_test.json +++ b/monitoring/uss_qualifier/configurations/dev/non_docker/local_test.json @@ -14,15 +14,15 @@ "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" } } } diff --git a/monitoring/uss_qualifier/configurations/dev/non_docker/resources.yaml b/monitoring/uss_qualifier/configurations/dev/non_docker/resources.yaml index 713d3874f6..03d7d17fee 100644 --- a/monitoring/uss_qualifier/configurations/dev/non_docker/resources.yaml +++ b/monitoring/uss_qualifier/configurations/dev/non_docker/resources.yaml @@ -10,7 +10,7 @@ uspace: net_rid: $ref: '#/common' - netrid_service_providers: + netrid_service_providers_v19: resource_type: resources.netrid.NetRIDServiceProviders dependencies: auth_adapter: utm_auth @@ -18,7 +18,15 @@ net_rid: service_providers: - participant_id: uss1 injection_base_url: http://localhost: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://localhost:8081/ridsp/injection + netrid_observers_v19: resource_type: resources.netrid.NetRIDObserversResource dependencies: auth_adapter: utm_auth @@ -26,6 +34,14 @@ net_rid: observers: - participant_id: uss2 observation_base_url: http://localhost: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://localhost:8083/riddp/observation netrid_observation_evaluation_configuration: resource_type: resources.netrid.EvaluationConfigurationResource specification: {} @@ -41,7 +57,18 @@ net_rid: - participant_id: uss2 rid_version: F3411-19 base_url: http://localhost: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://localhost:8082/rid/v2/ + - participant_id: uss2 + rid_version: F3411-22a + base_url: http://localhost:8082/rid/v2/ net_rid_sims: adjacent_circular_flights_data: resource_type: resources.netrid.FlightDataResource diff --git a/monitoring/uss_qualifier/suites/dev/local_test.yaml b/monitoring/uss_qualifier/suites/dev/local_test.yaml index 7f91713f0a..483316eba0 100644 --- a/monitoring/uss_qualifier/suites/dev/local_test.yaml +++ b/monitoring/uss_qualifier/suites/dev/local_test.yaml @@ -14,8 +14,8 @@ resources: invalid_flight_intents: resources.flight_planning.FlightIntentsResource invalid_flight_auth_flights: resources.flight_planning.FlightIntentsResource dss: resources.astm.f3548.v21.DSSInstanceResource + netrid_dss_instances_v22a: resources.astm.f3411.DSSInstancesResource - netrid_dss_instances_v19: resources.astm.f3411.DSSInstancesResource actions: - test_suite: suite_type: suites.interuss.generate_test_data @@ -39,5 +39,5 @@ actions: service_providers: service_providers observers: observers evaluation_configuration: evaluation_configuration - netrid_dss_instances: netrid_dss_instances_v19 + netrid_dss_instances: netrid_dss_instances_v22a on_failure: Continue