Skip to content

Commit

Permalink
DSS02120,A2-7-2,7
Browse files Browse the repository at this point in the history
  • Loading branch information
Shastick committed Feb 29, 2024
1 parent f59e33d commit 4daa94f
Show file tree
Hide file tree
Showing 20 changed files with 1,228 additions and 47 deletions.
53 changes: 40 additions & 13 deletions monitoring/monitorlib/mutate/scd.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
import s2sphere
import yaml
from implicitdict import ImplicitDict
from uas_standards.astm.f3548.v21.api import OPERATIONS, OperationID, Subscription
from uas_standards.astm.f3548.v21.api import (
OPERATIONS,
OperationID,
Subscription,
PutSubscriptionParameters,
)
from yaml.representer import Representer

from monitoring.monitorlib import fetch
Expand Down Expand Up @@ -74,18 +79,16 @@ def upsert_subscription(
path = op.path.format(subscriptionid=subscription_id, version=version)
query_type = QueryType.F3548v21DSSUpdateSubscription

body = {
"extents": Volume4D.from_values(
start_time,
end_time,
min_alt_m,
max_alt_m,
polygon=Polygon.from_latlng_rect(latlngrect=area),
).to_f3548v21(),
"uss_base_url": base_url,
"notify_for_operational_intents": notify_for_op_intents,
"notify_for_constraints": notify_for_constraints,
}
body = build_upsert_subscription_params(
area_vertices=area,
start_time=start_time,
end_time=end_time,
base_url=base_url,
notify_for_op_intents=notify_for_op_intents,
notify_for_constraints=notify_for_constraints,
min_alt_m=min_alt_m,
max_alt_m=max_alt_m,
)

result = MutatedSubscription(
fetch.query_and_describe(
Expand All @@ -102,6 +105,30 @@ def upsert_subscription(
return result


def build_upsert_subscription_params(
area_vertices: s2sphere.LatLngRect,
start_time: datetime.datetime,
end_time: datetime.datetime,
base_url: str,
notify_for_op_intents: bool,
notify_for_constraints: bool,
min_alt_m: float,
max_alt_m: float,
) -> PutSubscriptionParameters:
return PutSubscriptionParameters(
extents=Volume4D.from_values(
start_time,
end_time,
min_alt_m,
max_alt_m,
polygon=Polygon.from_latlng_rect(latlngrect=area_vertices),
).to_f3548v21(),
uss_base_url=base_url,
notify_for_operational_intents=notify_for_op_intents,
notify_for_constraints=notify_for_constraints,
)


def delete_subscription(
utm_client: infrastructure.UTMClientSession,
subscription_id: str,
Expand Down
2 changes: 1 addition & 1 deletion monitoring/prober/infrastructure.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def wrapper_default_scope(*args, **kwargs):
resource_type_code_descriptions: Dict[ResourceType, str] = {}


# Next code: 380
# Next code: 381
def register_resource_type(code: int, description: str) -> ResourceType:
"""Register that the specified code refers to the described resource.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ v1:
# ASTM F3548-21 USS emulation roles
- utm.strategic_coordination
- utm.availability_arbitration
# For authentication test purposes.
# Remove if the authentication provider pointed to by AUTH_SPEC does not support it.
- ""

# Means by which uss_qualifier can discover which subscription ('sub' claim of its tokes) it is described by
utm_client_identity:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ utm_auth:
- utm.availability_arbitration
# InterUSS versioning automated testing
- interuss.versioning.read_system_versions
# For authentication test purposes.
# Remove if the authentication provider pointed to by AUTH_SPEC does not support it.
- ""

second_utm_auth:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ utm_auth:
- utm.availability_arbitration
# InterUSS versioning automated testing
- interuss.versioning.read_system_versions
# For authentication test purposes
- ""

second_utm_auth:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
Expand Down
57 changes: 53 additions & 4 deletions monitoring/uss_qualifier/resources/astm/f3548/v21/planning_area.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
import datetime
from typing import List, Dict, Any, Optional, Self
from typing import List, Optional

from implicitdict import ImplicitDict, StringBasedDateTime
from uas_standards.astm.f3548.v21.api import Volume4D
from implicitdict import ImplicitDict
from uas_standards.astm.f3548.v21.api import (
EntityOVN,
OperationalIntentState,
UssBaseURL,
EntityID,
PutOperationalIntentReferenceParameters,
ImplicitSubscriptionParameters,
)

from monitoring.monitorlib.geo import LatLngPoint, make_latlng_rect, Volume3D, Polygon
from monitoring.monitorlib.geo import make_latlng_rect, Volume3D
from monitoring.monitorlib.geotemporal import Volume4D
from monitoring.monitorlib.temporal import Time
from monitoring.uss_qualifier.resources.astm.f3548.v21.subscription_params import (
SubscriptionParams,
)
Expand Down Expand Up @@ -52,6 +61,46 @@ def get_new_subscription_params(
notify_for_constraints=notify_for_constraints,
)

def get_new_operational_intent_ref_params(
self,
key: List[EntityOVN],
state: OperationalIntentState,
uss_base_url: UssBaseURL,
time_start: datetime.datetime,
time_end: datetime.datetime,
subscription_id: Optional[EntityID],
implicit_sub_base_url: Optional[UssBaseURL] = None,
implicit_sub_for_constraints: Optional[bool] = None,
) -> PutOperationalIntentReferenceParameters:
"""
Build a PutOperationalIntentReferenceParameters object that can be used against the DSS OIR API.
The extents contained in these parameters contain a single 4DVolume, which may not be entirely realistic,
but is sufficient in situations where the content of the OIR is irrelevant as long as it is valid, such
as for testing authentication or parameter validation.
Note that this method allows building inconsistent parameters:
"""
return PutOperationalIntentReferenceParameters(
extents=[
Volume4D(
volume=self.volume,
time_start=Time(time_start),
time_end=Time(time_end),
).to_f3548v21()
],
key=key,
state=state,
uss_base_url=uss_base_url,
subscription_id=subscription_id,
new_subscription=ImplicitSubscriptionParameters(
uss_base_url=implicit_sub_base_url,
notify_for_constraints=implicit_sub_for_constraints,
)
if implicit_sub_base_url
else None,
)


class PlanningAreaResource(Resource[PlanningAreaSpecification]):
specification: PlanningAreaSpecification
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import datetime
from typing import List, Optional, Self

import s2sphere
from implicitdict import ImplicitDict
from uas_standards.astm.f3548.v21.api import PutSubscriptionParameters

from monitoring.monitorlib.geo import LatLngPoint
from monitoring.monitorlib.mutate import scd as mutate


class SubscriptionParams(ImplicitDict):
Expand Down Expand Up @@ -44,3 +47,28 @@ class SubscriptionParams(ImplicitDict):

def copy(self) -> Self:
return SubscriptionParams(super().copy())

def to_upsert_subscription_params(
self, area: s2sphere.LatLngRect
) -> PutSubscriptionParameters:
"""
Prepares the subscription parameters to be used in the body of an HTTP request
to create or update a subscription on the DSS in the SCD context.
Args:
area: area to include in the subscription parameters
Returns:
A dict to be passed as the request body when calling the subscription creation or update API.
"""
return mutate.build_upsert_subscription_params(
area_vertices=area,
start_time=self.start_time,
end_time=self.end_time,
base_url=self.base_url,
notify_for_op_intents=self.notify_for_op_intents,
notify_for_constraints=self.notify_for_constraints,
min_alt_m=self.min_alt_m,
max_alt_m=self.max_alt_m,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .authentication_validation import AuthenticationValidation
Loading

0 comments on commit 4daa94f

Please sign in to comment.