From 0e630aa1d05d8913517f59ce6d261a214b07bc49 Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Wed, 8 Nov 2023 06:11:50 +0000 Subject: [PATCH] Fix hygiene --- monitoring/monitorlib/inspection.py | 10 ++++++++-- .../uss_qualifier/scenarios/astm/utm/prep_planners.md | 8 ++++++-- .../scenarios/flight_planning/prep_planners.md | 8 ++++++-- monitoring/uss_qualifier/suites/astm/utm/f3548_21.md | 2 +- .../uss_qualifier/suites/faa/uft/message_signing.md | 2 +- monitoring/uss_qualifier/suites/uspace/flight_auth.md | 2 +- .../uss_qualifier/suites/uspace/required_services.md | 2 +- 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/monitoring/monitorlib/inspection.py b/monitoring/monitorlib/inspection.py index 8f980daac8..d6408f04ba 100644 --- a/monitoring/monitorlib/inspection.py +++ b/monitoring/monitorlib/inspection.py @@ -32,5 +32,11 @@ def get_module_object_by_name(parent_module, object_name: str): def fullname(class_type: Type) -> str: module = class_type.__module__ if module == "builtins": - return class_type.__qualname__ # avoid outputs like 'builtins.str' - return module + "." + class_type.__qualname__ + if hasattr(class_type, "__qualname__"): + return class_type.__qualname__ # avoid outputs like 'builtins.str' + else: + return str(class_type) + if hasattr(class_type, "__qualname__"): + return module + "." + class_type.__qualname__ + else: + return str(class_type) diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/prep_planners.md b/monitoring/uss_qualifier/scenarios/astm/utm/prep_planners.md index 54214b67af..bff29b4a02 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/prep_planners.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/prep_planners.md @@ -26,6 +26,10 @@ FlightIntentsResource containing flight intents that will be used in subsequent (Optional) If more than one FlightIntentsResource will be used in subsequent tests, additional intents may be specified with this resource. +### flight_intents4 + +(Optional) If more than one FlightIntentsResource will be used in subsequent tests, additional intents may be specified with this resource. + ## Preparation test case ### Check for flight planning readiness test step @@ -34,7 +38,7 @@ All USSs are queried for their readiness to ensure later tests can proceed. #### ⚠️ Valid response to readiness query check -**[interuss.automated_testing.flight_planning.ImplementInterface](../../../requirements/interuss/automated_testing/flight_planning.md)** +**[interuss.automated_testing.flight_planning.ImplementAPI](../../../requirements/interuss/automated_testing/flight_planning.md)** #### ⚠️ Flight planning USS ready check @@ -46,7 +50,7 @@ All USSs are requested to remove all flights from the area under test. #### ⚠️ Valid response to clearing query check -**[interuss.automated_testing.flight_planning.ImplementInterface](../../../requirements/interuss/automated_testing/flight_planning.md)** +**[interuss.automated_testing.flight_planning.ImplementAPI](../../../requirements/interuss/automated_testing/flight_planning.md)** #### ⚠️ Area cleared successfully check diff --git a/monitoring/uss_qualifier/scenarios/flight_planning/prep_planners.md b/monitoring/uss_qualifier/scenarios/flight_planning/prep_planners.md index 0882babd75..3a25e1dc85 100644 --- a/monitoring/uss_qualifier/scenarios/flight_planning/prep_planners.md +++ b/monitoring/uss_qualifier/scenarios/flight_planning/prep_planners.md @@ -22,6 +22,10 @@ FlightIntentsResource containing flight intents that will be used in subsequent (Optional) If more than one FlightIntentsResource will be used in subsequent tests, additional intents may be specified with this resource. +### flight_intents4 + +(Optional) If more than one FlightIntentsResource will be used in subsequent tests, additional intents may be specified with this resource. + ## Preparation test case ### Check for flight planning readiness test step @@ -30,7 +34,7 @@ All USSs are queried for their readiness to ensure later tests can proceed. #### ⚠️ Valid response to readiness query check -**[interuss.automated_testing.flight_planning.ImplementInterface](../../requirements/interuss/automated_testing/flight_planning.md)** +**[interuss.automated_testing.flight_planning.ImplementAPI](../../requirements/interuss/automated_testing/flight_planning.md)** #### ⚠️ Flight planning USS ready check @@ -42,7 +46,7 @@ All USSs are requested to remove all flights from the area under test. #### ⚠️ Valid response to clearing query check -**[interuss.automated_testing.flight_planning.ImplementInterface](../../requirements/interuss/automated_testing/flight_planning.md)** +**[interuss.automated_testing.flight_planning.ImplementAPI](../../requirements/interuss/automated_testing/flight_planning.md)** #### ⚠️ Area cleared successfully check diff --git a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.md b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.md index cbd703bd6d..a6c28839f5 100644 --- a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.md +++ b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.md @@ -154,7 +154,7 @@ Data Validation of GET operational intents by USS
Nominal planning: conflict with higher priority
Nominal planning: not permitted conflict with equal priority
Validation of operational intents - ImplementInterface + ImplementAPI Implemented ASTM F3548 flight planners preparation diff --git a/monitoring/uss_qualifier/suites/faa/uft/message_signing.md b/monitoring/uss_qualifier/suites/faa/uft/message_signing.md index 91c6f22b35..820645e6ee 100644 --- a/monitoring/uss_qualifier/suites/faa/uft/message_signing.md +++ b/monitoring/uss_qualifier/suites/faa/uft/message_signing.md @@ -145,7 +145,7 @@ Data Validation of GET operational intents by USS
Nominal planning: conflict with higher priority
Nominal planning: not permitted conflict with equal priority
Validation of operational intents - ImplementInterface + ImplementAPI Implemented ASTM F3548 flight planners preparation diff --git a/monitoring/uss_qualifier/suites/uspace/flight_auth.md b/monitoring/uss_qualifier/suites/uspace/flight_auth.md index 2cca5bb210..01f3040467 100644 --- a/monitoring/uss_qualifier/suites/uspace/flight_auth.md +++ b/monitoring/uss_qualifier/suites/uspace/flight_auth.md @@ -146,7 +146,7 @@ Data Validation of GET operational intents by USS
Nominal planning: conflict with higher priority
Nominal planning: not permitted conflict with equal priority
Validation of operational intents - ImplementInterface + ImplementAPI Implemented ASTM F3548 flight planners preparation
Generic flight planners preparation diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md index 66a396737d..55f3db9b49 100644 --- a/monitoring/uss_qualifier/suites/uspace/required_services.md +++ b/monitoring/uss_qualifier/suites/uspace/required_services.md @@ -587,7 +587,7 @@ Data Validation of GET operational intents by USS
Nominal planning: conflict with higher priority
Nominal planning: not permitted conflict with equal priority
Validation of operational intents - ImplementInterface + ImplementAPI Implemented ASTM F3548 flight planners preparation
Generic flight planners preparation