Use discovery instead of config to create proxies

Since the dawn of time we've labored under the crippling burden of
needing to explicitly request a version via configuration in order to
get a usable handle to the cloud. This is despite the hilarity of the
existence of a system for discovering available versions since basically
the beginning of the entire OpenStack project.

Today we shall be liberated from the tyranny of terrible past life
decisions on the part of our forefathers and shall usher forth the
shining freedom of actually using the discovery system.

Change-Id: I11c16d37d3ab3d77bed3a0bcbd98f1fa33b9555f

SHADE-MERGE-TODO.rst

@@ -34,7 +34,7 @@ already. For reference, those are:
     servers = conn.list_servers()  # High-level resource interface from shade
     servers = conn.compute.servers()  # SDK Service/Object Interface
     response = conn.compute.get('/servers')  # REST passthrough
-
+* Removed ServiceFilter and the various Service objects in favor of discovery.
 
 Next steps
 ==========
@@ -44,8 +44,6 @@ Next steps
   mean anything to people.
 * Migrate unit tests to requests-mock instead of mocking python calls to
   session.
-* Investigate removing ServiceFilter and the various Service objects if an
-  acceptable plan can be found for using discovery.
 * Replace _prepare_request with requests.Session.prepare_request.
 
 shade integration

doc/source/contributor/create/examples/resource/fake.py

@@ -1,6 +1,5 @@
 # Apache 2 header omitted for brevity
 
-from openstack.fake import fake_service
 from openstack import resource
 
 
@@ -8,7 +7,6 @@ class Fake(resource.Resource):
     resource_key = "resource"
     resources_key = "resources"
     base_path = "/fake"
-    service = fake_service.FakeService()
 
     allow_create = True
     allow_fetch = True

doc/source/contributor/create/examples/resource/fake_service.py

@@ -1,13 +1,12 @@
 # Apache 2 header omitted for brevity
 
-from openstack import service_filter
+from openstack import service_description
+from openstack.fake.v2 import _proxy as _proxy_v2
 
 
-class FakeService(service_filter.ServiceFilter):
+class FakeService(service_description.ServiceDescription):
     """The fake service."""
 
-    valid_versions = [service_filter.ValidVersion('v2')]
-
-    def __init__(self, version=None):
-        """Create a fake service."""
-        super(FakeService, self).__init__(service_type='fake', version=version)
+    supported_versions = {
+        '2': _proxy_v2.Proxy,
+    }

doc/source/user/index.rst

@@ -148,7 +148,7 @@ can be customized.
    :maxdepth: 1
 
    resource
-   service_filter
+   service_description
    utils
 
 Presentations

doc/source/user/service_description.rst

@@ -0,0 +1,10 @@
+ServiceDescription
+==================
+.. automodule:: openstack.service_description
+
+
+ServiceDescription object
+-------------------------
+
+.. autoclass:: openstack.service_description.ServiceDescription
+   :members:

doc/source/user/service_filter.rst

@@ -1,10 +0,0 @@
-ServiceFilter
-=============
-.. automodule:: openstack.service_filter
-
-
-ServiceFilter object
---------------------
-
-.. autoclass:: openstack.service_filter.ServiceFilter
-   :members:

lower-constraints.txt

@@ -14,7 +14,7 @@ jmespath==0.9.0
 jsonpatch==1.16
 jsonpointer==1.13
 jsonschema==2.6.0
-keystoneauth1==3.8.0
+keystoneauth1==3.11.0
 linecache2==1.0.0
 mock==2.0.0
 mox3==0.20.0

openstack/_meta/connection.py

@@ -18,7 +18,6 @@ import warnings
 import os_service_types
 
 from openstack import _log
-from openstack import proxy
 from openstack import service_description
 
 _logger = _log.setup_logging('openstack')
@@ -43,28 +42,28 @@ class ConnectionMeta(type):
                 # from openstacksdk. The credentials API calls are all calls
                 # on identity endpoints.
                 continue
-            desc_class = service_description.ServiceDescription
-            service_filter_class = _find_service_filter_class(service_type)
+            desc_class = _find_service_description_class(service_type)
             descriptor_args = {'service_type': service_type}
-            if service_filter_class:
-                desc_class = service_description.OpenStackServiceDescription
-                descriptor_args['service_filter_class'] = service_filter_class
-                class_names = service_filter_class._get_proxy_class_names()
-                if len(class_names) == 1:
-                    doc = _DOC_TEMPLATE.format(
-                        class_name="{service_type} Proxy <{name}>".format(
-                            service_type=service_type, name=class_names[0]),
-                        **service)
-                else:
-                    class_doc_strings = "\n".join([
-                        ":class:`{class_name}`".format(class_name=class_name)
-                        for class_name in class_names])
-                    doc = _PROXY_TEMPLATE.format(
-                        class_doc_strings=class_doc_strings, **service)
-            else:
-                descriptor_args['proxy_class'] = proxy.Proxy
+
+            if not desc_class.supported_versions:
                 doc = _DOC_TEMPLATE.format(
-                    class_name='~openstack.proxy.Proxy', **service)
+                    class_name="{service_type} Proxy".format(
+                        service_type=service_type),
+                    **service)
+            elif len(desc_class.supported_versions) == 1:
+                supported_version = list(
+                    desc_class.supported_versions.keys())[0]
+                doc = _DOC_TEMPLATE.format(
+                    class_name="{service_type} Proxy <{name}>".format(
+                        service_type=service_type, name=supported_version),
+                    **service)
+            else:
+                class_doc_strings = "\n".join([
+                    ":class:`{class_name}`".format(
+                        class_name=proxy_class.__name__)
+                    for proxy_class in desc_class.supported_versions.values()])
+                doc = _PROXY_TEMPLATE.format(
+                    class_doc_strings=class_doc_strings, **service)
             descriptor = desc_class(**descriptor_args)
             descriptor.__doc__ = doc
             st = service_type.replace('-', '_')
@@ -103,7 +102,7 @@ def _get_aliases(service_type, aliases=None):
     return all_types
 
 
-def _find_service_filter_class(service_type):
+def _find_service_description_class(service_type):
     package_name = 'openstack.{service_type}'.format(
         service_type=service_type).replace('-', '_')
     module_name = service_type.replace('-', '_') + '_service'
@@ -111,17 +110,17 @@ def _find_service_filter_class(service_type):
         [part.capitalize() for part in module_name.split('_')])
     try:
         import_name = '.'.join([package_name, module_name])
-        service_filter_module = importlib.import_module(import_name)
+        service_description_module = importlib.import_module(import_name)
     except ImportError as e:
         # ImportWarning is ignored by default. This warning is here
         # as an opt-in for people trying to figure out why something
         # didn't work.
         warnings.warn(
-            "Could not import {service_type} service filter: {e}".format(
+            "Could not import {service_type} service description: {e}".format(
                 service_type=service_type, e=str(e)),
             ImportWarning)
-        return None
+        return service_description.ServiceDescription
     # There are no cases in which we should have a module but not the class
     # inside it.
-    service_filter_class = getattr(service_filter_module, class_name)
-    return service_filter_class
+    service_description_class = getattr(service_description_module, class_name)
+    return service_description_class

openstack/baremetal/baremetal_service.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack import service_filter
+from openstack import service_description
+from openstack.baremetal.v1 import _proxy
 
 
-class BaremetalService(service_filter.ServiceFilter):
+class BaremetalService(service_description.ServiceDescription):
     """The bare metal service."""
 
-    valid_versions = [service_filter.ValidVersion('v1')]
-
-    def __init__(self, version=None):
-        """Create a bare metal service."""
-        super(BaremetalService, self).__init__(service_type='baremetal',
-                                               version=version)
+    supported_versions = {
+        '1': _proxy.Proxy,
+    }

openstack/baremetal/v1/chassis.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.baremetal import baremetal_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Chassis(resource.Resource):
 
     resources_key = 'chassis'
     base_path = '/chassis'
-    service = baremetal_service.BaremetalService()
 
     # capabilities
     allow_create = True

openstack/baremetal/v1/driver.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.baremetal import baremetal_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Driver(resource.Resource):
 
     resources_key = 'drivers'
     base_path = '/drivers'
-    service = baremetal_service.BaremetalService()
 
     # capabilities
     allow_create = False

openstack/baremetal/v1/node.py

@@ -11,7 +11,6 @@
 # under the License.
 
 from openstack import _log
-from openstack.baremetal import baremetal_service
 from openstack.baremetal.v1 import _common
 from openstack import exceptions
 from openstack import resource
@@ -39,7 +38,6 @@ class Node(resource.Resource):
 
     resources_key = 'nodes'
     base_path = '/nodes'
-    service = baremetal_service.BaremetalService()
 
     # capabilities
     allow_create = True

openstack/baremetal/v1/port.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.baremetal import baremetal_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Port(resource.Resource):
 
     resources_key = 'ports'
     base_path = '/ports'
-    service = baremetal_service.BaremetalService()
 
     # capabilities
     allow_create = True

openstack/baremetal/v1/port_group.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.baremetal import baremetal_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class PortGroup(resource.Resource):
 
     resources_key = 'portgroups'
     base_path = '/portgroups'
-    service = baremetal_service.BaremetalService()
 
     # capabilities
     allow_create = True

openstack/baremetal/version.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.baremetal import baremetal_service
 from openstack import resource
 
 
@@ -18,9 +17,6 @@ class Version(resource.Resource):
     resource_key = 'version'
     resources_key = 'versions'
     base_path = '/'
-    service = baremetal_service.BaremetalService(
-        version=baremetal_service.BaremetalService.UNVERSIONED
-    )
 
     # Capabilities
     allow_list = True

openstack/block_storage/block_storage_service.py

@@ -10,16 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack import service_filter
+from openstack.block_storage.v2 import _proxy
+from openstack import service_description
 
 
-class BlockStorageService(service_filter.ServiceFilter):
+class BlockStorageService(service_description.ServiceDescription):
     """The block storage service."""
 
-    valid_versions = [service_filter.ValidVersion('v2')]
-
-    def __init__(self, version=None):
-        """Create a block storage service."""
-        super(BlockStorageService, self).__init__(
-            service_type='block-storage',
-            version=version, requires_project_id=True)
+    supported_versions = {
+        '2': _proxy.Proxy,
+    }

openstack/block_storage/v2/snapshot.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.block_storage import block_storage_service
 from openstack import format
 from openstack import resource
 
@@ -19,7 +18,6 @@ class Snapshot(resource.Resource):
     resource_key = "snapshot"
     resources_key = "snapshots"
     base_path = "/snapshots"
-    service = block_storage_service.BlockStorageService()
 
     _query_mapping = resource.QueryParameters(
         'all_tenants', 'name', 'status', 'volume_id')

openstack/block_storage/v2/stats.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.block_storage import block_storage_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Pools(resource.Resource):
     resource_key = "pool"
     resources_key = "pools"
     base_path = "/scheduler-stats/get_pools?detail=True"
-    service = block_storage_service.BlockStorageService()
 
     # capabilities
     allow_fetch = False

openstack/block_storage/v2/type.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.block_storage import block_storage_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Type(resource.Resource):
     resource_key = "volume_type"
     resources_key = "volume_types"
     base_path = "/types"
-    service = block_storage_service.BlockStorageService()
 
     # capabilities
     allow_fetch = True

openstack/block_storage/v2/volume.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.block_storage import block_storage_service
 from openstack import format
 from openstack import resource
 
@@ -19,7 +18,6 @@ class Volume(resource.Resource):
     resource_key = "volume"
     resources_key = "volumes"
     base_path = "/volumes"
-    service = block_storage_service.BlockStorageService()
 
     _query_mapping = resource.QueryParameters(
         'all_tenants', 'name', 'status', 'project_id')

openstack/clustering/clustering_service.py

@@ -10,18 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack import service_filter
+from openstack.clustering.v1 import _proxy
+from openstack import service_description
 
 
-class ClusteringService(service_filter.ServiceFilter):
+class ClusteringService(service_description.ServiceDescription):
     """The clustering service."""
 
-    valid_versions = [service_filter.ValidVersion('v1')]
-    UNVERSIONED = None
-
-    def __init__(self, version=None):
-        """Create a clustering service."""
-        super(ClusteringService, self).__init__(
-            service_type='clustering',
-            version=version
-        )
+    supported_versions = {
+        '1': _proxy.Proxy,
+    }

openstack/clustering/v1/action.py

@@ -11,7 +11,6 @@
 # under the License.
 
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
@@ -19,7 +18,6 @@ class Action(resource.Resource):
     resource_key = 'action'
     resources_key = 'actions'
     base_path = '/actions'
-    service = clustering_service.ClusteringService()
 
     # Capabilities
     allow_list = True

openstack/clustering/v1/build_info.py

@@ -10,14 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
 class BuildInfo(resource.Resource):
     base_path = '/build-info'
     resource_key = 'build_info'
-    service = clustering_service.ClusteringService()
 
     # Capabilities
     allow_fetch = True

openstack/clustering/v1/cluster.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 from openstack import utils
 
@@ -19,7 +18,6 @@ class Cluster(resource.Resource):
     resource_key = 'cluster'
     resources_key = 'clusters'
     base_path = '/clusters'
-    service = clustering_service.ClusteringService()
 
     # capabilities
     allow_create = True

openstack/clustering/v1/cluster_attr.py

@@ -10,14 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
 class ClusterAttr(resource.Resource):
     resources_key = 'cluster_attributes'
     base_path = '/clusters/%(cluster_id)s/attrs/%(path)s'
-    service = clustering_service.ClusteringService()
 
     # capabilities
     allow_list = True

openstack/clustering/v1/cluster_policy.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class ClusterPolicy(resource.Resource):
     resource_key = 'cluster_policy'
     resources_key = 'cluster_policies'
     base_path = '/clusters/%(cluster_id)s/policies'
-    service = clustering_service.ClusteringService()
 
     # Capabilities
     allow_list = True

openstack/clustering/v1/event.py

@@ -11,7 +11,6 @@
 # under the License.
 
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
@@ -19,7 +18,6 @@ class Event(resource.Resource):
     resource_key = 'event'
     resources_key = 'events'
     base_path = '/events'
-    service = clustering_service.ClusteringService()
 
     # Capabilities
     allow_list = True

openstack/clustering/v1/node.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 from openstack import utils
 
@@ -19,7 +18,6 @@ class Node(resource.Resource):
     resource_key = 'node'
     resources_key = 'nodes'
     base_path = '/nodes'
-    service = clustering_service.ClusteringService()
 
     # capabilities
     allow_create = True

openstack/clustering/v1/policy.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Policy(resource.Resource):
     resource_key = 'policy'
     resources_key = 'policies'
     base_path = '/policies'
-    service = clustering_service.ClusteringService()
 
     # Capabilities
     allow_list = True

openstack/clustering/v1/policy_type.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class PolicyType(resource.Resource):
     resource_key = 'policy_type'
     resources_key = 'policy_types'
     base_path = '/policy-types'
-    service = clustering_service.ClusteringService()
 
     # Capabilities
     allow_list = True

openstack/clustering/v1/profile.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Profile(resource.Resource):
     resource_key = 'profile'
     resources_key = 'profiles'
     base_path = '/profiles'
-    service = clustering_service.ClusteringService()
 
     # capabilities
     allow_create = True

openstack/clustering/v1/profile_type.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 from openstack import utils
 
@@ -19,7 +18,6 @@ class ProfileType(resource.Resource):
     resource_key = 'profile_type'
     resources_key = 'profile_types'
     base_path = '/profile-types'
-    service = clustering_service.ClusteringService()
 
     # Capabilities
     allow_list = True

openstack/clustering/v1/receiver.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Receiver(resource.Resource):
     resource_key = 'receiver'
     resources_key = 'receivers'
     base_path = '/receivers'
-    service = clustering_service.ClusteringService()
 
     # Capabilities
     allow_list = True

openstack/clustering/v1/service.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Service(resource.Resource):
     resource_key = 'service'
     resources_key = 'services'
     base_path = '/services'
-    service = clustering_service.ClusteringService()
 
     # Capabilities
     allow_list = True

openstack/clustering/version.py

@@ -11,7 +11,6 @@
 # under the License.
 
 
-from openstack.clustering import clustering_service
 from openstack import resource
 
 
@@ -19,9 +18,6 @@ class Version(resource.Resource):
     resource_key = 'version'
     resources_key = 'versions'
     base_path = '/'
-    service = clustering_service.ClusteringService(
-        version=clustering_service.ClusteringService.UNVERSIONED
-    )
 
     # capabilities
     allow_list = True

openstack/compute/compute_service.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack import service_filter
+from openstack import service_description
+from openstack.compute.v2 import _proxy
 
 
-class ComputeService(service_filter.ServiceFilter):
+class ComputeService(service_description.ServiceDescription):
     """The compute service."""
 
-    valid_versions = [service_filter.ValidVersion('v2')]
-
-    def __init__(self, version=None):
-        """Create a compute service."""
-        super(ComputeService, self).__init__(service_type='compute',
-                                             version=version)
+    supported_versions = {
+        '2': _proxy.Proxy
+    }

openstack/compute/v2/availability_zone.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 
 
@@ -18,8 +17,6 @@ class AvailabilityZone(resource.Resource):
     resources_key = 'availabilityZoneInfo'
     base_path = '/os-availability-zone'
 
-    service = compute_service.ComputeService()
-
     # capabilities
     allow_list = True
 

openstack/compute/v2/extension.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Extension(resource.Resource):
     resource_key = 'extension'
     resources_key = 'extensions'
     base_path = '/extensions'
-    service = compute_service.ComputeService()
     id_attribute = "alias"
 
     # capabilities

openstack/compute/v2/flavor.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Flavor(resource.Resource):
     resource_key = 'flavor'
     resources_key = 'flavors'
     base_path = '/flavors'
-    service = compute_service.ComputeService()
 
     # capabilities
     allow_create = True

openstack/compute/v2/hypervisor.py

@@ -11,7 +11,6 @@
 # under the License.
 
 
-from openstack.compute import compute_service
 from openstack import resource
 
 
@@ -20,8 +19,6 @@ class Hypervisor(resource.Resource):
     resources_key = 'hypervisors'
     base_path = '/os-hypervisors'
 
-    service = compute_service.ComputeService()
-
     # capabilities
     allow_fetch = True
     allow_list = True

openstack/compute/v2/image.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack.compute.v2 import metadata
 from openstack import resource
 
@@ -19,7 +18,6 @@ class Image(resource.Resource, metadata.MetadataMixin):
     resource_key = 'image'
     resources_key = 'images'
     base_path = '/images'
-    service = compute_service.ComputeService()
 
     # capabilities
     allow_fetch = True

openstack/compute/v2/keypair.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Keypair(resource.Resource):
     resource_key = 'keypair'
     resources_key = 'keypairs'
     base_path = '/os-keypairs'
-    service = compute_service.ComputeService()
 
     # capabilities
     allow_create = True

openstack/compute/v2/limits.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 
 
@@ -71,7 +70,6 @@ class RateLimit(resource.Resource):
 class Limits(resource.Resource):
     base_path = "/limits"
     resource_key = "limits"
-    service = compute_service.ComputeService()
 
     allow_fetch = True
 

openstack/compute/v2/server.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack.compute.v2 import metadata
 from openstack import resource
 from openstack import utils
@@ -20,7 +19,6 @@ class Server(resource.Resource, metadata.MetadataMixin):
     resource_key = 'server'
     resources_key = 'servers'
     base_path = '/servers'
-    service = compute_service.ComputeService()
 
     # capabilities
     allow_create = True
@@ -189,7 +187,7 @@ class Server(resource.Resource, metadata.MetadataMixin):
     def get_password(self, session):
         """Get the encrypted administrator password."""
         url = utils.urljoin(Server.base_path, self.id, 'os-server-password')
-        return session.get(url, endpoint_filter=self.service)
+        return session.get(url)
 
     def reboot(self, session, reboot_type):
         """Reboot server where reboot_type might be 'SOFT' or 'HARD'."""

openstack/compute/v2/server_group.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class ServerGroup(resource.Resource):
     resource_key = 'server_group'
     resources_key = 'server_groups'
     base_path = '/os-server-groups'
-    service = compute_service.ComputeService()
 
     _query_mapping = resource.QueryParameters("all_projects")
 

openstack/compute/v2/server_interface.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class ServerInterface(resource.Resource):
     resource_key = 'interfaceAttachment'
     resources_key = 'interfaceAttachments'
     base_path = '/servers/%(server_id)s/os-interface'
-    service = compute_service.ComputeService()
 
     # capabilities
     allow_create = True

openstack/compute/v2/server_ip.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 from openstack import utils
 
@@ -18,7 +17,6 @@ from openstack import utils
 class ServerIP(resource.Resource):
     resources_key = 'addresses'
     base_path = '/servers/%(server_id)s/ips'
-    service = compute_service.ComputeService()
 
     # capabilities
     allow_list = True

openstack/compute/v2/service.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 from openstack import utils
 
@@ -20,8 +19,6 @@ class Service(resource.Resource):
     resources_key = 'services'
     base_path = '/os-services'
 
-    service = compute_service.ComputeService()
-
     # capabilities
     allow_list = True
     allow_commit = True

openstack/compute/v2/volume_attachment.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class VolumeAttachment(resource.Resource):
     resource_key = 'volumeAttachment'
     resources_key = 'volumeAttachments'
     base_path = '/servers/%(server_id)s/os-volume_attachments'
-    service = compute_service.ComputeService()
 
     # capabilities
     allow_create = True

openstack/compute/version.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.compute import compute_service
 from openstack import resource
 
 
@@ -18,9 +17,6 @@ class Version(resource.Resource):
     resource_key = 'version'
     resources_key = 'versions'
     base_path = '/'
-    service = compute_service.ComputeService(
-        version=compute_service.ComputeService.UNVERSIONED
-    )
 
     # capabilities
     allow_list = True

openstack/config/cloud_region.py

@@ -252,7 +252,13 @@ class CloudRegion(object):
             'interface', service_type, fallback_to_unprefixed=True)
 
     def get_api_version(self, service_type):
-        return self._get_config('api_version', service_type)
+        version = self._get_config('api_version', service_type)
+        if version:
+            try:
+                float(version)
+            except ValueError:
+                return None
+        return version
 
     def get_default_microversion(self, service_type):
         return self._get_config('default_microversion', service_type)
@@ -412,6 +418,20 @@ class CloudRegion(object):
 
         return version_request
 
+    def get_all_version_data(self, service_type):
+        # Seriously. Don't think about the existential crisis
+        # that is the next line. You'll wind up in cthulhu's lair.
+        service_type = self.get_service_type(service_type)
+        versions = self.get_session().get_all_version_data(
+            service_type=service_type,
+            interface=self.get_interface(service_type),
+            region_name=self.region_name,
+        )
+        region_versions = versions.get(self.region_name, {})
+        interface_versions = region_versions.get(
+            self.get_interface(service_type), {})
+        return interface_versions.get(service_type, [])
+
     def get_session_client(
             self, service_type, version=None, constructor=adapter.Adapter,
             **kwargs):
@@ -436,8 +456,10 @@ class CloudRegion(object):
                           self.get_status_code_retries(service_type))
         endpoint_override = self.get_endpoint(service_type)
         version = version_request.version
-        min_api_version = version_request.min_api_version
-        max_api_version = version_request.max_api_version
+        min_api_version = (
+            kwargs.pop('min_version', None) or version_request.min_api_version)
+        max_api_version = (
+            kwargs.pop('max_version', None) or version_request.max_api_version)
         # Older neutron has inaccessible discovery document. Nobody noticed
         # because neutronclient hard-codes an append of v2.0. YAY!
         if service_type == 'network':

openstack/database/database_service.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack import service_filter
+from openstack.database.v1 import _proxy
+from openstack import service_description
 
 
-class DatabaseService(service_filter.ServiceFilter):
+class DatabaseService(service_description.ServiceDescription):
     """The database service."""
 
-    valid_versions = [service_filter.ValidVersion('v1')]
-
-    def __init__(self, version=None):
-        """Create a database service."""
-        super(DatabaseService, self).__init__(service_type='database',
-                                              version=version)
+    supported_versions = {
+        '1': _proxy.Proxy,
+    }

openstack/database/v1/database.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.database import database_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Database(resource.Resource):
     resource_key = 'database'
     resources_key = 'databases'
     base_path = '/instances/%(instance_id)s/databases'
-    service = database_service.DatabaseService()
 
     # capabilities
     allow_create = True

openstack/database/v1/flavor.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.database import database_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Flavor(resource.Resource):
     resource_key = 'flavor'
     resources_key = 'flavors'
     base_path = '/flavors'
-    service = database_service.DatabaseService()
 
     # capabilities
     allow_list = True

openstack/database/v1/instance.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.database import database_service
 from openstack import resource
 from openstack import utils
 
@@ -19,7 +18,6 @@ class Instance(resource.Resource):
     resource_key = 'instance'
     resources_key = 'instances'
     base_path = '/instances'
-    service = database_service.DatabaseService()
 
     # capabilities
     allow_create = True

openstack/database/v1/user.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.database import database_service
 from openstack import resource
 from openstack import utils
 
@@ -19,7 +18,6 @@ class User(resource.Resource):
     resource_key = 'user'
     resources_key = 'users'
     base_path = '/instances/%(instance_id)s/users'
-    service = database_service.DatabaseService()
 
     # capabilities
     allow_create = True

openstack/identity/identity_service.py

@@ -10,25 +10,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack import service_filter
+from openstack.identity.v2 import _proxy as _proxy_v2
+from openstack.identity.v3 import _proxy as _proxy_v3
+from openstack import service_description
 
 
-class IdentityService(service_filter.ServiceFilter):
+class IdentityService(service_description.ServiceDescription):
     """The identity service."""
 
-    valid_versions = [
-        service_filter.ValidVersion('v3'),
-        service_filter.ValidVersion('v2'),
-    ]
-
-    def __init__(self, **kwargs):
-        """Create an identity service."""
-        kwargs['service_type'] = 'identity'
-        super(IdentityService, self).__init__(**kwargs)
-
-
-class AdminService(IdentityService):
-
-    def __init__(self, **kwargs):
-        kwargs['interface'] = service_filter.ServiceFilter.ADMIN
-        super(AdminService, self).__init__(**kwargs)
+    supported_versions = {
+        '2': _proxy_v2.Proxy,
+        '3': _proxy_v3.Proxy,
+    }

openstack/identity/v2/extension.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Extension(resource.Resource):
     resource_key = 'extension'
     resources_key = 'extensions'
     base_path = '/extensions'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_list = True

openstack/identity/v2/role.py

@@ -11,7 +11,6 @@
 # under the License.
 
 from openstack import format
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -19,7 +18,6 @@ class Role(resource.Resource):
     resource_key = 'role'
     resources_key = 'roles'
     base_path = '/OS-KSADM/roles'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/v2/tenant.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Tenant(resource.Resource):
     resource_key = 'tenant'
     resources_key = 'tenants'
     base_path = '/tenants'
-    service = identity_service.AdminService()
 
     # capabilities
     allow_create = True

openstack/identity/v2/user.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class User(resource.Resource):
     resource_key = 'user'
     resources_key = 'users'
     base_path = '/users'
-    service = identity_service.AdminService()
 
     # capabilities
     allow_create = True

openstack/identity/v3/credential.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Credential(resource.Resource):
     resource_key = 'credential'
     resources_key = 'credentials'
     base_path = '/credentials'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/v3/domain.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 from openstack import utils
 
@@ -19,7 +18,6 @@ class Domain(resource.Resource):
     resource_key = 'domain'
     resources_key = 'domains'
     base_path = '/domains'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/v3/endpoint.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Endpoint(resource.Resource):
     resource_key = 'endpoint'
     resources_key = 'endpoints'
     base_path = '/endpoints'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/v3/group.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Group(resource.Resource):
     resource_key = 'group'
     resources_key = 'groups'
     base_path = '/groups'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/v3/policy.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Policy(resource.Resource):
     resource_key = 'policy'
     resources_key = 'policies'
     base_path = '/policies'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/v3/project.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 from openstack import utils
 
@@ -19,7 +18,6 @@ class Project(resource.Resource):
     resource_key = 'project'
     resources_key = 'projects'
     base_path = '/projects'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True
@@ -119,7 +117,6 @@ class UserProject(Project):
     resource_key = 'project'
     resources_key = 'projects'
     base_path = '/users/%(user_id)s/projects'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = False

openstack/identity/v3/region.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Region(resource.Resource):
     resource_key = 'region'
     resources_key = 'regions'
     base_path = '/regions'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/v3/role.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Role(resource.Resource):
     resource_key = 'role'
     resources_key = 'roles'
     base_path = '/roles'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/v3/role_assignment.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class RoleAssignment(resource.Resource):
     resource_key = 'role_assignment'
     resources_key = 'role_assignments'
     base_path = '/role_assignments'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_list = True

openstack/identity/v3/role_domain_group_assignment.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class RoleDomainGroupAssignment(resource.Resource):
     resource_key = 'role'
     resources_key = 'roles'
     base_path = '/domains/%(domain_id)s/groups/%(group_id)s/roles'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_list = True

openstack/identity/v3/role_domain_user_assignment.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class RoleDomainUserAssignment(resource.Resource):
     resource_key = 'role'
     resources_key = 'roles'
     base_path = '/domains/%(domain_id)s/users/%(user_id)s/roles'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_list = True

openstack/identity/v3/role_project_group_assignment.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class RoleProjectGroupAssignment(resource.Resource):
     resource_key = 'role'
     resources_key = 'roles'
     base_path = '/projects/%(project_id)s/groups/%(group_id)s/roles'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_list = True

openstack/identity/v3/role_project_user_assignment.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class RoleProjectUserAssignment(resource.Resource):
     resource_key = 'role'
     resources_key = 'roles'
     base_path = '/projects/%(project_id)s/users/%(user_id)s/roles'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_list = True

openstack/identity/v3/service.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Service(resource.Resource):
     resource_key = 'service'
     resources_key = 'services'
     base_path = '/services'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/v3/trust.py

@@ -11,7 +11,6 @@
 # under the License.
 
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -19,7 +18,6 @@ class Trust(resource.Resource):
     resource_key = 'trust'
     resources_key = 'trusts'
     base_path = '/OS-TRUST/trusts'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/v3/user.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class User(resource.Resource):
     resource_key = 'user'
     resources_key = 'users'
     base_path = '/users'
-    service = identity_service.IdentityService()
 
     # capabilities
     allow_create = True

openstack/identity/version.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.identity import identity_service
 from openstack import resource
 
 
@@ -18,9 +17,6 @@ class Version(resource.Resource):
     resource_key = 'version'
     resources_key = 'versions'
     base_path = '/'
-    service = identity_service.IdentityService(
-        version=identity_service.IdentityService.UNVERSIONED
-    )
 
     # capabilities
     allow_list = True

openstack/image/image_service.py

@@ -10,18 +10,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack import service_filter
+from openstack.image.v1 import _proxy as _proxy_v1
+from openstack.image.v2 import _proxy as _proxy_v2
+from openstack import service_description
 
 
-class ImageService(service_filter.ServiceFilter):
+class ImageService(service_description.ServiceDescription):
     """The image service."""
 
-    valid_versions = [
-        service_filter.ValidVersion('v2'),
-        service_filter.ValidVersion('v1')
-    ]
-
-    def __init__(self, version=None):
-        """Create an image service."""
-        super(ImageService, self).__init__(service_type='image',
-                                           version=version)
+    supported_versions = {
+        '1': _proxy_v1.Proxy,
+        '2': _proxy_v2.Proxy,
+    }

openstack/image/v1/image.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.image import image_service
 from openstack import resource
 
 
@@ -18,7 +17,6 @@ class Image(resource.Resource):
     resource_key = 'image'
     resources_key = 'images'
     base_path = '/images'
-    service = image_service.ImageService()
 
     # capabilities
     allow_create = True

openstack/image/v2/image.py

@@ -14,7 +14,6 @@ import hashlib
 
 from openstack import _log
 from openstack import exceptions
-from openstack.image import image_service
 from openstack import resource
 from openstack import utils
 
@@ -24,7 +23,6 @@ _logger = _log.setup_logging('openstack')
 class Image(resource.Resource):
     resources_key = 'images'
     base_path = '/images'
-    service = image_service.ImageService()
 
     # capabilities
     allow_create = True

openstack/image/v2/member.py

@@ -10,14 +10,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.image import image_service
 from openstack import resource
 
 
 class Member(resource.Resource):
     resources_key = 'members'
     base_path = '/images/%(image_id)s/members'
-    service = image_service.ImageService()
 
     # capabilities
     allow_create = True

openstack/instance_ha/instance_ha_service.py

@@ -12,15 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from openstack import service_filter
+from openstack.instance_ha.v1 import _proxy
+from openstack import service_description
 
 
-class InstanceHaService(service_filter.ServiceFilter):
+class InstanceHaService(service_description.ServiceDescription):
     """The HA service."""
 
-    valid_versions = [service_filter.ValidVersion('v1')]
-
-    def __init__(self, version=None):
-        """Create an ha service."""
-        super(InstanceHaService, self).__init__(service_type='ha',
-                                                version=version)
+    supported_versions = {
+        '1': _proxy.Proxy,
+    }

openstack/instance_ha/v1/host.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from openstack.instance_ha import instance_ha_service
 from openstack import resource
 
 
@@ -20,7 +19,6 @@ class Host(resource.Resource):
     resource_key = "host"
     resources_key = "hosts"
     base_path = "/segments/%(segment_id)s/hosts"
-    service = instance_ha_service.InstanceHaService()
 
     # capabilities
     # 1] GET /v1/segments/<segment_uuid>/hosts

openstack/instance_ha/v1/notification.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from openstack.instance_ha import instance_ha_service
 from openstack import resource
 
 
@@ -20,7 +19,6 @@ class Notification(resource.Resource):
     resource_key = "notification"
     resources_key = "notifications"
     base_path = "/notifications"
-    service = instance_ha_service.InstanceHaService()
 
     # capabilities
     # 1] GET /v1/notifications

openstack/instance_ha/v1/segment.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from openstack.instance_ha import instance_ha_service
 from openstack import resource
 
 
@@ -20,7 +19,6 @@ class Segment(resource.Resource):
     resource_key = "segment"
     resources_key = "segments"
     base_path = "/segments"
-    service = instance_ha_service.InstanceHaService()
 
     # capabilities
     # 1] GET /v1/segments

openstack/key_manager/key_manager_service.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack import service_filter
+from openstack.key_manager.v1 import _proxy
+from openstack import service_description
 
 
-class KeyManagerService(service_filter.ServiceFilter):
+class KeyManagerService(service_description.ServiceDescription):
     """The key manager service."""
 
-    valid_versions = [service_filter.ValidVersion('v1')]
-
-    def __init__(self, version=None):
-        """Create a key manager service."""
-        super(KeyManagerService, self).__init__(service_type='key-manager',
-                                                version=version)
+    supported_versions = {
+        '1': _proxy.Proxy,
+    }

openstack/key_manager/v1/container.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.key_manager import key_manager_service
 from openstack.key_manager.v1 import _format
 from openstack import resource
 
@@ -18,7 +17,6 @@ from openstack import resource
 class Container(resource.Resource):
     resources_key = 'containers'
     base_path = '/containers'
-    service = key_manager_service.KeyManagerService()
 
     # capabilities
     allow_create = True

openstack/key_manager/v1/order.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.key_manager import key_manager_service
 from openstack.key_manager.v1 import _format
 from openstack import resource
 
@@ -18,7 +17,6 @@ from openstack import resource
 class Order(resource.Resource):
     resources_key = 'orders'
     base_path = '/orders'
-    service = key_manager_service.KeyManagerService()
 
     # capabilities
     allow_create = True

openstack/key_manager/v1/secret.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.key_manager import key_manager_service
 from openstack.key_manager.v1 import _format
 from openstack import resource
 from openstack import utils
@@ -19,7 +18,6 @@ from openstack import utils
 class Secret(resource.Resource):
     resources_key = 'secrets'
     base_path = '/secrets'
-    service = key_manager_service.KeyManagerService()
 
     # capabilities
     allow_create = True

openstack/load_balancer/load_balancer_service.py

@@ -10,17 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack import service_filter
+from openstack.load_balancer.v2 import _proxy
+from openstack import service_description
 
 
-class LoadBalancerService(service_filter.ServiceFilter):
+class LoadBalancerService(service_description.ServiceDescription):
     """The load balancer service."""
 
-    valid_versions = [service_filter.ValidVersion('v2', 'v2.0')]
-
-    def __init__(self, version=None):
-        """Create a load balancer service."""
-        super(LoadBalancerService, self).__init__(
-            service_type='load-balancer',
-            version=version
-        )
+    supported_versions = {
+        '2': _proxy.Proxy,
+    }

openstack/load_balancer/v2/health_monitor.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.load_balancer import load_balancer_service as lb_service
 from openstack import resource
 
 
 class HealthMonitor(resource.Resource):
     resource_key = 'healthmonitor'
     resources_key = 'healthmonitors'
-    base_path = '/v2.0/lbaas/healthmonitors'
-    service = lb_service.LoadBalancerService()
+    base_path = '/lbaas/healthmonitors'
 
     # capabilities
     allow_create = True

openstack/load_balancer/v2/l7_policy.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.load_balancer import load_balancer_service as lb_service
 from openstack import resource
 
 
 class L7Policy(resource.Resource):
     resource_key = 'l7policy'
     resources_key = 'l7policies'
-    base_path = '/v2.0/lbaas/l7policies'
-    service = lb_service.LoadBalancerService()
+    base_path = '/lbaas/l7policies'
 
     # capabilities
     allow_create = True

openstack/load_balancer/v2/l7_rule.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.load_balancer import load_balancer_service as lb_service
 from openstack import resource
 
 
 class L7Rule(resource.Resource):
     resource_key = 'rule'
     resources_key = 'rules'
-    base_path = '/v2.0/lbaas/l7policies/%(l7policy_id)s/rules'
-    service = lb_service.LoadBalancerService()
+    base_path = '/lbaas/l7policies/%(l7policy_id)s/rules'
 
     # capabilities
     allow_create = True

openstack/load_balancer/v2/listener.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.load_balancer import load_balancer_service as lb_service
 from openstack import resource
 
 
 class Listener(resource.Resource):
     resource_key = 'listener'
     resources_key = 'listeners'
-    base_path = '/v2.0/lbaas/listeners'
-    service = lb_service.LoadBalancerService()
+    base_path = '/lbaas/listeners'
 
     # capabilities
     allow_create = True

openstack/load_balancer/v2/load_balancer.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.load_balancer import load_balancer_service as lb_service
 from openstack import resource
 
 
 class LoadBalancer(resource.Resource):
     resource_key = 'loadbalancer'
     resources_key = 'loadbalancers'
-    base_path = '/v2.0/lbaas/loadbalancers'
-    service = lb_service.LoadBalancerService()
+    base_path = '/lbaas/loadbalancers'
 
     # capabilities
     allow_create = True

openstack/load_balancer/v2/member.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.load_balancer import load_balancer_service as lb_service
 from openstack import resource
 
 
 class Member(resource.Resource):
     resource_key = 'member'
     resources_key = 'members'
-    base_path = '/v2.0/lbaas/pools/%(pool_id)s/members'
-    service = lb_service.LoadBalancerService()
+    base_path = '/lbaas/pools/%(pool_id)s/members'
 
     # capabilities
     allow_create = True

openstack/load_balancer/v2/pool.py

@@ -10,15 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.load_balancer import load_balancer_service as lb_service
 from openstack import resource
 
 
 class Pool(resource.Resource):
     resource_key = 'pool'
     resources_key = 'pools'
-    base_path = '/v2.0/lbaas/pools'
-    service = lb_service.LoadBalancerService()
+    base_path = '/lbaas/pools'
 
     # capabilities
     allow_create = True

openstack/load_balancer/version.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack.load_balancer import load_balancer_service as lb_service
 from openstack import resource
 
 
@@ -18,9 +17,6 @@ class Version(resource.Resource):
     resource_key = 'version'
     resources_key = 'versions'
     base_path = '/'
-    service = lb_service.LoadBalancerService(
-        version=lb_service.LoadBalancerService.UNVERSIONED
-    )
 
     # capabilities
     allow_list = True

openstack/message/message_service.py

@@ -10,17 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from openstack import service_filter
+from openstack.message.v2 import _proxy
+from openstack import service_description
 
 
-class MessageService(service_filter.ServiceFilter):
+class MessageService(service_description.ServiceDescription):
     """The message service."""
 
-    valid_versions = [service_filter.ValidVersion('v2')]
-
-    def __init__(self, version=None):
-        """Create a message service."""
-        super(MessageService, self).__init__(
-            service_type='messaging',
-            version=version
-        )
+    supported_versions = {
+        '2': _proxy.Proxy,
+    }