Merge branch 'main' into record_interactions_from_mock_uss

.github/workflows/ci.yml

@@ -30,15 +30,6 @@ jobs:
     - name: Shell lint
       run: make shell-lint
 
-  monitorlib-test:
-    name: monitorlib tests
-    uses: ./.github/workflows/monitoring-test.yml
-    with:
-      name: monitorlib
-      script: |
-        cd monitoring/monitorlib
-        make test
-
   mock_uss-test:
     name: mock_uss tests
     uses: ./.github/workflows/monitoring-test.yml
@@ -71,7 +62,7 @@ jobs:
 
   publish-gh-pages:
     name: Publish GitHub Pages
-    needs: [hygiene-tests, monitorlib-test, mock_uss-test, uss_qualifier-test, prober-test]
+    needs: [hygiene-tests, mock_uss-test, uss_qualifier-test, prober-test]
     if: ${{ always() && contains(join(needs.*.result, ','), 'success') }}
     runs-on: ubuntu-latest
     permissions:

Makefile

@@ -11,10 +11,11 @@ endif
 
 .PHONY: format
 format: json-schema
+	docker run --rm -v "$(CURDIR):/code" -w /code pyfound/black:22.10.0 black --exclude /interfaces .
 	cd monitoring && make format
 
 .PHONY: lint
-lint: shell-lint
+lint: shell-lint python-lint
 	cd monitoring && make lint
 	cd schemas && make lint
 
@@ -23,7 +24,7 @@ check-hygiene: python-lint hygiene validate-uss-qualifier-docs shell-lint
 
 .PHONY: python-lint
 python-lint:
-	cd monitoring && make python-lint
+	docker run --rm -v "$(CURDIR):/code" -w /code pyfound/black:22.10.0 black --check --exclude /interfaces . || (echo "Linter didn't succeed. You can use the following command to fix python linter issues: make format" && exit 1)
 
 .PHONY: hygiene
 hygiene:
@@ -35,7 +36,7 @@ validate-uss-qualifier-docs:
 
 .PHONY: shell-lint
 shell-lint:
-	find . -name '*.sh' | grep -v '^./interfaces' | xargs docker run --rm -v "$(CURDIR):/monitoring" -w /monitoring koalaman/shellcheck
+	find . -name '*.sh' ! -path "./interfaces/*" | xargs docker run --rm -v "$(CURDIR):/monitoring" -w /monitoring koalaman/shellcheck
 
 .PHONY: json-schema
 json-schema:
@@ -49,9 +50,9 @@ json-schema-lint:
 .PHONY: hygiene-tests
 hygiene-tests: check-hygiene
 
-.PHONY: build-monitoring
-build-monitoring:
-	cd monitoring && make build
+.PHONY: image
+image:
+	cd monitoring && make image
 
 tag:
 	scripts/tag.sh $(UPSTREAM_OWNER)/monitoring/v$(VERSION)
@@ -78,7 +79,6 @@ stop-uss-mocks:
 collect-local-logs:
 	mkdir -p logs
 	-sh -c "build/dev/run_locally.sh logs --timestamps" > logs/local_infra.log 2>&1
-	-docker logs atproxy > logs/atproxy.log 2>&1
 	-docker logs mock_uss_scdsc_a > logs/mock_uss_scdsc_a.log 2>&1
 	-docker logs mock_uss_scdsc_b > logs/mock_uss_scdsc_b.log 2>&1
 	-docker logs mock_uss_ridsp > logs/mock_uss_ridsp.log 2>&1
@@ -88,7 +88,6 @@ collect-local-logs:
 	-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
 stop-locally:

assets/local_uss_qualifier.gv

@@ -33,13 +33,6 @@ digraph G {
     label=<Local USS mocks<br/><font color="green" face="Courier" point-size="10">make start-uss-mocks</font><br/><font color="red" face="Courier" point-size="10">make stop-uss-mocks</font>>
     style="dashed"
 
-    atproxy [label=<Proxied testing interface<br/><font color="purple" face="Courier" point-size="10">atproxy</font><br/><font face="Courier" color="gray" point-size="10">host port 8075</font><br/><font color="red">Disabled</font>>]
-    subgraph force_same_level {
-      rank=same
-      mock_uss_atproxy_client [label=<Proxied testing backend<br/><font color="purple" face="Courier" point-size="10">mock_uss_atproxy_client</font>>]
-      InteropEcosystem [color=lightblue,label=<All of these services<br/>communicate with DSS +<br/>auth in local interoperability<br/>ecosystem, as well as each<br/>other, all according to ASTM<br/>standards>]
-    }
-
     mock_uss_geoawareness [label=<Geo-awareness mock<br/><font color="purple" face="Courier" point-size="10">mock_uss_geoawareness</font><br/><font face="Courier" color="gray" point-size="10">host port 8076</font>>]
 
     mock_uss_scdsc_a [label=<Strategic Coordination mock A<br/><font color="purple" face="Courier" point-size="10">mock_uss_scdsc_a</font><br/><font face="Courier" color="gray" point-size="10">host port 8074</font>>]
@@ -53,8 +46,6 @@ digraph G {
 
     mock_uss_tracer [label=<ASTM F3411-22a trace logger<br/><font color="purple" face="Courier" point-size="10">mock_uss_tracer</font><br/><font face="Courier" color="gray" point-size="10">host port 8078</font>>]
     mock_uss_tracer_v19 [label=<ASTM F3411-19 tracer logger<br/><font color="purple" face="Courier" point-size="10">mock_uss_tracer_v19</font><br/><font face="Courier" color="gray" point-size="10">host port 8088</font>>]
-
-    atproxy -> mock_uss_atproxy_client
   }
 
   subgraph cluster_uss_qualifier {
@@ -94,7 +85,6 @@ digraph G {
   mock_uss_scdsc_b -> InteropEcosystem
   mock_uss_tracer -> InteropEcosystem
   mock_uss_tracer_v19 -> InteropEcosystem
-  mock_uss_atproxy_client -> InteropEcosystem
 
   ResourceUSSAuth -> Auth
   ResourceTestDirectorAuth -> Auth

github_pages/make_site_content.sh

@@ -11,6 +11,4 @@ mkdir ./public
 cp -r ./monitoring/github_pages/static/* ./public
 
 mkdir -p ./public/artifacts/uss_qualifier/reports
-cp -r ./artifacts/uss_qualifier/output/sequence_uspace ./public/artifacts/uss_qualifier/reports/sequence_uspace
-cp -r ./artifacts/uss_qualifier/output/tested_requirements_uspace ./public/artifacts/uss_qualifier/reports/tested_requirements_uspace
-cp -r ./artifacts/uss_qualifier/output/capabilities_uspace.html ./public/artifacts/uss_qualifier/reports/capabilities_uspace.html
+cp -r ./artifacts/uss_qualifier/output ./public/artifacts/uss_qualifier/reports

github_pages/static/index.md

@@ -4,10 +4,32 @@ This site contains content automatically generated by actions in the [InterUSS](
 
 ## uss_qualifier [reports](https://github.com/interuss/monitoring/tree/main/monitoring/uss_qualifier/reports)
 
-These reports were generated during continuous integration for the most recent PR merged to the main branch.
+These reports were generated during continuous integration for the most recent PR merged to the main branch.  The test configurations producing this output are in [monitoring/uss_qualifier/configurations/dev](https://github.com/interuss/monitoring/tree/main/monitoring/uss_qualifier/configurations/dev).
 
-### [U-space developer](https://github.com/interuss/monitoring/blob/main/monitoring/uss_qualifier/configurations/dev/uspace.yaml) [test configuration](https://github.com/interuss/monitoring/tree/main/monitoring/uss_qualifier/configurations)
+### [U-space test configuration](https://github.com/interuss/monitoring/blob/main/monitoring/uss_qualifier/configurations/dev/uspace.yaml)
 
-* [Sequence view](./artifacts/uss_qualifier/reports/sequence_uspace)
-* [Tested requirements](./artifacts/uss_qualifier/reports/tested_requirements_uspace)
-* [Demonstrated capabilities](./artifacts/uss_qualifier/reports/capabilities_uspace.html)
+* [Sequence view](./artifacts/uss_qualifier/reports/uspace/sequence)
+* [Tested requirements](./artifacts/uss_qualifier/reports/uspace/requirements)
+* [Demonstrated capabilities](./artifacts/uss_qualifier/reports/uspace/capabilities.html)
+* [Raw report](./artifacts/uss_qualifier/reports/uspace/report.json) (large)
+
+### [No-op test configuration](https://github.com/interuss/monitoring/blob/main/monitoring/uss_qualifier/configurations/dev/noop.yaml)
+
+* [Raw report](./artifacts/uss_qualifier/reports/noop/report.json) (indented to be human-readable)
+* [Interactive report](./artifacts/uss_qualifier/reports/noop/report.html)
+* [Sequence view](./artifacts/uss_qualifier/reports/noop/sequence)
+
+### [ASTM F3548-21 test configuration](https://github.com/interuss/monitoring/blob/main/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml)
+
+* [Sequence view](./artifacts/uss_qualifier/reports/f3548/sequence)
+* [Tested requirements](./artifacts/uss_qualifier/reports/f3548/requirements)
+
+### [ASTM F3411-22a test configuration](https://github.com/interuss/monitoring/blob/main/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml)
+
+* [Sequence view](./artifacts/uss_qualifier/reports/netrid_v22a/sequence)
+* [Tested requirements](./artifacts/uss_qualifier/reports/netrid_v22a/requirements)
+
+### [DSS integration test configuration](https://github.com/interuss/monitoring/blob/main/monitoring/uss_qualifier/configurations/dev/dss_probing.yaml)
+
+* [Sequence view](./artifacts/uss_qualifier/reports/dss_probing/sequence)
+* [Tested requirements](./artifacts/uss_qualifier/reports/dss_probing/requirements)

monitoring/.gitignore

@@ -1,4 +1,7 @@
 report.json
 config.json
 run_locally_list.txt
-run_locally_scd_deploy_others.sh
+run_locally_scd_deploy_others.sh
+
+# Make target placeholders
+image

monitoring/Makefile

@@ -1,31 +1,17 @@
 .PHONY: lint
 lint:
 	cd uss_qualifier && make lint
-	cd mock_uss && make lint
-	cd monitorlib && make lint
-	cd prober && make lint
-
-.PHONY: python-lint
-python-lint:
-	cd uss_qualifier && make python-lint
-	cd mock_uss && make python-lint
-	cd monitorlib && make python-lint
-	cd prober && make python-lint
 
 .PHONY: format
 format:
 	cd uss_qualifier && make format
-	cd mock_uss && make format
-	cd monitorlib && make format
-	cd prober && make format
 
-.PHONY: build
-build:
+image: ../requirements.txt $(shell find . -type f ! -path "*/output/*" ! -name image) $(shell find ../interfaces -type f)
+	# Building image due to changes in the following files: $?
 	./build.sh
 
 .PHONY: test
 test:
-	cd monitorlib && make test
 	cd mock_uss && make test
 	cd uss_qualifier && make test
 	cd prober && make test

monitoring/README.md

@@ -16,14 +16,6 @@ observed.  It is intended to be run in a production-like shared test environment
 to verify the interoperability of all participants' systems before promoting
 any system changes to production.
 
-### atproxy
-
-[atproxy](atproxy) exposes automated testing endpoints that can be implemented
-by calling other exposed handler endpoints.  This means that the automated
-testing implementation of a USS can make only outgoing calls to atproxy, which
-can be hosted in an entirely differently location than the automated testing
-implementation.
-
 ### load_test
 
 The [DSS load test](loadtest) sends a large number of concurrent requests to a