diff --git a/interfaces/dummy-oauth/dummy-oauth.yaml b/interfaces/dummy-oauth/dummy-oauth.yaml index 9225c5515b..2a65efd5e1 100644 --- a/interfaces/dummy-oauth/dummy-oauth.yaml +++ b/interfaces/dummy-oauth/dummy-oauth.yaml @@ -33,7 +33,7 @@ paths: description: Fully-qualified domain name where the service for which this access token will be used is hosted. The `aud` claim will be populated with this value. schema: type: string - example: uss.example.com + example: uss.example.interuss.org - name: scope in: query required: true diff --git a/interfaces/rid/README.md b/interfaces/rid/README.md index 8bceb5fcfb..9a75850576 100644 --- a/interfaces/rid/README.md +++ b/interfaces/rid/README.md @@ -10,7 +10,7 @@ ## Mixing versions in a single ecosystem -If all USSs in an ecosystem use the v1 API, then everything is fine. If all USSs in an ecosystem use the v2 API, then everything is fine. If some USSs in an ecosystem use v1 while others use v2, there may be interoperability problems. To avoid accidentally missing ISAs, this DSS implementation stores v1 and v2 ISAs alongside each other. The URL field for v1 ISAs contains the `/flights` resource URL (e.g., `https://example.com/v1/uss/flights`), but this same URL field contains the base URL (e.g., `http://example.com/rid/v2`) for v2 ISAs. This means a v1 USS may try to query `http://example.com/rid/v2` if reading a v2 USS's ISA, or a v2 USS may try to query `http://example.com/v1/uss/flights/uss/flights` if reading a v1 USS's ISA. This issue is somewhat intentional because even though v1 and v2 both have a `/flights` endpoint, the communications protocol for these two endpoints is not compatible. If v1 and v2 ISAs are going to co-exist in the same ecosystem, then every USS in that ecosystem must infer the USS-USS communications protocol based on the content of the URL field (`flights_url` and `identification_service_area_url` in v1 and `uss_base_url` in v2). +If all USSs in an ecosystem use the v1 API, then everything is fine. If all USSs in an ecosystem use the v2 API, then everything is fine. If some USSs in an ecosystem use v1 while others use v2, there may be interoperability problems. To avoid accidentally missing ISAs, this DSS implementation stores v1 and v2 ISAs alongside each other. The URL field for v1 ISAs contains the `/flights` resource URL (e.g., `https://example.interuss.org/v1/uss/flights`), but this same URL field contains the base URL (e.g., `http://example.interuss.org/rid/v2`) for v2 ISAs. This means a v1 USS may try to query `http://example.interuss.org/rid/v2` if reading a v2 USS's ISA, or a v2 USS may try to query `http://example.interuss.org/v1/uss/flights/uss/flights` if reading a v1 USS's ISA. This issue is somewhat intentional because even though v1 and v2 both have a `/flights` endpoint, the communications protocol for these two endpoints is not compatible. If v1 and v2 ISAs are going to co-exist in the same ecosystem, then every USS in that ecosystem must infer the USS-USS communications protocol based on the content of the URL field (`flights_url` and `identification_service_area_url` in v1 and `uss_base_url` in v2). ### v1 ISAs diff --git a/monitoring/loadtest/locust_files/ISA.py b/monitoring/loadtest/locust_files/ISA.py index d58ae9bf54..f851fe5adf 100644 --- a/monitoring/loadtest/locust_files/ISA.py +++ b/monitoring/loadtest/locust_files/ISA.py @@ -34,7 +34,7 @@ def create_isa(self): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/dss", + "flights_url": "https://example.interuss.org/dss", }, ) if resp.status_code == 200: @@ -63,7 +63,7 @@ def update_isa(self): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/dss", + "flights_url": "https://example.interuss.org/dss", }, ) if resp.status_code == 200: diff --git a/monitoring/loadtest/locust_files/Sub.py b/monitoring/loadtest/locust_files/Sub.py index 742309df7d..29f8c18313 100644 --- a/monitoring/loadtest/locust_files/Sub.py +++ b/monitoring/loadtest/locust_files/Sub.py @@ -43,7 +43,7 @@ def create_sub(self): "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, "callbacks": { - "identification_service_area_url": "https://example.com/foo" + "identification_service_area_url": "https://example.interuss.org/foo" }, }, ) @@ -84,7 +84,7 @@ def update_sub(self): "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, "callbacks": { - "identification_service_area_url": "https://example.com/foo" + "identification_service_area_url": "https://example.interuss.org/foo" }, }, ) diff --git a/monitoring/mock_uss/deployment/gcp/kubernetes-deployment.md b/monitoring/mock_uss/deployment/gcp/kubernetes-deployment.md index eb114b9471..e165a3117d 100644 --- a/monitoring/mock_uss/deployment/gcp/kubernetes-deployment.md +++ b/monitoring/mock_uss/deployment/gcp/kubernetes-deployment.md @@ -81,4 +81,4 @@ kubectl apply -f mockuss.yaml GKE ingresses with managed certificates can take tens of minutes to provision; track progress in the Ingresses tab of the Services GKE menu item. -Confirm deployment by visiting https://your-domain.example.com/status in a browser, which should display the version. +Confirm deployment by visiting https://your-domain.example.interuss.org/status in a browser, which should display the version. diff --git a/monitoring/mock_uss/deployment/gcp/mockuss.example.yaml b/monitoring/mock_uss/deployment/gcp/mockuss.example.yaml index 0e5df2522c..e765180bbb 100644 --- a/monitoring/mock_uss/deployment/gcp/mockuss.example.yaml +++ b/monitoring/mock_uss/deployment/gcp/mockuss.example.yaml @@ -16,13 +16,13 @@ spec: readOnly: true env: - name: MOCK_USS_DSS_URL - value: https://dss.example.com <-- UPDATE + value: https://dss.example.interuss.org <-- UPDATE - name: MOCK_USS_PUBLIC_KEY - value: https://auth.example.com/jwks.json <-- UPDATE + value: https://auth.example.interuss.org/jwks.json <-- UPDATE - name: MOCK_USS_TOKEN_AUDIENCE - value: mockuss.example.com <-- UPDATE + value: mockuss.example.interuss.org <-- UPDATE - name: MOCK_USS_BASE_URL - value: https://mockuss.example.com <-- UPDATE + value: https://mockuss.example.interuss.org <-- UPDATE - name: MOCK_USS_SERVICES value: scdsc,versioning,interaction_logging,flight_planning - name: MOCK_USS_INTERACTIONS_LOG_DIR @@ -30,7 +30,7 @@ spec: - name: MOCK_USS_PORT value: "8074" - name: MOCK_USS_AUTH_SPEC - value: ServiceAccount(https://auth.example.com/oauth/token,/auth/mock_uss-creds.json) <-- UPDATE + value: ServiceAccount(https://auth.example.interuss.org/oauth/token,/auth/mock_uss-creds.json) <-- UPDATE command: ["/bin/sh", "-c"] args: - mkdir -p /output/interaction_logs && mock_uss/start.sh @@ -66,7 +66,7 @@ metadata: name: managed-cert spec: domains: - - mockuss.example.com <-- UPDATE + - mockuss.example.interuss.org <-- UPDATE --- apiVersion: networking.k8s.io/v1 diff --git a/monitoring/mock_uss/postman_collection.json b/monitoring/mock_uss/postman_collection.json index d35b596670..271299f404 100644 --- a/monitoring/mock_uss/postman_collection.json +++ b/monitoring/mock_uss/postman_collection.json @@ -280,7 +280,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"requested_flights\": [\n {\n \"injection_id\": \"edb7695f-8737-4b9f-91f8-e2afbb333f41\",\n \"telemetry\": [\n {\n \"timestamp\": \"{{t_1}}\",\n \"timestamp_accuracy\": 5,\n \"operational_status\": \"Airborne\",\n \"position\": {\n \"lat\": 34.1231,\n \"lng\": -118.4561,\n \"alt\": 1321.1,\n \"accuracy_h\": \"HA3m\",\n \"accuracy_v\": \"VA10m\",\n \"extrapolated\": false\n },\n \"track\": 90,\n \"speed\": 1.9,\n \"speed_accuracy\": \"SA10mpsPlus\",\n \"vertical_speed\": 0\n },\n {\n \"timestamp\": \"{{t_2}}\",\n \"timestamp_accuracy\": 5,\n \"operational_status\": \"Airborne\",\n \"position\": {\n \"lat\": 34.1231,\n \"lng\": -118.4551,\n \"alt\": 1321.1,\n \"accuracy_h\": \"HA3m\",\n \"accuracy_v\": \"VA10m\",\n \"extrapolated\": false\n },\n \"track\": 180,\n \"speed\": 2.0,\n \"speed_accuracy\": \"SA10mpsPlus\",\n \"vertical_speed\": 0\n },\n {\n \"timestamp\": \"{{t_3}}\",\n \"timestamp_accuracy\": 5,\n \"operational_status\": \"Airborne\",\n \"position\": {\n \"lat\": 34.1221,\n \"lng\": -118.4551,\n \"alt\": 1321.1,\n \"accuracy_h\": \"HA3m\",\n \"accuracy_v\": \"VA10m\",\n \"extrapolated\": false\n },\n \"track\": 270,\n \"speed\": 2.1,\n \"speed_accuracy\": \"SA10mpsPlus\",\n \"vertical_speed\": 0\n },\n {\n \"timestamp\": \"{{t_4}}\",\n \"timestamp_accuracy\": 5,\n \"operational_status\": \"Airborne\",\n \"position\": {\n \"lat\": 34.1221,\n \"lng\": -118.4561,\n \"alt\": 1321.1,\n \"accuracy_h\": \"HA3m\",\n \"accuracy_v\": \"VA10m\",\n \"extrapolated\": false\n },\n \"track\": 270,\n \"speed\": 2.2,\n \"speed_accuracy\": \"SA10mpsPlus\",\n \"vertical_speed\": 0\n },\n {\n \"timestamp\": \"{{t_5}}\",\n \"timestamp_accuracy\": 5,\n \"operational_status\": \"Airborne\",\n \"position\": {\n \"lat\": 34.1221,\n \"lng\": -118.4571,\n \"alt\": 1321.1,\n \"accuracy_h\": \"HA3m\",\n \"accuracy_v\": \"VA10m\",\n \"extrapolated\": false\n },\n \"track\": 45,\n \"speed\": 2.3,\n \"speed_accuracy\": \"SA10mpsPlus\",\n \"vertical_speed\": 0\n }\n ],\n \"details_responses\": [\n {\n \"effective_after\": \"{{t_1}}\",\n \"details\": {\n \"id\": \"a3423b-213401-0023\",\n \"operator_id\": \"operator1\",\n \"operator_location\": {\n \"lng\": -118.4561,\n \"lat\": 34.1231\n },\n \"operation_description\": \"SafeFlightDrone company doing survey with DJI Inspire 2. See my privacy policy www.example.com/privacy.\",\n \"serial_number\": \"INTCJ123-4567-891\",\n \"registration_number\": \"FA12345891\"\n }\n }\n ]\n }\n ]\n}", + "raw": "{\n \"requested_flights\": [\n {\n \"injection_id\": \"edb7695f-8737-4b9f-91f8-e2afbb333f41\",\n \"telemetry\": [\n {\n \"timestamp\": \"{{t_1}}\",\n \"timestamp_accuracy\": 5,\n \"operational_status\": \"Airborne\",\n \"position\": {\n \"lat\": 34.1231,\n \"lng\": -118.4561,\n \"alt\": 1321.1,\n \"accuracy_h\": \"HA3m\",\n \"accuracy_v\": \"VA10m\",\n \"extrapolated\": false\n },\n \"track\": 90,\n \"speed\": 1.9,\n \"speed_accuracy\": \"SA10mpsPlus\",\n \"vertical_speed\": 0\n },\n {\n \"timestamp\": \"{{t_2}}\",\n \"timestamp_accuracy\": 5,\n \"operational_status\": \"Airborne\",\n \"position\": {\n \"lat\": 34.1231,\n \"lng\": -118.4551,\n \"alt\": 1321.1,\n \"accuracy_h\": \"HA3m\",\n \"accuracy_v\": \"VA10m\",\n \"extrapolated\": false\n },\n \"track\": 180,\n \"speed\": 2.0,\n \"speed_accuracy\": \"SA10mpsPlus\",\n \"vertical_speed\": 0\n },\n {\n \"timestamp\": \"{{t_3}}\",\n \"timestamp_accuracy\": 5,\n \"operational_status\": \"Airborne\",\n \"position\": {\n \"lat\": 34.1221,\n \"lng\": -118.4551,\n \"alt\": 1321.1,\n \"accuracy_h\": \"HA3m\",\n \"accuracy_v\": \"VA10m\",\n \"extrapolated\": false\n },\n \"track\": 270,\n \"speed\": 2.1,\n \"speed_accuracy\": \"SA10mpsPlus\",\n \"vertical_speed\": 0\n },\n {\n \"timestamp\": \"{{t_4}}\",\n \"timestamp_accuracy\": 5,\n \"operational_status\": \"Airborne\",\n \"position\": {\n \"lat\": 34.1221,\n \"lng\": -118.4561,\n \"alt\": 1321.1,\n \"accuracy_h\": \"HA3m\",\n \"accuracy_v\": \"VA10m\",\n \"extrapolated\": false\n },\n \"track\": 270,\n \"speed\": 2.2,\n \"speed_accuracy\": \"SA10mpsPlus\",\n \"vertical_speed\": 0\n },\n {\n \"timestamp\": \"{{t_5}}\",\n \"timestamp_accuracy\": 5,\n \"operational_status\": \"Airborne\",\n \"position\": {\n \"lat\": 34.1221,\n \"lng\": -118.4571,\n \"alt\": 1321.1,\n \"accuracy_h\": \"HA3m\",\n \"accuracy_v\": \"VA10m\",\n \"extrapolated\": false\n },\n \"track\": 45,\n \"speed\": 2.3,\n \"speed_accuracy\": \"SA10mpsPlus\",\n \"vertical_speed\": 0\n }\n ],\n \"details_responses\": [\n {\n \"effective_after\": \"{{t_1}}\",\n \"details\": {\n \"id\": \"a3423b-213401-0023\",\n \"operator_id\": \"operator1\",\n \"operator_location\": {\n \"lng\": -118.4561,\n \"lat\": 34.1231\n },\n \"operation_description\": \"SafeFlightDrone company doing survey with DJI Inspire 2. See my privacy policy example.interuss.org/privacy.\",\n \"serial_number\": \"INTCJ123-4567-891\",\n \"registration_number\": \"FA12345891\"\n }\n }\n ]\n }\n ]\n}", "options": { "raw": { "language": "json" @@ -613,7 +613,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"operational_intent\": {\n \"state\": \"Accepted\",\n \"priority\": 0,\n \"volumes\": [\n {\n \"volume\": {\n \"outline_polygon\": {\n \"vertices\": [\n {\n \"lng\": -155.6043,\n \"lat\": 19.4763\n },\n {\n \"lng\": -155.5746,\n \"lat\": 19.4884\n },\n {\n \"lng\": -155.5941,\n \"lat\": 19.4516\n }\n ]\n },\n \"altitude_lower\": {\n \"value\": 0,\n \"units\": \"M\",\n \"reference\": \"W84\"\n },\n \"altitude_upper\": {\n \"value\": 122,\n \"units\": \"M\",\n \"reference\": \"W84\"\n }\n },\n \"time_start\": {\n \"value\": \"{{timestamp_start}}\",\n \"format\": \"RFC3339\"\n },\n \"time_end\": {\n \"value\": \"{{timestamp_end}}\",\n \"format\": \"RFC3339\"\n }\n }\n ],\n \"off_nominal_volumes\": []\n },\n \"flight_authorisation\": {\n \"uas_serial_number\": \"TBPADUZCSXBFMTKAUV\",\n \"operation_category\": \"Open\",\n \"operation_mode\": \"Vlos\",\n \"uas_class\": \"C0\",\n \"identification_technologies\": [\n \"ASTMNetRID\"\n ],\n \"connectivity_methods\": [\n \"cellular\"\n ],\n \"endurance_minutes\": 30,\n \"emergency_procedure_url\": \"https://example.com/emergency\",\n \"operator_id\": \"CHEa34mqjq4jshtf-cyn\"\n }\n}", + "raw": "{\n \"operational_intent\": {\n \"state\": \"Accepted\",\n \"priority\": 0,\n \"volumes\": [\n {\n \"volume\": {\n \"outline_polygon\": {\n \"vertices\": [\n {\n \"lng\": -155.6043,\n \"lat\": 19.4763\n },\n {\n \"lng\": -155.5746,\n \"lat\": 19.4884\n },\n {\n \"lng\": -155.5941,\n \"lat\": 19.4516\n }\n ]\n },\n \"altitude_lower\": {\n \"value\": 0,\n \"units\": \"M\",\n \"reference\": \"W84\"\n },\n \"altitude_upper\": {\n \"value\": 122,\n \"units\": \"M\",\n \"reference\": \"W84\"\n }\n },\n \"time_start\": {\n \"value\": \"{{timestamp_start}}\",\n \"format\": \"RFC3339\"\n },\n \"time_end\": {\n \"value\": \"{{timestamp_end}}\",\n \"format\": \"RFC3339\"\n }\n }\n ],\n \"off_nominal_volumes\": []\n },\n \"flight_authorisation\": {\n \"uas_serial_number\": \"TBPADUZCSXBFMTKAUV\",\n \"operation_category\": \"Open\",\n \"operation_mode\": \"Vlos\",\n \"uas_class\": \"C0\",\n \"identification_technologies\": [\n \"ASTMNetRID\"\n ],\n \"connectivity_methods\": [\n \"cellular\"\n ],\n \"endurance_minutes\": 30,\n \"emergency_procedure_url\": \"https://example.interuss.org/emergency\",\n \"operator_id\": \"CHEa34mqjq4jshtf-cyn\"\n }\n}", "options": { "raw": { "language": "json" @@ -1145,4 +1145,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/monitoring/monitorlib/README.md b/monitoring/monitorlib/README.md index 24c31ff8e9..cd1152b054 100644 --- a/monitoring/monitorlib/README.md +++ b/monitoring/monitorlib/README.md @@ -22,14 +22,14 @@ AuthAdapter's `__init__` constructor. Both ordinal (e.g., ### Examples * `NoAuth()` -* `UsernamePassword(https://example.com/token, username=uss1, password=uss1, +* `UsernamePassword(https://example.interuss.org/token, username=uss1, password=uss1, client_id=uss1)` -* `ServiceAccount(https://example.com/token, ~/credentials/account.json)` -* `FlightPassport(https://example.com/oauth/token/, client_id=NdepxcA, client_secret=PSh7DzZdN)` +* `ServiceAccount(https://example.interuss.org/token, ~/credentials/account.json)` +* `FlightPassport(https://example.interuss.org/oauth/token/, client_id=NdepxcA, client_secret=PSh7DzZdN)` * `DummyOAuth(http://localhost:8085/token, sub=fake_uss)` -* `SignedRequest(https://example.com/oauth/token, client_id=uss1.com, +* `SignedRequest(https://example.interuss.org/oauth/token, client_id=uss1.com, key_path=/auth/uss1.key, cert_url=https://uss1.com/uss1.der)` -* `ClientIdClientSecret(https://example.com/token, uss1, dXNzMQ==)` +* `ClientIdClientSecret(https://example.interuss.org/token, uss1, dXNzMQ==)` ### Testing diff --git a/monitoring/prober/README.md b/monitoring/prober/README.md index 61468e0b36..3bdc921ade 100644 --- a/monitoring/prober/README.md +++ b/monitoring/prober/README.md @@ -24,7 +24,7 @@ tokens. See [the auth spec documentation](../monitorlib/README.md#Auth_specs) for the format of these values. Note that if an authorization spec is omitted, the tests that depend on that authorization will be skipped. -Example: `--rid-auth "UsernamePassword(https://example.com/token, username=uss1, +Example: `--rid-auth "UsernamePassword(https://example.interuss.org/token, username=uss1, password=uss1, client_id=uss1)"` ## Running prober via Docker diff --git a/monitoring/prober/rid/v1/test_isa_expiry.py b/monitoring/prober/rid/v1/test_isa_expiry.py index 90612f3738..1572a9b7a0 100644 --- a/monitoring/prober/rid/v1/test_isa_expiry.py +++ b/monitoring/prober/rid/v1/test_isa_expiry.py @@ -49,7 +49,7 @@ def test_create(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/dss", + "flights_url": "https://example.interuss.org/dss", }, ) assert resp.status_code == 200, resp.content diff --git a/monitoring/prober/rid/v1/test_isa_simple.py b/monitoring/prober/rid/v1/test_isa_simple.py index c6a96f003b..363ee3fbf9 100644 --- a/monitoring/prober/rid/v1/test_isa_simple.py +++ b/monitoring/prober/rid/v1/test_isa_simple.py @@ -55,14 +55,14 @@ def test_create_isa(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/dss", + "flights_url": "https://example.interuss.org/dss", } resp = session_ridv1.put("{}/{}".format(ISA_PATH, ids(ISA_TYPE)), json=req_body) assert resp.status_code == 200, resp.content data = resp.json() assert data["service_area"]["id"] == ids(ISA_TYPE) - assert data["service_area"]["flights_url"] == "https://example.com/dss" + assert data["service_area"]["flights_url"] == "https://example.interuss.org/dss" assert_datetimes_are_equal( data["service_area"]["time_start"], req_body["extents"]["time_start"] ) @@ -80,7 +80,7 @@ def test_get_isa_by_id(ids, session_ridv1): data = resp.json() assert data["service_area"]["id"] == ids(ISA_TYPE) - assert data["service_area"]["flights_url"] == "https://example.com/dss" + assert data["service_area"]["flights_url"] == "https://example.interuss.org/dss" @default_scope(Scope.Write) @@ -100,14 +100,14 @@ def test_update_isa(ids, session_ridv1): "altitude_hi": 400, }, }, - "flights_url": "https://example.com/dss/v2", + "flights_url": "https://example.interuss.org/dss/v2", }, ) assert resp.status_code == 200 data = resp.json() assert data["service_area"]["id"] == ids(ISA_TYPE) - assert data["service_area"]["flights_url"] == "https://example.com/dss/v2" + assert data["service_area"]["flights_url"] == "https://example.interuss.org/dss/v2" assert re.match(r"[a-z0-9]{10,}$", data["service_area"]["version"]) assert "subscribers" in data @@ -119,7 +119,7 @@ def test_get_isa_by_id_after_update(ids, session_ridv1): data = resp.json() assert data["service_area"]["id"] == ids(ISA_TYPE) - assert data["service_area"]["flights_url"] == "https://example.com/dss/v2" + assert data["service_area"]["flights_url"] == "https://example.interuss.org/dss/v2" @default_scope(Scope.Read) diff --git a/monitoring/prober/rid/v1/test_isa_simple_heavy_traffic_concurrent.py b/monitoring/prober/rid/v1/test_isa_simple_heavy_traffic_concurrent.py index b9f8f155b2..3bb03e2730 100644 --- a/monitoring/prober/rid/v1/test_isa_simple_heavy_traffic_concurrent.py +++ b/monitoring/prober/rid/v1/test_isa_simple_heavy_traffic_concurrent.py @@ -20,7 +20,7 @@ from uas_standards.astm.f3411.v19.constants import Scope THREAD_COUNT = 10 -FLIGHTS_URL = "https://example.com/dss" +FLIGHTS_URL = "https://example.interuss.org/dss" ISA_PATH = OPERATIONS[OperationID.SearchIdentificationServiceAreas].path ISA_TYPES = [ register_resource_type(224 + i, "Operational intent {}".format(i)) @@ -110,7 +110,7 @@ def test_create_isa_concurrent(ids, session_ridv1_async): assert resp[0] == 200, resp[2] data = resp[2] assert data["service_area"]["id"] == isa_id - assert data["service_area"]["flights_url"] == "https://example.com/dss" + assert data["service_area"]["flights_url"] == "https://example.interuss.org/dss" assert_datetimes_are_equal( data["service_area"]["time_start"], req["extents"]["time_start"] ) diff --git a/monitoring/prober/rid/v1/test_isa_validation.py b/monitoring/prober/rid/v1/test_isa_validation.py index ff9585183c..bae8256172 100644 --- a/monitoring/prober/rid/v1/test_isa_validation.py +++ b/monitoring/prober/rid/v1/test_isa_validation.py @@ -54,7 +54,7 @@ def test_isa_huge_area(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/uss/flights", + "flights_url": "https://example.interuss.org/uss/flights", }, ) assert resp.status_code == 400, resp.content @@ -80,7 +80,7 @@ def test_isa_empty_vertices(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/uss/flights", + "flights_url": "https://example.interuss.org/uss/flights", }, ) assert resp.status_code == 400, resp.content @@ -103,7 +103,7 @@ def test_isa_missing_footprint(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/uss/flights", + "flights_url": "https://example.interuss.org/uss/flights", }, ) assert resp.status_code == 400, resp.content @@ -122,7 +122,7 @@ def test_isa_missing_spatial_volume(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/uss/flights", + "flights_url": "https://example.interuss.org/uss/flights", }, ) assert resp.status_code == 400, resp.content @@ -134,7 +134,7 @@ def test_isa_missing_extents(ids, session_ridv1): resp = session_ridv1.put( "{}/{}".format(ISA_PATH, ids(ISA_TYPE)), json={ - "flights_url": "https://example.com/uss/flights", + "flights_url": "https://example.interuss.org/uss/flights", }, ) assert resp.status_code == 400, resp.content @@ -160,7 +160,7 @@ def test_isa_start_time_in_past(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/uss/flights", + "flights_url": "https://example.interuss.org/uss/flights", }, ) assert resp.status_code == 400, resp.content @@ -189,7 +189,7 @@ def test_isa_start_time_after_time_end(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/uss/flights", + "flights_url": "https://example.interuss.org/uss/flights", }, ) assert resp.status_code == 400, resp.content @@ -223,7 +223,7 @@ def test_isa_not_on_earth(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/uss/flights", + "flights_url": "https://example.interuss.org/uss/flights", }, ) assert resp.status_code == 400, resp.content diff --git a/monitoring/prober/rid/v1/test_subscription_isa_interactions.py b/monitoring/prober/rid/v1/test_subscription_isa_interactions.py index 71b94667c7..a93fbd57d9 100644 --- a/monitoring/prober/rid/v1/test_subscription_isa_interactions.py +++ b/monitoring/prober/rid/v1/test_subscription_isa_interactions.py @@ -73,7 +73,7 @@ def test_create_isa(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/dss", + "flights_url": "https://example.interuss.org/dss", }, ) assert resp.status_code == 200, resp.content @@ -98,7 +98,9 @@ def test_create_subscription(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "callbacks": {"identification_service_area_url": "https://example.com/foo"}, + "callbacks": { + "identification_service_area_url": "https://example.interuss.org/foo" + }, }, ) assert resp.status_code == 200, resp.content @@ -130,7 +132,7 @@ def test_modify_isa(ids, session_ridv1): }, "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/dss", + "flights_url": "https://example.interuss.org/dss", }, scope=Scope.Write, ) @@ -139,7 +141,7 @@ def test_modify_isa(ids, session_ridv1): # The response should include our subscription. data = resp.json() assert { - "url": "https://example.com/foo", + "url": "https://example.interuss.org/foo", "subscriptions": [ { "notification_index": 1, @@ -164,7 +166,7 @@ def test_delete_isa(ids, session_ridv1): # The response should include our subscription. data = resp.json() assert { - "url": "https://example.com/foo", + "url": "https://example.interuss.org/foo", "subscriptions": [ { "notification_index": 2, diff --git a/monitoring/prober/rid/v1/test_subscription_isa_slightly_overlapping.py b/monitoring/prober/rid/v1/test_subscription_isa_slightly_overlapping.py index 42b10303b8..90438b4bba 100644 --- a/monitoring/prober/rid/v1/test_subscription_isa_slightly_overlapping.py +++ b/monitoring/prober/rid/v1/test_subscription_isa_slightly_overlapping.py @@ -72,7 +72,7 @@ def test_create_isa(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/dss", + "flights_url": "https://example.interuss.org/dss", }, ) assert resp.status_code == 200, resp.content @@ -98,7 +98,9 @@ def test_create_subscription(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "callbacks": {"identification_service_area_url": "https://example.com/foo"}, + "callbacks": { + "identification_service_area_url": "https://example.interuss.org/foo" + }, }, ) assert resp.status_code == 200, resp.content @@ -124,7 +126,7 @@ def test_delete_isa(ids, session_ridv1): # The response should include our subscription. data = resp.json() assert { - "url": "https://example.com/foo", + "url": "https://example.interuss.org/foo", "subscriptions": [ { "notification_index": 1, diff --git a/monitoring/prober/rid/v1/test_subscription_simple.py b/monitoring/prober/rid/v1/test_subscription_simple.py index 6f105e6a0f..54fa44fdcc 100644 --- a/monitoring/prober/rid/v1/test_subscription_simple.py +++ b/monitoring/prober/rid/v1/test_subscription_simple.py @@ -65,7 +65,9 @@ def test_create_sub(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "callbacks": {"identification_service_area_url": "https://example.com/foo"}, + "callbacks": { + "identification_service_area_url": "https://example.interuss.org/foo" + }, } resp = session_ridv1.put( "{}/{}".format(SUBSCRIPTION_PATH, ids(SUB_TYPE)), json=req_body @@ -76,7 +78,7 @@ def test_create_sub(ids, session_ridv1): assert data["subscription"]["id"] == ids(SUB_TYPE) assert data["subscription"]["notification_index"] == 0 assert data["subscription"]["callbacks"] == { - "identification_service_area_url": "https://example.com/foo" + "identification_service_area_url": "https://example.interuss.org/foo" } assert_datetimes_are_equal( data["subscription"]["time_start"], req_body["extents"]["time_start"] @@ -98,7 +100,7 @@ def test_get_sub_by_id(ids, session_ridv1): assert data["subscription"]["id"] == ids(SUB_TYPE) assert data["subscription"]["notification_index"] == 0 assert data["subscription"]["callbacks"] == { - "identification_service_area_url": "https://example.com/foo" + "identification_service_area_url": "https://example.interuss.org/foo" } diff --git a/monitoring/prober/rid/v1/test_subscription_validation.py b/monitoring/prober/rid/v1/test_subscription_validation.py index c8239ef464..528daab188 100644 --- a/monitoring/prober/rid/v1/test_subscription_validation.py +++ b/monitoring/prober/rid/v1/test_subscription_validation.py @@ -65,7 +65,9 @@ def test_create_sub_empty_vertices(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "callbacks": {"identification_service_area_url": "https://example.com/foo"}, + "callbacks": { + "identification_service_area_url": "https://example.interuss.org/foo" + }, }, ) assert resp.status_code == 400, resp.content @@ -87,7 +89,9 @@ def test_create_sub_missing_footprint(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "callbacks": {"identification_service_area_url": "https://example.com/foo"}, + "callbacks": { + "identification_service_area_url": "https://example.interuss.org/foo" + }, }, ) assert resp.status_code == 400, resp.content @@ -112,7 +116,9 @@ def test_create_sub_with_huge_area(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "callbacks": {"identification_service_area_url": "https://example.com/foo"}, + "callbacks": { + "identification_service_area_url": "https://example.interuss.org/foo" + }, }, ) assert resp.status_code == 400, resp.content @@ -159,7 +165,7 @@ def test_create_too_many_subs(ids, session_ridv1): "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, "callbacks": { - "identification_service_area_url": "https://example.com/foo" + "identification_service_area_url": "https://example.interuss.org/foo" }, }, ) @@ -202,7 +208,9 @@ def test_create_sub_with_too_long_end_time(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "callbacks": {"identification_service_area_url": "https://example.com/foo"}, + "callbacks": { + "identification_service_area_url": "https://example.interuss.org/foo" + }, }, ) assert resp.status_code == 400, resp.content @@ -226,7 +234,9 @@ def test_update_sub_with_too_long_end_time(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "callbacks": {"identification_service_area_url": "https://example.com/foo"}, + "callbacks": { + "identification_service_area_url": "https://example.interuss.org/foo" + }, }, ) assert resp.status_code == 200, resp.content @@ -248,7 +258,9 @@ def test_update_sub_with_too_long_end_time(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "callbacks": {"identification_service_area_url": "https://example.com/foo"}, + "callbacks": { + "identification_service_area_url": "https://example.interuss.org/foo" + }, }, ) assert resp.status_code == 400, resp.content diff --git a/monitoring/prober/rid/v1/test_token_validation.py b/monitoring/prober/rid/v1/test_token_validation.py index 37b2d2064d..25eec87c78 100644 --- a/monitoring/prober/rid/v1/test_token_validation.py +++ b/monitoring/prober/rid/v1/test_token_validation.py @@ -54,7 +54,7 @@ def test_put_isa_with_read_only_scope_token(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/dss", + "flights_url": "https://example.interuss.org/dss", }, scope=Scope.Read, ) @@ -79,7 +79,7 @@ def test_create_isa(ids, session_ridv1): "time_start": time_start.strftime(rid_v1.DATE_FORMAT), "time_end": time_end.strftime(rid_v1.DATE_FORMAT), }, - "flights_url": "https://example.com/dss", + "flights_url": "https://example.interuss.org/dss", }, scope=Scope.Write, ) diff --git a/monitoring/prober/rid/v2/test_isa_expiry.py b/monitoring/prober/rid/v2/test_isa_expiry.py index f2ab513e96..43a6475add 100644 --- a/monitoring/prober/rid/v2/test_isa_expiry.py +++ b/monitoring/prober/rid/v2/test_isa_expiry.py @@ -53,7 +53,7 @@ def test_create(ids, session_ridv2): "time_start": rid_v2.make_time(time_start), "time_end": rid_v2.make_time(time_end), }, - "uss_base_url": "https://example.com/ridv2", + "uss_base_url": "https://example.interuss.org/ridv2", }, ) assert resp.status_code == 200, resp.content diff --git a/monitoring/prober/rid/v2/test_isa_simple.py b/monitoring/prober/rid/v2/test_isa_simple.py index c00fc01f52..b0d441045a 100644 --- a/monitoring/prober/rid/v2/test_isa_simple.py +++ b/monitoring/prober/rid/v2/test_isa_simple.py @@ -21,8 +21,8 @@ ISA_PATH = OPERATIONS[OperationID.SearchIdentificationServiceAreas].path ISA_TYPE = register_resource_type(348, "ISA") -BASE_URL_V1 = "https://example.com/rid/v2" -BASE_URL_V2 = "https://s2.example.com/rid/v2" +BASE_URL_V1 = "https://example.interuss.org/rid/v2" +BASE_URL_V2 = "https://s2.example.interuss.org/rid/v2" def test_ensure_clean_workspace(ids, session_ridv2): diff --git a/monitoring/prober/rid/v2/test_isa_validation.py b/monitoring/prober/rid/v2/test_isa_validation.py index 1085b90ac2..89783e39ce 100644 --- a/monitoring/prober/rid/v2/test_isa_validation.py +++ b/monitoring/prober/rid/v2/test_isa_validation.py @@ -19,7 +19,7 @@ ISA_PATH = OPERATIONS[OperationID.SearchIdentificationServiceAreas].path ISA_TYPE = register_resource_type(366, "ISA") -BASE_URL = "https://example.com/rid/v2" +BASE_URL = "https://example.interuss.org/rid/v2" def test_ensure_clean_workspace(ids, session_ridv2): diff --git a/monitoring/prober/rid/v2/test_subscription_isa_interactions.py b/monitoring/prober/rid/v2/test_subscription_isa_interactions.py index aba95c46a2..6540b082fc 100644 --- a/monitoring/prober/rid/v2/test_subscription_isa_interactions.py +++ b/monitoring/prober/rid/v2/test_subscription_isa_interactions.py @@ -22,7 +22,7 @@ SUBSCRIPTION_PATH = OPERATIONS[OperationID.SearchSubscriptions].path ISA_TYPE = register_resource_type(364, "ISA") SUB_TYPE = register_resource_type(365, "Subscription") -BASE_URL = "https://example.com/rid/v2" +BASE_URL = "https://example.interuss.org/rid/v2" def test_ensure_clean_workspace(ids, session_ridv2): diff --git a/monitoring/prober/rid/v2/test_subscription_simple.py b/monitoring/prober/rid/v2/test_subscription_simple.py index f1df8557d6..1d3b6d1873 100644 --- a/monitoring/prober/rid/v2/test_subscription_simple.py +++ b/monitoring/prober/rid/v2/test_subscription_simple.py @@ -21,7 +21,7 @@ SUBSCRIPTION_PATH = OPERATIONS[OperationID.SearchSubscriptions].path SUB_TYPE = register_resource_type(349, "Subscription") -BASE_URL = "https://example.com/rid/v2" +BASE_URL = "https://example.interuss.org/rid/v2" def test_ensure_clean_workspace(ids, session_ridv2): diff --git a/monitoring/prober/rid/v2/test_subscription_validation.py b/monitoring/prober/rid/v2/test_subscription_validation.py index 5de477e77e..4dcf2050a4 100644 --- a/monitoring/prober/rid/v2/test_subscription_validation.py +++ b/monitoring/prober/rid/v2/test_subscription_validation.py @@ -27,7 +27,7 @@ register_resource_type(351 + i, "Subscription limit Subscription {}".format(i)) for i in range(11) ] -BASE_URL = "https://example.com/rid/v2" +BASE_URL = "https://example.interuss.org/rid/v2" def test_ensure_clean_workspace(ids, session_ridv2): diff --git a/monitoring/prober/rid/v2/test_token_validation.py b/monitoring/prober/rid/v2/test_token_validation.py index b0ab7a1339..c179ff1a76 100644 --- a/monitoring/prober/rid/v2/test_token_validation.py +++ b/monitoring/prober/rid/v2/test_token_validation.py @@ -20,7 +20,7 @@ ISA_PATH = OPERATIONS[OperationID.SearchIdentificationServiceAreas].path ISA_TYPE = register_resource_type(363, "ISA") -BASE_URL = "https://example.com/rid/v2" +BASE_URL = "https://example.interuss.org/rid/v2" def test_ensure_clean_workspace(ids, session_ridv2): diff --git a/monitoring/prober/scd/resources/op_missing_initial.yaml b/monitoring/prober/scd/resources/op_missing_initial.yaml index 6110bb6daf..8a8f508688 100644 --- a/monitoring/prober/scd/resources/op_missing_initial.yaml +++ b/monitoring/prober/scd/resources/op_missing_initial.yaml @@ -463,7 +463,7 @@ extents: value: 18.288000000000004 old_version: 0 state: 'Accepted' -uss_base_url: 'https://example.com' +uss_base_url: 'https://example.interuss.org' new_subscription: - uss_base_url: 'https://example.com' + uss_base_url: 'https://example.interuss.org' notify_for_constraints: false diff --git a/monitoring/prober/scd/resources/op_missing_preexisting_unknown.yaml b/monitoring/prober/scd/resources/op_missing_preexisting_unknown.yaml index fce00f872f..be98916b53 100644 --- a/monitoring/prober/scd/resources/op_missing_preexisting_unknown.yaml +++ b/monitoring/prober/scd/resources/op_missing_preexisting_unknown.yaml @@ -1223,7 +1223,7 @@ extents: value: 18.288000000000004 old_version: 0 state: 'Accepted' -uss_base_url: 'https://example.com' +uss_base_url: 'https://example.interuss.org' new_subscription: - uss_base_url: 'https://example.com' + uss_base_url: 'https://example.interuss.org' notify_for_constraints: false diff --git a/monitoring/prober/scd/resources/op_missing_update.json b/monitoring/prober/scd/resources/op_missing_update.json index 2a9a6c3ce6..27a8b595a1 100644 --- a/monitoring/prober/scd/resources/op_missing_update.json +++ b/monitoring/prober/scd/resources/op_missing_update.json @@ -1 +1 @@ -{"extents":[{"volume":{"outline_circle":{"center":{"lat":37.194388343324945,"lng":-80.57495490834552},"radius":{"value":18.288000000000004,"units":"M"}},"altitude_lower":{"value":513.8698842884496,"units":"M","reference":"W84"},"altitude_upper":{"value":619.6420980452857,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.194491378836545,"lng":-80.57488689307178},{"lat":37.194333931395036,"lng":-80.57482611334737},{"lat":37.194431681526204,"lng":-80.57443045363924},{"lat":37.194589129066074,"lng":-80.57449123303331}]},"altitude_lower":{"value":591.5172779547146,"units":"M","reference":"W84"},"altitude_upper":{"value":609.9812999547145,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.194540505887794,"lng":-80.57468804372728},{"lat":37.19438305834558,"lng":-80.57462726437642},{"lat":37.19452943033215,"lng":-80.57403479291237},{"lat":37.19468687797145,"lng":-80.57409557197188}]},"altitude_lower":{"value":591.6932999547145,"units":"M","reference":"W84"},"altitude_upper":{"value":610.1573219547145,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.194638255338255,"lng":-80.57429238290587},{"lat":37.19448080759567,"lng":-80.57423160429825},{"lat":37.19462717760119,"lng":-80.5736391313066},{"lat":37.194784625440846,"lng":-80.57369990962287}]},"altitude_lower":{"value":591.8693219547146,"units":"M","reference":"W84"},"altitude_upper":{"value":610.3333439547146,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.194736003465735,"lng":-80.57389672106429},{"lat":37.19457855552278,"lng":-80.57383594319992},{"lat":37.194676302343076,"lng":-80.57344028093874},{"lat":37.194833750384404,"lng":-80.57350105847279}]},"altitude_lower":{"value":592.0453439547147,"units":"M","reference":"W84"},"altitude_upper":{"value":610.5093659547147,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_circle":{"center":{"lat":37.194779336763915,"lng":-80.57337226349118},"radius":{"value":18.288000000000004,"units":"M"}},"altitude_lower":{"value":601.8803774348831,"units":"M","reference":"W84"},"altitude_upper":{"value":620.4551434348831,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19480032165406,"lng":-80.57351553379179},{"lat":37.19489395176885,"lng":-80.57334603195592},{"lat":37.1951659552437,"lng":-80.57358080411801},{"lat":37.19507232496575,"lng":-80.57375030641744}]},"altitude_lower":{"value":592.2231525651171,"units":"M","reference":"W84"},"altitude_upper":{"value":610.6218965651171,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19493672515842,"lng":-80.57363326676561},{"lat":37.19503035543951,"lng":-80.57346376477021},{"lat":37.19543795824092,"lng":-80.57381557796566},{"lat":37.19534432779883,"lng":-80.57398508072777}]},"altitude_lower":{"value":592.3338965651171,"units":"M","reference":"W84"},"altitude_upper":{"value":610.7326405651171,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19520872808815,"lng":-80.57386804026861},{"lat":37.195302358700815,"lng":-80.57369853795501},{"lat":37.19557436145832,"lng":-80.57393331264632},{"lat":37.195480730682505,"lng":-80.57410281542346}]},"altitude_lower":{"value":592.4446405651171,"units":"M","reference":"W84"},"altitude_upper":{"value":610.8433845651172,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_circle":{"center":{"lat":37.19559534569321,"lng":-80.57407658478247},"radius":{"value":18.288000000000004,"units":"M"}},"altitude_lower":{"value":602.2786821870917,"units":"M","reference":"W84"},"altitude_upper":{"value":620.6774261870917,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.195537608936526,"lng":-80.57420309974408},{"lat":37.19569655555399,"lng":-80.57414875728205},{"lat":37.19580308487554,"lng":-80.57463563913176},{"lat":37.19564413816981,"lng":-80.57468998125361}]},"altitude_lower":{"value":592.5078538129086,"units":"M","reference":"W84"},"altitude_upper":{"value":610.8425898129086,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19560066552956,"lng":-80.57449129320732},{"lat":37.19575961227751,"lng":-80.57443695130425},{"lat":37.195909612139715,"lng":-80.57512252246912},{"lat":37.195750665304665,"lng":-80.57517686406315}]},"altitude_lower":{"value":592.4611178129086,"units":"M","reference":"W84"},"altitude_upper":{"value":610.7958538129086,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19570719326955,"lng":-80.57497817530722},{"lat":37.19586614023797,"lng":-80.57492383434852},{"lat":37.19597266637114,"lng":-80.57541071837622},{"lat":37.19581371931445,"lng":-80.57546505899475}]},"altitude_lower":{"value":592.4143818129086,"units":"M","reference":"W84"},"altitude_upper":{"value":610.7491178129086,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_circle":{"center":{"lat":37.1959149280179,"lng":-80.57553723333619},"radius":{"value":18.288000000000004,"units":"M"}},"altitude_lower":{"value":602.0268387747924,"units":"M","reference":"W84"},"altitude_upper":{"value":620.5856027747924,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.195860172888146,"lng":-80.57540866322573},{"lat":37.19581207447154,"lng":-80.57560567882278},{"lat":37.19543068994795,"lng":-80.5754601885082},{"lat":37.19547878826768,"lng":-80.57526317386404}]},"altitude_lower":{"value":592.1887052252079,"units":"M","reference":"W84"},"altitude_upper":{"value":610.7007332252078,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19563639689383,"lng":-80.575323297759},{"lat":37.195588298617366,"lng":-80.57552031282871},{"lat":37.195049305235685,"lng":-80.57531469969159},{"lat":37.19509740341656,"lng":-80.57511768598428}]},"altitude_lower":{"value":591.9646772252079,"units":"M","reference":"W84"},"altitude_upper":{"value":610.4767052252079,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19525501206147,"lng":-80.57517780931778},{"lat":37.195206914023835,"lng":-80.57537482348877},{"lat":37.194667920354874,"lng":-80.57516921242014},{"lat":37.194716018296894,"lng":-80.57497219961152}]},"altitude_lower":{"value":591.7406492252079,"units":"M","reference":"W84"},"altitude_upper":{"value":610.2526772252079,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.194873627025814,"lng":-80.57503232234018},{"lat":37.19482552922702,"lng":-80.57522933561248},{"lat":37.19428653527077,"lng":-80.57502372661229},{"lat":37.19433463297397,"lng":-80.57482671470235}]},"altitude_lower":{"value":591.5166212252078,"units":"M","reference":"W84"},"altitude_upper":{"value":610.0286492252079,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_circle":{"center":{"lat":37.194389388591524,"lng":-80.57495528191076},"radius":{"value":18.288000000000004,"units":"M"}},"altitude_lower":{"value":513.8698847097429,"units":"M","reference":"W84"},"altitude_upper":{"value":619.642098466579,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}}],"old_version":1,"uss_base_url":"https://example.com","state":"Activated"} +{"extents":[{"volume":{"outline_circle":{"center":{"lat":37.194388343324945,"lng":-80.57495490834552},"radius":{"value":18.288000000000004,"units":"M"}},"altitude_lower":{"value":513.8698842884496,"units":"M","reference":"W84"},"altitude_upper":{"value":619.6420980452857,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.194491378836545,"lng":-80.57488689307178},{"lat":37.194333931395036,"lng":-80.57482611334737},{"lat":37.194431681526204,"lng":-80.57443045363924},{"lat":37.194589129066074,"lng":-80.57449123303331}]},"altitude_lower":{"value":591.5172779547146,"units":"M","reference":"W84"},"altitude_upper":{"value":609.9812999547145,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.194540505887794,"lng":-80.57468804372728},{"lat":37.19438305834558,"lng":-80.57462726437642},{"lat":37.19452943033215,"lng":-80.57403479291237},{"lat":37.19468687797145,"lng":-80.57409557197188}]},"altitude_lower":{"value":591.6932999547145,"units":"M","reference":"W84"},"altitude_upper":{"value":610.1573219547145,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.194638255338255,"lng":-80.57429238290587},{"lat":37.19448080759567,"lng":-80.57423160429825},{"lat":37.19462717760119,"lng":-80.5736391313066},{"lat":37.194784625440846,"lng":-80.57369990962287}]},"altitude_lower":{"value":591.8693219547146,"units":"M","reference":"W84"},"altitude_upper":{"value":610.3333439547146,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.194736003465735,"lng":-80.57389672106429},{"lat":37.19457855552278,"lng":-80.57383594319992},{"lat":37.194676302343076,"lng":-80.57344028093874},{"lat":37.194833750384404,"lng":-80.57350105847279}]},"altitude_lower":{"value":592.0453439547147,"units":"M","reference":"W84"},"altitude_upper":{"value":610.5093659547147,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_circle":{"center":{"lat":37.194779336763915,"lng":-80.57337226349118},"radius":{"value":18.288000000000004,"units":"M"}},"altitude_lower":{"value":601.8803774348831,"units":"M","reference":"W84"},"altitude_upper":{"value":620.4551434348831,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19480032165406,"lng":-80.57351553379179},{"lat":37.19489395176885,"lng":-80.57334603195592},{"lat":37.1951659552437,"lng":-80.57358080411801},{"lat":37.19507232496575,"lng":-80.57375030641744}]},"altitude_lower":{"value":592.2231525651171,"units":"M","reference":"W84"},"altitude_upper":{"value":610.6218965651171,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19493672515842,"lng":-80.57363326676561},{"lat":37.19503035543951,"lng":-80.57346376477021},{"lat":37.19543795824092,"lng":-80.57381557796566},{"lat":37.19534432779883,"lng":-80.57398508072777}]},"altitude_lower":{"value":592.3338965651171,"units":"M","reference":"W84"},"altitude_upper":{"value":610.7326405651171,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19520872808815,"lng":-80.57386804026861},{"lat":37.195302358700815,"lng":-80.57369853795501},{"lat":37.19557436145832,"lng":-80.57393331264632},{"lat":37.195480730682505,"lng":-80.57410281542346}]},"altitude_lower":{"value":592.4446405651171,"units":"M","reference":"W84"},"altitude_upper":{"value":610.8433845651172,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_circle":{"center":{"lat":37.19559534569321,"lng":-80.57407658478247},"radius":{"value":18.288000000000004,"units":"M"}},"altitude_lower":{"value":602.2786821870917,"units":"M","reference":"W84"},"altitude_upper":{"value":620.6774261870917,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.195537608936526,"lng":-80.57420309974408},{"lat":37.19569655555399,"lng":-80.57414875728205},{"lat":37.19580308487554,"lng":-80.57463563913176},{"lat":37.19564413816981,"lng":-80.57468998125361}]},"altitude_lower":{"value":592.5078538129086,"units":"M","reference":"W84"},"altitude_upper":{"value":610.8425898129086,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19560066552956,"lng":-80.57449129320732},{"lat":37.19575961227751,"lng":-80.57443695130425},{"lat":37.195909612139715,"lng":-80.57512252246912},{"lat":37.195750665304665,"lng":-80.57517686406315}]},"altitude_lower":{"value":592.4611178129086,"units":"M","reference":"W84"},"altitude_upper":{"value":610.7958538129086,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19570719326955,"lng":-80.57497817530722},{"lat":37.19586614023797,"lng":-80.57492383434852},{"lat":37.19597266637114,"lng":-80.57541071837622},{"lat":37.19581371931445,"lng":-80.57546505899475}]},"altitude_lower":{"value":592.4143818129086,"units":"M","reference":"W84"},"altitude_upper":{"value":610.7491178129086,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_circle":{"center":{"lat":37.1959149280179,"lng":-80.57553723333619},"radius":{"value":18.288000000000004,"units":"M"}},"altitude_lower":{"value":602.0268387747924,"units":"M","reference":"W84"},"altitude_upper":{"value":620.5856027747924,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.195860172888146,"lng":-80.57540866322573},{"lat":37.19581207447154,"lng":-80.57560567882278},{"lat":37.19543068994795,"lng":-80.5754601885082},{"lat":37.19547878826768,"lng":-80.57526317386404}]},"altitude_lower":{"value":592.1887052252079,"units":"M","reference":"W84"},"altitude_upper":{"value":610.7007332252078,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19563639689383,"lng":-80.575323297759},{"lat":37.195588298617366,"lng":-80.57552031282871},{"lat":37.195049305235685,"lng":-80.57531469969159},{"lat":37.19509740341656,"lng":-80.57511768598428}]},"altitude_lower":{"value":591.9646772252079,"units":"M","reference":"W84"},"altitude_upper":{"value":610.4767052252079,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.19525501206147,"lng":-80.57517780931778},{"lat":37.195206914023835,"lng":-80.57537482348877},{"lat":37.194667920354874,"lng":-80.57516921242014},{"lat":37.194716018296894,"lng":-80.57497219961152}]},"altitude_lower":{"value":591.7406492252079,"units":"M","reference":"W84"},"altitude_upper":{"value":610.2526772252079,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_polygon":{"vertices":[{"lat":37.194873627025814,"lng":-80.57503232234018},{"lat":37.19482552922702,"lng":-80.57522933561248},{"lat":37.19428653527077,"lng":-80.57502372661229},{"lat":37.19433463297397,"lng":-80.57482671470235}]},"altitude_lower":{"value":591.5166212252078,"units":"M","reference":"W84"},"altitude_upper":{"value":610.0286492252079,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}},{"volume":{"outline_circle":{"center":{"lat":37.194389388591524,"lng":-80.57495528191076},"radius":{"value":18.288000000000004,"units":"M"}},"altitude_lower":{"value":513.8698847097429,"units":"M","reference":"W84"},"altitude_upper":{"value":619.642098466579,"units":"M","reference":"W84"}},"time_start":{"value":"2020-09-16T19:25:00Z","format":"RFC3339"},"time_end":{"value":"2020-09-16T20:25:00Z","format":"RFC3339"}}],"old_version":1,"uss_base_url":"https://example.interuss.org","state":"Activated"} diff --git a/monitoring/prober/scd/test_constraint_simple.py b/monitoring/prober/scd/test_constraint_simple.py index a9c412ab5e..fc35333ef1 100644 --- a/monitoring/prober/scd/test_constraint_simple.py +++ b/monitoring/prober/scd/test_constraint_simple.py @@ -32,7 +32,7 @@ import pytest -BASE_URL = "https://example.com/uss" +BASE_URL = "https://example.interuss.org/uss" CONSTRAINT_TYPE = register_resource_type(1, "Single constraint") @@ -304,7 +304,7 @@ def test_mutate_constraint(ids, scd_api, scd_session): "key": [existing_constraint["ovn"]], "extents": req["extents"], "old_version": existing_constraint["version"], - "uss_base_url": "https://example.com/uss2", + "uss_base_url": "https://example.interuss.org/uss2", } ovn = existing_constraint["ovn"] @@ -337,7 +337,7 @@ def test_mutate_constraint(ids, scd_api, scd_session): data = resp.json() constraint = data["constraint_reference"] assert constraint["id"] == id - assert constraint["uss_base_url"] == "https://example.com/uss2" + assert constraint["uss_base_url"] == "https://example.interuss.org/uss2" assert constraint["uss_availability"] == "Unknown" assert constraint["version"] == 2 @@ -357,7 +357,7 @@ def test_delete_constraint(ids, scd_api, scd_session): "key": [existing_constraint["ovn"]], "extents": req["extents"], "old_version": existing_constraint["version"], - "uss_base_url": "https://example.com/uss2", + "uss_base_url": "https://example.interuss.org/uss2", } ovn = existing_constraint["ovn"] diff --git a/monitoring/prober/scd/test_constraints_with_subscriptions.py b/monitoring/prober/scd/test_constraints_with_subscriptions.py index 6b4bd54d63..6e32aa9b3c 100644 --- a/monitoring/prober/scd/test_constraints_with_subscriptions.py +++ b/monitoring/prober/scd/test_constraints_with_subscriptions.py @@ -20,11 +20,11 @@ from monitoring.prober.scd import actions -CONSTRAINT_BASE_URL_1 = "https://example.com/con1/uss" -CONSTRAINT_BASE_URL_2 = "https://example.com/con2/uss" -CONSTRAINT_BASE_URL_3 = "https://example.com/con3/uss" -SUB_BASE_URL_A = "https://example.com/sub1/uss" -SUB_BASE_URL_B = "https://example.com/sub2/uss" +CONSTRAINT_BASE_URL_1 = "https://example.interuss.org/con1/uss" +CONSTRAINT_BASE_URL_2 = "https://example.interuss.org/con2/uss" +CONSTRAINT_BASE_URL_3 = "https://example.interuss.org/con3/uss" +SUB_BASE_URL_A = "https://example.interuss.org/sub1/uss" +SUB_BASE_URL_B = "https://example.interuss.org/sub2/uss" CONSTRAINT_TYPE = register_resource_type(2, "Single constraint") SUB1_TYPE = register_resource_type(3, "Constraint subscription 1") diff --git a/monitoring/prober/scd/test_operation_simple.py b/monitoring/prober/scd/test_operation_simple.py index 330ac6ea16..f36e3e529c 100644 --- a/monitoring/prober/scd/test_operation_simple.py +++ b/monitoring/prober/scd/test_operation_simple.py @@ -24,7 +24,7 @@ from monitoring.prober.scd import actions -BASE_URL = "https://example.com/uss" +BASE_URL = "https://example.interuss.org/uss" OP_TYPE = register_resource_type(341, "Operational intent") @@ -372,7 +372,7 @@ def test_mutate_op(ids, scd_api, scd_session, scd_session_cp, scd_session_cm): "extents": req["extents"], "old_version": existing_op["version"], "state": "Activated", - "uss_base_url": "https://example.com/uss2", + "uss_base_url": "https://example.interuss.org/uss2", "subscription_id": existing_op["subscription_id"], } @@ -402,7 +402,7 @@ def test_mutate_op(ids, scd_api, scd_session, scd_session_cp, scd_session_cm): data = resp.json() op = data["operational_intent_reference"] assert op["id"] == ids(OP_TYPE) - assert op["uss_base_url"] == "https://example.com/uss2" + assert op["uss_base_url"] == "https://example.interuss.org/uss2" assert op["version"] == 2 assert op["subscription_id"] == existing_op["subscription_id"] # assert 'state' not in op diff --git a/monitoring/prober/scd/test_operation_simple_heavy_traffic.py b/monitoring/prober/scd/test_operation_simple_heavy_traffic.py index 0ce196990d..65fc6c2ad2 100644 --- a/monitoring/prober/scd/test_operation_simple_heavy_traffic.py +++ b/monitoring/prober/scd/test_operation_simple_heavy_traffic.py @@ -24,7 +24,7 @@ from monitoring.prober.scd import actions -BASE_URL = "https://example.com/uss" +BASE_URL = "https://example.interuss.org/uss" OP_TYPES = [ register_resource_type(10 + i, "Operational intent {}".format(i)) for i in range(20) ] @@ -259,7 +259,7 @@ def test_mutate_ops(ids, scd_api, scd_session): "extents": req["extents"], "old_version": existing_op["version"], "state": "Activated", - "uss_base_url": "https://example.com/uss2", + "uss_base_url": "https://example.interuss.org/uss2", "subscription_id": existing_op["subscription_id"], } @@ -273,7 +273,7 @@ def test_mutate_ops(ids, scd_api, scd_session): data = resp.json() op = data["operational_intent_reference"] assert op["id"] == op_id - assert op["uss_base_url"] == "https://example.com/uss2" + assert op["uss_base_url"] == "https://example.interuss.org/uss2" assert op["uss_availability"] == "Unknown" assert op["version"] != existing_op["version"] assert op["subscription_id"] == existing_op["subscription_id"] diff --git a/monitoring/prober/scd/test_operation_simple_heavy_traffic_concurrent.py b/monitoring/prober/scd/test_operation_simple_heavy_traffic_concurrent.py index b11d1b4e73..3c9937cb51 100644 --- a/monitoring/prober/scd/test_operation_simple_heavy_traffic_concurrent.py +++ b/monitoring/prober/scd/test_operation_simple_heavy_traffic_concurrent.py @@ -32,7 +32,7 @@ from monitoring.prober.scd import actions -BASE_URL = "https://example.com/uss" +BASE_URL = "https://example.interuss.org/uss" # TODO(#742): Increase number of concurrent operations from 20 to 100 OP_TYPES = [ register_resource_type(110 + i, "Operational intent {}".format(i)) @@ -210,7 +210,7 @@ def _build_mutate_request(idx, op_id, op_map, scd_session, scd_api): "extents": req["extents"], "old_version": existing_op["version"], "state": "Activated", - "uss_base_url": "https://example.com/uss2", + "uss_base_url": "https://example.interuss.org/uss2", "subscription_id": existing_op["subscription_id"], } return req @@ -458,7 +458,7 @@ def test_mutate_ops_concurrent(ids, scd_api, scd_session, scd_session_async): data = resp["content"] op = data["operational_intent_reference"] assert op["id"] == op_id - assert op["uss_base_url"] == "https://example.com/uss2" + assert op["uss_base_url"] == "https://example.interuss.org/uss2" assert op["version"] == 2 assert op["subscription_id"] == existing_op["subscription_id"] diff --git a/monitoring/prober/scd/test_operation_special_cases.py b/monitoring/prober/scd/test_operation_special_cases.py index 95ccd85da4..f7ea0a5143 100644 --- a/monitoring/prober/scd/test_operation_special_cases.py +++ b/monitoring/prober/scd/test_operation_special_cases.py @@ -118,7 +118,7 @@ def test_id_conversion_bug(ids, scd_api, scd_session): "time_end": {"value": time_end.isoformat() + "Z", "format": "RFC3339"}, }, "old_version": 0, - "uss_base_url": "https://example.com/uss/v1/", + "uss_base_url": "https://example.interuss.org/uss/v1/", "notify_for_constraints": True, } resp = scd_session.put("/subscriptions/{}".format(sub_uuid), json=req) diff --git a/monitoring/prober/scd/test_operations_simple.py b/monitoring/prober/scd/test_operations_simple.py index ed477a787e..2b5a05f264 100644 --- a/monitoring/prober/scd/test_operations_simple.py +++ b/monitoring/prober/scd/test_operations_simple.py @@ -22,10 +22,10 @@ from monitoring.prober.scd import actions -URL_OP1 = "https://example.com/op1/dss" -URL_SUB1 = "https://example.com/subs1/dss" -URL_OP2 = "https://example.com/op2/dss" -URL_SUB2 = "https://example.com/subs2/dss" +URL_OP1 = "https://example.interuss.org/op1/dss" +URL_SUB1 = "https://example.interuss.org/subs1/dss" +URL_OP2 = "https://example.interuss.org/op2/dss" +URL_SUB2 = "https://example.interuss.org/subs2/dss" OP1_TYPE = register_resource_type(213, "Operational intent 1") OP2_TYPE = register_resource_type(214, "Operational intent 2") diff --git a/monitoring/prober/scd/test_subscription_queries.py b/monitoring/prober/scd/test_subscription_queries.py index 7b63d59419..c8c3389bd0 100644 --- a/monitoring/prober/scd/test_subscription_queries.py +++ b/monitoring/prober/scd/test_subscription_queries.py @@ -36,7 +36,7 @@ def _make_sub1_req(scd_api): "extents": Volume4D.from_values( None, time_end, 0, 300, Circle.from_meters(lat, LNG0, 100) ).to_f3548v21(), - "uss_base_url": "https://example.com/foo", + "uss_base_url": "https://example.interuss.org/foo", "notify_for_constraints": False, } req.update({"notify_for_operational_intents": True}) @@ -51,7 +51,7 @@ def _make_sub2_req(scd_api): time_start, time_end, 350, 650, Circle.from_meters(LAT0, LNG0, 100) ).to_f3548v21(), "old_version": 0, - "uss_base_url": "https://example.com/foo", + "uss_base_url": "https://example.interuss.org/foo", "notify_for_operations": True, "notify_for_constraints": False, } @@ -67,7 +67,7 @@ def _make_sub3_req(scd_api): "extents": Volume4D.from_values( time_start, time_end, 700, 1000, Circle.from_meters(lat, LNG0, 100) ).to_f3548v21(), - "uss_base_url": "https://example.com/foo", + "uss_base_url": "https://example.interuss.org/foo", "notify_for_constraints": False, } req.update({"notify_for_operational_intents": True}) diff --git a/monitoring/prober/scd/test_subscription_query_time.py b/monitoring/prober/scd/test_subscription_query_time.py index 47e8d2d0fd..60eca25789 100644 --- a/monitoring/prober/scd/test_subscription_query_time.py +++ b/monitoring/prober/scd/test_subscription_query_time.py @@ -12,7 +12,7 @@ from monitoring.monitorlib.scd import SCOPE_SC from monitoring.prober.infrastructure import for_api_versions, register_resource_type -BASE_URL = "https://example.com/uss" +BASE_URL = "https://example.interuss.org/uss" SUB_TYPE = register_resource_type(219, "Subscription") diff --git a/monitoring/prober/scd/test_subscription_simple.py b/monitoring/prober/scd/test_subscription_simple.py index bcd217c0fd..6ee7cfbae6 100644 --- a/monitoring/prober/scd/test_subscription_simple.py +++ b/monitoring/prober/scd/test_subscription_simple.py @@ -40,7 +40,7 @@ def _make_sub1_req(scd_api): "extents": Volume4D.from_values( time_start, time_end, 0, 1000, Circle.from_meters(12, -34, 300) ).to_f3548v21(), - "uss_base_url": "https://example.com/foo", + "uss_base_url": "https://example.interuss.org/foo", "notify_for_constraints": False, } req.update({"notify_for_operational_intents": True}) @@ -52,7 +52,7 @@ def _check_sub1(data, sub_id, scd_api): assert ("notification_index" not in data["subscription"]) or ( data["subscription"]["notification_index"] == 0 ) - assert data["subscription"]["uss_base_url"] == "https://example.com/foo" + assert data["subscription"]["uss_base_url"] == "https://example.interuss.org/foo" assert data["subscription"]["time_start"]["format"] == api.TimeFormat.RFC3339 assert data["subscription"]["time_end"]["format"] == api.TimeFormat.RFC3339 assert ("notify_for_constraints" not in data["subscription"]) or ( diff --git a/monitoring/prober/scd/test_subscription_update_validation.py b/monitoring/prober/scd/test_subscription_update_validation.py index 5adf3c6170..2a290f696a 100644 --- a/monitoring/prober/scd/test_subscription_update_validation.py +++ b/monitoring/prober/scd/test_subscription_update_validation.py @@ -27,7 +27,7 @@ from monitoring.prober.scd import actions -BASE_URL = "https://example.com/uss" +BASE_URL = "https://example.interuss.org/uss" OP_TYPE = register_resource_type(221, "Operational intent") sub_id = None diff --git a/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_auths.yaml b/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_auths.yaml index e2a6463e8c..241e90073e 100644 --- a/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_auths.yaml +++ b/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_auths.yaml @@ -42,7 +42,7 @@ intents: connectivity_methods: - cellular endurance_minutes: 30 - emergency_procedure_url: https://uav.example.com/emergency + emergency_procedure_url: https://uav.example.interuss.org/emergency operator_id: CHEo5kut30e0mt01-qwe valid_flight_auth: @@ -59,5 +59,5 @@ intents: connectivity_methods: - cellular endurance_minutes: 30 - emergency_procedure_url: https://uav.example.com/emergency + emergency_procedure_url: https://uav.example.interuss.org/emergency operator_id: CHEo5kut30e0mt01-qwe diff --git a/monitoring/uss_qualifier/test_data/che/geoawareness/cis_source_sample.json b/monitoring/uss_qualifier/test_data/che/geoawareness/cis_source_sample.json index 46b3474f19..bcfa423d5a 100644 --- a/monitoring/uss_qualifier/test_data/che/geoawareness/cis_source_sample.json +++ b/monitoring/uss_qualifier/test_data/che/geoawareness/cis_source_sample.json @@ -31,9 +31,9 @@ { "name": "LSXX City Sample", "service": "Supervisor", - "email": "admin@example.com", + "email": "admin@example.interuss.org", "contactName": null, - "siteURL": "https://www.example.com/contact", + "siteURL": "https://example.interuss.org/contact", "phone": "0041221234567" } ], @@ -75,4 +75,4 @@ ] } ] -} \ No newline at end of file +}