[uss_qualifier] Upgrade to latest dss version; Add 'supports_ovn_requ…

…est' field to dss resources
interuss · Nov 13, 2024 · 4244497 · 4244497
1 parent 58e40fe
commit 4244497
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 8 deletions.
diff --git a/build/dev/docker-compose.yaml b/build/dev/docker-compose.yaml
@@ -25,17 +25,17 @@ services:
       start_interval: 5s
 
   rid_bootstrapper:
-    image: interuss/dss:v0.18.0-rc1
-    command: /usr/bin/db-manager --schemas_dir=/db-schemas/rid --db_version "latest" --cockroach_host crdb
+    image: interuss/dss:v0.19.0-rc2
+    command: /usr/bin/db-manager migrate --schemas_dir=/db-schemas/rid --db_version "latest" --cockroach_host crdb
     depends_on:
       crdb:
         condition: service_healthy
     networks:
       - dss_internal_network
 
   scd_bootstrapper:
-    image: interuss/dss:v0.18.0-rc1
-    command: /usr/bin/db-manager --schemas_dir=/db-schemas/scd --db_version "latest" --cockroach_host crdb
+    image: interuss/dss:v0.19.0-rc2
+    command: /usr/bin/db-manager migrate --schemas_dir=/db-schemas/scd --db_version "latest" --cockroach_host crdb
     depends_on:
       crdb:
         condition: service_healthy
@@ -44,7 +44,7 @@ services:
 
   dss:
     hostname: dss.uss1.localutm
-    image: interuss/dss:v0.18.0-rc1
+    image: interuss/dss:v0.19.0-rc2
     volumes:
       - $PWD/../test-certs:/var/test-certs:ro
       - $PWD/startup/core_service.sh:/startup/core_service.sh:ro

diff --git a/monitoring/uss_qualifier/configurations/dev/dss_probing.yaml b/monitoring/uss_qualifier/configurations/dev/dss_probing.yaml
@@ -64,4 +64,4 @@ v1:
         pass_condition:
           elements:
             count:
-              equal_to: 8 # 6 CRDBAccess + 2 DSSOVNRequest scenarios are skipped
+              equal_to: 6 # 6 CRDBAccess scenarios are skipped
diff --git a/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml b/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml
@@ -134,6 +134,7 @@ v1:
             # A USS that hosts a DSS instance is also a participant in the test, even if they don't fulfill any other roles
             participant_id: uss1_dss
             base_url: http://dss.uss1.localutm
+            supports_ovn_request: true
 
         dss_instances:
           resource_type: resources.astm.f3548.v21.DSSInstancesResource
@@ -146,8 +147,10 @@ v1:
                   # Participants using a DSS instance they do not provide should be listed as users of that DSS (so that they can take credit for USS requirements enforced by the DSS)
                   - mock_uss  # mock_uss uses this DSS instance; it does not provide its own instance
                 base_url: http://dss.uss1.localutm
+                supports_ovn_request: true
               - participant_id: uss2_dss
                 base_url: http://dss.uss2.localutm
+                supports_ovn_request: true
 
         # Mock USS that can be used in tests for flight planning, modifying data sharing behavior and recording interactions
         mock_uss:

diff --git a/monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml b/monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml
@@ -187,6 +187,7 @@ scd_dss:
   specification:
     participant_id: uss1
     base_url: http://dss.uss1.localutm
+    supports_ovn_request: true
 
 scd_dss_instances:
   $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
@@ -199,8 +200,10 @@ scd_dss_instances:
         user_participant_ids:
           - mock_uss
         base_url: http://dss.uss1.localutm
+        supports_ovn_request: true
       - participant_id: uss2
         base_url: http://dss.uss2.localutm
+        supports_ovn_request: true
 
 # ===== DSS CockroachDB nodes =====
 

diff --git a/monitoring/uss_qualifier/configurations/dev/library/environment_localhost.yaml b/monitoring/uss_qualifier/configurations/dev/library/environment_localhost.yaml
@@ -186,6 +186,7 @@ scd_dss:
   specification:
     participant_id: uss1
     base_url: http://localhost:8082
+    supports_ovn_request: true
 
 scd_dss_instances:
   $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
@@ -198,8 +199,10 @@ scd_dss_instances:
         user_participant_ids:
           - mock_uss
         base_url: http://localhost:8082
+        supports_ovn_request: true
       - participant_id: uss2
         base_url: http://localhost:8082
+        supports_ovn_request: true
 
 # ===== DSS CockroachDB nodes =====
 

diff --git a/monitoring/uss_qualifier/configurations/dev/uspace.yaml b/monitoring/uss_qualifier/configurations/dev/uspace.yaml
@@ -155,4 +155,4 @@ v1:
         pass_condition:
           elements:
             count:
-              equal_to: 6 # 4 CRDBAccess + 2 DSSOVNRequest scenarios are skipped
+              equal_to: 4 # 4 CRDBAccess scenarios are skipped
diff --git a/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/baseline.libsonnet b/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/baseline.libsonnet
@@ -417,7 +417,7 @@ function(env) {
               count: {
                 // We currently expect this amount of skipped scenarios: making it an equality
                 // to make sure this is reduced if some scenarios start to be executed
-                equal_to: 13,
+                equal_to: 11,
               },
             },
           },

diff --git a/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/local/env.libsonnet b/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/local/env.libsonnet
@@ -88,6 +88,7 @@ function(participants) {
         // A USS that hosts a DSS instance is also a participant in the test, even if they don't fulfill any other roles
         participant_id: 'uss1_dss',
         base_url: 'http://dss.uss1.localutm',
+        supports_ovn_request: 'true',
       },
     },
 

diff --git a/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/uss1.libsonnet b/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/uss1.libsonnet
@@ -44,6 +44,7 @@
           'mock_uss',  // mock_uss uses this DSS instance; it does not provide its own instance
         ],
         base_url: 'http://dss.uss1.localutm',
+        supports_ovn_request: 'true',
       },
     ]
   }

diff --git a/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/uss2.libsonnet b/monitoring/uss_qualifier/configurations/dev/utm_implementation_us_lib/uss2.libsonnet
@@ -40,6 +40,7 @@
       {
         participant_id: 'uss2_dss',
         base_url: 'http://dss.uss2.localutm',
+        supports_ovn_request: 'true',
       },
     ]
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,7 @@ @@
               'mock_uss',  // mock_uss uses this DSS instance; it does not provide its own instance
             ],
             base_url: 'http://dss.uss1.localutm',
+            supports_ovn_request: 'true',
           },
         ]
       }
@@ Expand Down @@