Use object-store-s3 as s3 service type

As proposed by @garloff and @fzakfeld in #1004.

Author: toothstone

Standards/scs-0123-v2-services.md

@@ -36,7 +36,7 @@ The endpoints of services MUST be findable through the `catalog list` of the ide
 | **image** | Glance | Image service |
 | **load-balancer** | Octavia | Load-balancer service |
 | **network** | Neutron | Networking service |
-| **s3**[^2] | N/A | s3 compatible Object Storage service |
+| **object-store-s3**[^2] | N/A | s3 compatible Object Storage service |
 
 Aliases for these service types are only permitted where defined by the [OpenStack Service Type Authority](https://specs.openstack.org/openstack/service-types-authority/#aliases-optional).
 Catalog entries SHOULD use the canonical service type, not aliases.

Tests/iaas/openstack_test.py

@@ -150,7 +150,7 @@ 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_service_s3', lambda c: compute_scs_0123_service_presence(c.services_lookup, 'object-store-s3'))
     c.add_function('scs_0123_swift_s3', lambda c: compute_scs_0123_swift_s3(c.services_lookup, c.conn))
 
     return c