Collapse OpenStackSDKAdapter into Proxy

We have two subclasses of keystoneauth1.adapter.Adapter. We never use OpenStackSDKAdapter directly for anything. Collapse it in to Proxy. Change-Id: Ia0034348d80804e31867349b0939b37fb2b8f21f
openstack · Mar 11, 2019 · f9b0911 · f9b0911
1 parent 47afa68
commit f9b0911
Show file tree

Hide file tree

Showing 11 changed files with 239 additions and 297 deletions.
diff --git a/doc/source/contributor/coding.rst b/doc/source/contributor/coding.rst
@@ -63,7 +63,7 @@ Returned Resources
 ------------------
 
 Complex objects returned to the caller must be a `munch.Munch` type. The
-`openstack._adapter.ShadeAdapter` class makes resources into `munch.Munch`.
+`openstack.proxy._ShadeAdapter` class makes resources into `munch.Munch`.
 
 All objects should be normalized. It is shade's purpose in life to make
 OpenStack consistent for end users, and this means not trusting the clouds

diff --git a/doc/source/contributor/layout.rst b/doc/source/contributor/layout.rst
@@ -56,18 +56,12 @@ Each service implements a ``Proxy`` class based on
 service's ``Proxy`` exists in ``openstack/compute/v2/_proxy.py``.
 
 The :class:`~openstack.proxy.Proxy` class is based on
-:class:`~openstack._adapter.OpenStackSDKAdapter` which is in turn based on
 :class:`~keystoneauth1.adapter.Adapter`.
 
 .. autoclass:: openstack.proxy.Proxy
    :members:
    :show-inheritance:
 
-.. autoclass:: openstack._adapter.OpenStackSDKAdapter
-   :members:
-   :inherited-members:
-   :show-inheritance:
-
 Each service's ``Proxy`` provides a higher-level interface for users to work
 with via a :class:`~openstack.connection.Connection` instance.
 

diff --git a/openstack/_adapter.py b/openstack/_adapter.py