Skip to content

Commit 5f77be2

Browse files
committed
[uss_qualifier] rid: dss0130 - check information relative to intersecting entities is properly sync'd
1 parent b9c3b9e commit 5f77be2

File tree

10 files changed

+122
-26
lines changed

10 files changed

+122
-26
lines changed

monitoring/uss_qualifier/scenarios/astm/netrid/common/dss_interoperability.py

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import datetime
12
import ipaddress
23
import socket
34
import uuid
45
from dataclasses import dataclass
5-
import datetime
66
from enum import Enum
77
from typing import List, Dict, Optional
88
from urllib.parse import urlparse
@@ -429,6 +429,7 @@ def step5(self):
429429
subscription notification requests"""
430430

431431
isa_1 = self._context["isa_1"]
432+
sub_1_0 = self._context["sub_1_0"]
432433

433434
with self.check(
434435
"Can get ISA from primary DSS", [self._dss_primary.participant_id]
@@ -439,15 +440,58 @@ def step5(self):
439440
with self.check(
440441
"Can modify ISA in primary DSS", [self._dss_primary.participant_id]
441442
) as check:
442-
mutated_isa = self._dss_primary.put_isa(
443+
mutated_isa_primary = self._dss_primary.put_isa(
443444
check,
444445
isa_id=isa_1.uuid,
445446
isa_version=isa_1.version,
447+
do_not_notify="https://testdummy.interuss.org",
446448
**_default_params(datetime.timedelta(seconds=SHORT_WAIT_SEC)),
447449
)
448-
isa_1.version = mutated_isa.dss_query.isa.version
450+
isa_1.version = mutated_isa_primary.dss_query.isa.version
451+
452+
subs_to_notify_primary = []
453+
for subscriber in mutated_isa_primary.subscribers:
454+
for s in subscriber.raw.subscriptions:
455+
subs_to_notify_primary.append(s.subscription_id)
456+
457+
with self.check(
458+
"ISA modification on primary DSS triggers subscription notification requests",
459+
[self._dss_primary.participant_id],
460+
) as check:
461+
if sub_1_0.uuid not in subs_to_notify_primary:
462+
check.record_failed(
463+
summary=f"Subscription {sub_1_0.uuid} was not notified of ISA modification",
464+
details=f"Subscription {sub_1_0.uuid} was created on the primary DSS and should have been notified of the ISA modification that happened on the primary DSS, but was not.",
465+
)
449466

450-
# TODO: Implement "ISA modification triggers subscription notification requests check"
467+
for sec_dss in self._dss_others:
468+
with self.check(
469+
"Can modify ISA on secondary DSS",
470+
[sec_dss.participant_id],
471+
) as check:
472+
mutated_isa_sec = self._dss_primary.put_isa(
473+
check,
474+
isa_id=isa_1.uuid,
475+
isa_version=isa_1.version,
476+
do_not_notify="https://testdummy.interuss.org",
477+
**_default_params(datetime.timedelta(seconds=SHORT_WAIT_SEC)),
478+
)
479+
isa_1.version = mutated_isa_sec.dss_query.isa.version
480+
481+
subs_to_notify_sec = []
482+
for subscriber in mutated_isa_primary.subscribers:
483+
for s in subscriber.raw.subscriptions:
484+
subs_to_notify_sec.append(s.subscription_id)
485+
486+
with self.check(
487+
"ISA modification on secondary DSS triggers subscription notification requests",
488+
[self._dss_primary.participant_id],
489+
) as check:
490+
if sub_1_0.uuid not in subs_to_notify_sec:
491+
check.record_failed(
492+
summary=f"Subscription {sub_1_0.uuid} was not notified of ISA modification",
493+
details=f"Subscription {sub_1_0.uuid} was created on the primary DSS and should have been notified of the ISA modification that happened on the primary DSS, but was not.",
494+
)
451495

452496
def step6(self):
453497
"""Can delete all Subscription in primary DSS"""

monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss_interoperability.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,18 @@ Qualitatively proves: ISA[*P*] modified with proper response, all Subscription[i
160160

161161
**[astm.f3411.v19.DSS0130,A2-6-1,1b](../../../../requirements/astm/f3411/v19.md)**
162162

163-
#### ISA modification triggers subscription notification requests check
164-
165-
TODO: Implement
163+
#### ⚠️ ISA modification on primary DSS triggers subscription notification requests check
166164

167165
**[astm.f3411.v19.DSS0130,A2-6-1,3c](../../../../requirements/astm/f3411/v19.md)**
168166

167+
#### 🛑 Can modify ISA on secondary DSS check
168+
169+
**[astm.f3411.v19.DSS0130,A2-6-1,1b](../../../../requirements/astm/f3411/v19.md)**
170+
171+
#### ⚠️ ISA modification on secondary DSS triggers subscription notification requests check
172+
173+
**[astm.f3411.v19.DSS0130,A2-6-1,3c](../../../../requirements/astm/f3411/v19.md)** and **[astm.f3411.v19.DSS0130,2,e](../../../../requirements/astm/f3411/v19.md)**
174+
169175
### S6 test step
170176

171177
Action: USS2@DSS*P*: DELETE Subscription[*n*]

monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss_interoperability.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,18 @@ Qualitatively proves: ISA[*P*] modified with proper response, all Subscription[i
159159

160160
**[astm.f3411.v22a.DSS0130,A2-6-1,1b](../../../../requirements/astm/f3411/v22a.md)**
161161

162-
#### ISA modification triggers subscription notification requests check
163-
164-
TODO: Implement
162+
#### ⚠️ ISA modification on primary DSS triggers subscription notification requests check
165163

166164
**[astm.f3411.v22a.DSS0130,A2-6-1,3c](../../../../requirements/astm/f3411/v22a.md)**
167165

166+
#### 🛑 Can modify ISA on secondary DSS check
167+
168+
**[astm.f3411.v22a.DSS0130,A2-6-1,1b](../../../../requirements/astm/f3411/v22a.md)**
169+
170+
#### ⚠️ ISA modification on secondary DSS triggers subscription notification requests check
171+
172+
**[astm.f3411.v22a.DSS0130,A2-6-1,3c](../../../../requirements/astm/f3411/v22a.md)** and **[astm.f3411.v22a.DSS0130,2,e](../../../../requirements/astm/f3411/v22a.md)**
173+
168174
### S6 test step
169175

170176
Action: USS2@DSS*P*: DELETE Subscription[*n*]

monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<th><a href="../../README.md#checked-in">Checked in</a></th>
2222
</tr>
2323
<tr>
24-
<td rowspan="62" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v19.md">astm<br>.f3411<br>.v19</a></td>
24+
<td rowspan="63" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v19.md">astm<br>.f3411<br>.v19</a></td>
2525
<td><a href="../../../requirements/astm/f3411/v19.md">DSS0010</a></td>
2626
<td>Implemented</td>
2727
<td><a href="../../../scenarios/astm/netrid/v19/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -101,6 +101,11 @@
101101
<td>Implemented</td>
102102
<td><a href="../../../scenarios/astm/netrid/v19/dss_interoperability.md">ASTM F3411-19 NetRID DSS interoperability</a></td>
103103
</tr>
104+
<tr>
105+
<td><a href="../../../requirements/astm/f3411/v19.md">DSS0130,2,e</a></td>
106+
<td>Implemented</td>
107+
<td><a href="../../../scenarios/astm/netrid/v19/dss_interoperability.md">ASTM F3411-19 NetRID DSS interoperability</a></td>
108+
</tr>
104109
<tr>
105110
<td><a href="../../../requirements/astm/f3411/v19.md">DSS0130,2,f</a></td>
106111
<td>Implemented</td>
@@ -173,7 +178,7 @@
173178
</tr>
174179
<tr>
175180
<td><a href="../../../requirements/astm/f3411/v19.md">DSS0130,A2-6-1,3c</a></td>
176-
<td>Implemented + TODO</td>
181+
<td>Implemented</td>
177182
<td><a href="../../../scenarios/astm/netrid/v19/dss_interoperability.md">ASTM F3411-19 NetRID DSS interoperability</a></td>
178183
</tr>
179184
<tr>

monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<th><a href="../../../README.md#checked-in">Checked in</a></th>
2626
</tr>
2727
<tr>
28-
<td rowspan="38" style="vertical-align:top;"><a href="../../../../requirements/astm/f3411/v19.md">astm<br>.f3411<br>.v19</a></td>
28+
<td rowspan="39" style="vertical-align:top;"><a href="../../../../requirements/astm/f3411/v19.md">astm<br>.f3411<br>.v19</a></td>
2929
<td><a href="../../../../requirements/astm/f3411/v19.md">DSS0010</a></td>
3030
<td>Implemented</td>
3131
<td><a href="../../../../scenarios/astm/netrid/v19/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -105,6 +105,11 @@
105105
<td>Implemented</td>
106106
<td><a href="../../../../scenarios/astm/netrid/v19/dss_interoperability.md">ASTM F3411-19 NetRID DSS interoperability</a></td>
107107
</tr>
108+
<tr>
109+
<td><a href="../../../../requirements/astm/f3411/v19.md">DSS0130,2,e</a></td>
110+
<td>Implemented</td>
111+
<td><a href="../../../../scenarios/astm/netrid/v19/dss_interoperability.md">ASTM F3411-19 NetRID DSS interoperability</a></td>
112+
</tr>
108113
<tr>
109114
<td><a href="../../../../requirements/astm/f3411/v19.md">DSS0130,2,f</a></td>
110115
<td>Implemented</td>
@@ -177,7 +182,7 @@
177182
</tr>
178183
<tr>
179184
<td><a href="../../../../requirements/astm/f3411/v19.md">DSS0130,A2-6-1,3c</a></td>
180-
<td>Implemented + TODO</td>
185+
<td>Implemented</td>
181186
<td><a href="../../../../scenarios/astm/netrid/v19/dss_interoperability.md">ASTM F3411-19 NetRID DSS interoperability</a></td>
182187
</tr>
183188
<tr>

monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<th><a href="../../README.md#checked-in">Checked in</a></th>
2222
</tr>
2323
<tr>
24-
<td rowspan="87" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
24+
<td rowspan="88" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
2525
<td><a href="../../../requirements/astm/f3411/v22a.md">DSS0010</a></td>
2626
<td>Implemented</td>
2727
<td><a href="../../../scenarios/astm/netrid/v22a/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -106,6 +106,11 @@
106106
<td>Implemented</td>
107107
<td><a href="../../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
108108
</tr>
109+
<tr>
110+
<td><a href="../../../requirements/astm/f3411/v22a.md">DSS0130,2,e</a></td>
111+
<td>Implemented</td>
112+
<td><a href="../../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
113+
</tr>
109114
<tr>
110115
<td><a href="../../../requirements/astm/f3411/v22a.md">DSS0130,2,f</a></td>
111116
<td>Implemented</td>
@@ -178,7 +183,7 @@
178183
</tr>
179184
<tr>
180185
<td><a href="../../../requirements/astm/f3411/v22a.md">DSS0130,A2-6-1,3c</a></td>
181-
<td>Implemented + TODO</td>
186+
<td>Implemented</td>
182187
<td><a href="../../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
183188
</tr>
184189
<tr>

monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<th><a href="../../../README.md#checked-in">Checked in</a></th>
2626
</tr>
2727
<tr>
28-
<td rowspan="39" style="vertical-align:top;"><a href="../../../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
28+
<td rowspan="40" style="vertical-align:top;"><a href="../../../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
2929
<td><a href="../../../../requirements/astm/f3411/v22a.md">DSS0010</a></td>
3030
<td>Implemented</td>
3131
<td><a href="../../../../scenarios/astm/netrid/v22a/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -110,6 +110,11 @@
110110
<td>Implemented</td>
111111
<td><a href="../../../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
112112
</tr>
113+
<tr>
114+
<td><a href="../../../../requirements/astm/f3411/v22a.md">DSS0130,2,e</a></td>
115+
<td>Implemented</td>
116+
<td><a href="../../../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
117+
</tr>
113118
<tr>
114119
<td><a href="../../../../requirements/astm/f3411/v22a.md">DSS0130,2,f</a></td>
115120
<td>Implemented</td>
@@ -182,7 +187,7 @@
182187
</tr>
183188
<tr>
184189
<td><a href="../../../../requirements/astm/f3411/v22a.md">DSS0130,A2-6-1,3c</a></td>
185-
<td>Implemented + TODO</td>
190+
<td>Implemented</td>
186191
<td><a href="../../../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
187192
</tr>
188193
<tr>

monitoring/uss_qualifier/suites/interuss/dss/all_tests.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<th><a href="../../README.md#checked-in">Checked in</a></th>
2222
</tr>
2323
<tr>
24-
<td rowspan="38" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v19.md">astm<br>.f3411<br>.v19</a></td>
24+
<td rowspan="39" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v19.md">astm<br>.f3411<br>.v19</a></td>
2525
<td><a href="../../../requirements/astm/f3411/v19.md">DSS0010</a></td>
2626
<td>Implemented</td>
2727
<td><a href="../../../scenarios/astm/netrid/v19/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -101,6 +101,11 @@
101101
<td>Implemented</td>
102102
<td><a href="../../../scenarios/astm/netrid/v19/dss_interoperability.md">ASTM F3411-19 NetRID DSS interoperability</a></td>
103103
</tr>
104+
<tr>
105+
<td><a href="../../../requirements/astm/f3411/v19.md">DSS0130,2,e</a></td>
106+
<td>Implemented</td>
107+
<td><a href="../../../scenarios/astm/netrid/v19/dss_interoperability.md">ASTM F3411-19 NetRID DSS interoperability</a></td>
108+
</tr>
104109
<tr>
105110
<td><a href="../../../requirements/astm/f3411/v19.md">DSS0130,2,f</a></td>
106111
<td>Implemented</td>
@@ -173,7 +178,7 @@
173178
</tr>
174179
<tr>
175180
<td><a href="../../../requirements/astm/f3411/v19.md">DSS0130,A2-6-1,3c</a></td>
176-
<td>Implemented + TODO</td>
181+
<td>Implemented</td>
177182
<td><a href="../../../scenarios/astm/netrid/v19/dss_interoperability.md">ASTM F3411-19 NetRID DSS interoperability</a></td>
178183
</tr>
179184
<tr>
@@ -212,7 +217,7 @@
212217
<td><a href="../../../scenarios/astm/netrid/v19/dss/heavy_traffic_concurrent.md">ASTM NetRID DSS: Concurrent Requests</a><br><a href="../../../scenarios/astm/netrid/v19/dss/isa_expiry.md">ASTM NetRID DSS: ISA Expiry</a><br><a href="../../../scenarios/astm/netrid/v19/dss/isa_subscription_interactions.md">ASTM NetRID DSS: ISA Subscription Interactions</a><br><a href="../../../scenarios/astm/netrid/v19/dss/isa_simple.md">ASTM NetRID DSS: Simple ISA</a><br><a href="../../../scenarios/astm/netrid/v19/dss/isa_validation.md">ASTM NetRID DSS: Submitted ISA Validations</a><br><a href="../../../scenarios/astm/netrid/v19/dss/subscription_simple.md">ASTM NetRID DSS: Subscription Simple</a><br><a href="../../../scenarios/astm/netrid/v19/dss/subscription_validation.md">ASTM NetRID DSS: Subscription Validation</a><br><a href="../../../scenarios/astm/netrid/v19/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
213218
</tr>
214219
<tr>
215-
<td rowspan="39" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
220+
<td rowspan="40" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
216221
<td><a href="../../../requirements/astm/f3411/v22a.md">DSS0010</a></td>
217222
<td>Implemented</td>
218223
<td><a href="../../../scenarios/astm/netrid/v22a/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -297,6 +302,11 @@
297302
<td>Implemented</td>
298303
<td><a href="../../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
299304
</tr>
305+
<tr>
306+
<td><a href="../../../requirements/astm/f3411/v22a.md">DSS0130,2,e</a></td>
307+
<td>Implemented</td>
308+
<td><a href="../../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
309+
</tr>
300310
<tr>
301311
<td><a href="../../../requirements/astm/f3411/v22a.md">DSS0130,2,f</a></td>
302312
<td>Implemented</td>
@@ -369,7 +379,7 @@
369379
</tr>
370380
<tr>
371381
<td><a href="../../../requirements/astm/f3411/v22a.md">DSS0130,A2-6-1,3c</a></td>
372-
<td>Implemented + TODO</td>
382+
<td>Implemented</td>
373383
<td><a href="../../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
374384
</tr>
375385
<tr>

monitoring/uss_qualifier/suites/uspace/network_identification.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<th><a href="../README.md#checked-in">Checked in</a></th>
1818
</tr>
1919
<tr>
20-
<td rowspan="87" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
20+
<td rowspan="88" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
2121
<td><a href="../../requirements/astm/f3411/v22a.md">DSS0010</a></td>
2222
<td>Implemented</td>
2323
<td><a href="../../scenarios/astm/netrid/v22a/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -102,6 +102,11 @@
102102
<td>Implemented</td>
103103
<td><a href="../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
104104
</tr>
105+
<tr>
106+
<td><a href="../../requirements/astm/f3411/v22a.md">DSS0130,2,e</a></td>
107+
<td>Implemented</td>
108+
<td><a href="../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
109+
</tr>
105110
<tr>
106111
<td><a href="../../requirements/astm/f3411/v22a.md">DSS0130,2,f</a></td>
107112
<td>Implemented</td>
@@ -174,7 +179,7 @@
174179
</tr>
175180
<tr>
176181
<td><a href="../../requirements/astm/f3411/v22a.md">DSS0130,A2-6-1,3c</a></td>
177-
<td>Implemented + TODO</td>
182+
<td>Implemented</td>
178183
<td><a href="../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
179184
</tr>
180185
<tr>

monitoring/uss_qualifier/suites/uspace/required_services.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<th><a href="../README.md#checked-in">Checked in</a></th>
1919
</tr>
2020
<tr>
21-
<td rowspan="87" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
21+
<td rowspan="88" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
2222
<td><a href="../../requirements/astm/f3411/v22a.md">DSS0010</a></td>
2323
<td>Implemented</td>
2424
<td><a href="../../scenarios/astm/netrid/v22a/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
@@ -103,6 +103,11 @@
103103
<td>Implemented</td>
104104
<td><a href="../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
105105
</tr>
106+
<tr>
107+
<td><a href="../../requirements/astm/f3411/v22a.md">DSS0130,2,e</a></td>
108+
<td>Implemented</td>
109+
<td><a href="../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
110+
</tr>
106111
<tr>
107112
<td><a href="../../requirements/astm/f3411/v22a.md">DSS0130,2,f</a></td>
108113
<td>Implemented</td>
@@ -175,7 +180,7 @@
175180
</tr>
176181
<tr>
177182
<td><a href="../../requirements/astm/f3411/v22a.md">DSS0130,A2-6-1,3c</a></td>
178-
<td>Implemented + TODO</td>
183+
<td>Implemented</td>
179184
<td><a href="../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
180185
</tr>
181186
<tr>

0 commit comments

Comments
 (0)