Add test definitions for SCS-0123-v2

Signed-off-by: Friedrich Zahn <friedrich.zahn@alasca.cloud>

Author: toothstone

Standards/scs-0123-w1-mandatory-and-supported-IaaS-services-implementation.md

@@ -4,6 +4,7 @@ type: Supplement
 track: IaaS
 supplements:
   - scs-0123-v1-mandatory-and-supported-IaaS-services.md
+  - scs-0123-v2-services.md
 ---
 
 ## Automated tests
@@ -13,3 +14,8 @@ the following testcases in accordance with the standard:
 
 - `scs-0123-service-<type>` ensures that a service with the given type can be found in the service catalog
 - `scs-0123-storage-apis` ensures that a service of one of the following types can be found: "volume", "volumev3", "block-storage"
+
+### Deprecated tests
+#### v1 only
+- `scs-0123-swift-s3` ensures that S3 can be used to access object storage using EC2 credentials from the identity API
+

Tests/iaas/openstack_test.py

@@ -150,7 +150,9 @@ def make_container(cloud):
     c.add_function('scs_0123_service_load_balancer', lambda c: compute_scs_0123_service_presence(c.services_lookup, 'load-balancer'))
     c.add_function('scs_0123_service_placement', lambda c: compute_scs_0123_service_presence(c.services_lookup, 'placement'))
     c.add_function('scs_0123_storage_apis', lambda c: compute_scs_0123_service_presence(c.services_lookup, 'volume', 'volumev3', 'block-storage'))
+    c.add_function('scs_0123_service_s3', lambda c: compute_scs_0123_service_presence(c.services_lookup, 's3'))
     c.add_function('scs_0123_swift_s3', lambda c: compute_scs_0123_swift_s3(c.services_lookup, c.conn))
+
     return c
 
 

Tests/scs-compatible-iaas.yaml

@@ -269,6 +269,9 @@ scripts:
   - id: scs-0123-storage-apis
     description: The block-storage API is discoverable as `volume`, `volumev3`, or `block-storage`.
     url: https://docs.scs.community/standards/scs-0123-w1-mandatory-and-supported-IaaS-services-implementation#automated-tests
+  - id: scs-0123-service-s3
+    description: s3 service is discoverable.
+    url: https://docs.scs.community/standards/scs-0123-w1-mandatory-and-supported-IaaS-services-implementation#automated-tests
   - id: scs-0123-swift-s3
     description: The object-storage API is compatible with S3.
     url: https://docs.scs.community/standards/scs-0123-w1-mandatory-and-supported-IaaS-services-implementation#automated-tests
@@ -479,6 +482,18 @@ modules:
       - scs-0123-service-placement
       - scs-0123-storage-apis
       - scs-0123-swift-s3
+  - id: scs-0123-v2
+    name: Mandatory and Supported IaaS Services
+    url: https://docs.scs.community/standards/scs-0123-v2-services
+    targets:
+      main:
+      - scs-0123-service-compute
+      - scs-0123-service-identity
+      - scs-0123-service-image
+      - scs-0123-service-network
+      - scs-0123-service-load-balancer
+      - scs-0123-storage-apis
+      - scs-0123-service-s3
   - id: scs-0302-v1
     name: Domain Manager Role
     url: https://docs.scs.community/standards/scs-0302-v1-domain-manager-role
@@ -523,7 +538,7 @@ versions:
       - scs-0116-v1
       - scs-0117-v1
       - scs-0121-v1
-      - scs-0123-v1
+      - scs-0123-v2
       - scs-0302-v1
   - version: v5.1  # copy of v5, but with include "scs-0123-v1", which had simply been forgotten
     stabilized_at: 2024-12-19