Skip to content

Commit

Permalink
Merge remote-tracking branch 'interuss/main' into schema-generation
Browse files Browse the repository at this point in the history
  • Loading branch information
BenjaminPelletier committed Oct 23, 2023
2 parents 53c56e7 + 6c484c3 commit c8b3826
Show file tree
Hide file tree
Showing 41 changed files with 59 additions and 2,246 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,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
Expand All @@ -89,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:
Expand Down
21 changes: 0 additions & 21 deletions assets/atproxy_sequence.puml

This file was deleted.

Binary file removed assets/generated/atproxy_sequence.png
Binary file not shown.
Binary file modified assets/generated/local_uss_qualifier.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 0 additions & 10 deletions assets/local_uss_qualifier.gv
Original file line number Diff line number Diff line change
Expand Up @@ -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>>]
Expand All @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions monitoring/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
66 changes: 0 additions & 66 deletions monitoring/atproxy/README.md

This file was deleted.

Empty file removed monitoring/atproxy/__init__.py
Empty file.
12 changes: 0 additions & 12 deletions monitoring/atproxy/app/__init__.py

This file was deleted.

Loading

0 comments on commit c8b3826

Please sign in to comment.