File revert-ksa.diff of Package python-shade

Overview Repositories Revisions Requests Users Attributes Meta

File revert-ksa.diff of Package python-shade (Revision 7518c70555eba9fd532e07b4c869030a)

Currently displaying revision 7518c70555eba9fd532e07b4c869030a , Show latest

Index: shade-0.15.0/shade/__init__.py
===================================================================
--- shade-0.15.0.orig/shade/__init__.py
+++ shade-0.15.0/shade/__init__.py
@@ -27,13 +27,14 @@ import glanceclient.exc
 from glanceclient.common import utils as glance_utils
 from ironicclient import client as ironic_client
 from ironicclient import exceptions as ironic_exceptions
 import jsonpatch
-import keystoneauth1.exceptions
-from keystoneauth1 import plugin as ksa_plugin
-from keystoneauth1 import session as ksa_session
+from keystoneclient import auth as ksc_auth
+from keystoneclient.auth import token_endpoint
 from keystoneclient.v2_0 import client as k2_client
 from keystoneclient.v3 import client as k3_client
+from keystoneclient import exceptions as keystone_exceptions
+from keystoneclient import session as ksc_session
 from novaclient import client as nova_client
 from novaclient import exceptions as nova_exceptions
 from neutronclient.common import exceptions as neutron_exceptions
 from neutronclient.v2_0 import client as neutron_client
@@ -124,21 +125,17 @@ def openstack_clouds(config=None, debug=
                 cloud_config=f,
                 **f.config)
             for f in config.get_all_clouds()
         ]
-    except keystoneauth1.exceptions.auth_plugins.NoMatchingPlugin as e:
+    except keystone_exceptions.NoMatchingPlugin as e:
         raise OpenStackCloudException(
             "Invalid cloud configuration: {exc}".format(exc=str(e)))
 
 
 def openstack_cloud(config=None, **kwargs):
     if not config:
         config = os_client_config.OpenStackConfig()
-    try:
-        cloud_config = config.get_one_cloud(**kwargs)
-    except keystoneauth1.exceptions.auth_plugins.NoMatchingPlugin as e:
-        raise OpenStackCloudException(
-            "Invalid cloud configuration: {exc}".format(exc=str(e)))
+    cloud_config = config.get_one_cloud(**kwargs)
     return OpenStackCloud(
         cache_interval=config.get_cache_max_age(),
         cache_class=config.get_cache_class(),
         cache_arguments=config.get_cache_arguments(),
@@ -149,13 +146,9 @@ def operator_cloud(config=None, **kwargs
     if 'interface' not in kwargs:
         kwargs['interface'] = 'admin'
     if not config:
         config = os_client_config.OpenStackConfig()
-    try:
-        cloud_config = config.get_one_cloud(**kwargs)
-    except keystoneauth1.exceptions.auth_plugins.NoMatchingPlugin as e:
-        raise OpenStackCloudException(
-            "Invalid cloud configuration: {exc}".format(exc=str(e)))
+    cloud_config = config.get_one_cloud(**kwargs)
     return OperatorCloud(
         cache_interval=config.get_cache_max_age(),
         cache_class=config.get_cache_class(),
         cache_arguments=config.get_cache_arguments(),
@@ -239,8 +232,9 @@ class OpenStackCloud(object):
 
         self.name = cloud_config.name
         self.auth = cloud_config.get_auth_args()
         self.region_name = cloud_config.region_name
+        self.auth_type = cloud_config.config['auth_type']
         self.default_interface = cloud_config.get_interface()
         self.private = cloud_config.config.get('private', False)
         self.api_timeout = cloud_config.config['api_timeout']
         self.image_api_use_tasks = cloud_config.config['image_api_use_tasks']
@@ -330,26 +324,20 @@ class OpenStackCloud(object):
                 [str(name_key), fname, arg_key, kwargs_key])
             return ans
         return generate_key
 
-    def _get_client(
-            self, service_key, client_class, interface_key='endpoint_type',
-            pass_version_arg=True, **kwargs):
+    def _get_client(self, service_key, client_class):
         try:
-            interface = self.cloud_config.get_interface(service_key)
             # trigger exception on lack of service
             self.get_session_endpoint(service_key)
-            constructor_args = dict(
+            client = client_class(
+                version=self.cloud_config.get_api_version(service_key),
                 session=self.keystone_session,
                 service_name=self.cloud_config.get_service_name(service_key),
                 service_type=self.cloud_config.get_service_type(service_key),
-                region_name=self.region_name)
-            constructor_args.update(kwargs)
-            constructor_args[interface_key] = interface
-            if pass_version_arg:
-                version = self.cloud_config.get_api_version(service_key)
-                constructor_args['version'] = version
-            client = client_class(**constructor_args)
+                endpoint_type=self.cloud_config.get_interface(service_key),
+                region_name=self.region_name,
+                timeout=self.api_timeout)
         except Exception:
             self.log.debug(
                 "Couldn't construct {service} object".format(
                     service=service_key), exc_info=True)
@@ -367,8 +355,20 @@ class OpenStackCloud(object):
             self._nova_client = self._get_client(
                 'compute', nova_client.Client)
         return self._nova_client
 
+    def _get_auth_plugin_class(self):
+        try:
+            if self.auth_type == 'token_endpoint':
+                return token_endpoint.Token
+            else:
+                return ksc_auth.get_plugin_class(self.auth_type)
+        except Exception as e:
+            self.log.debug("keystone auth plugin failure", exc_info=True)
+            raise OpenStackCloudException(
+                "Could not find auth plugin: {plugin} {error}".format(
+                    plugin=self.auth_type, error=str(e)))
+
     def _get_identity_client_class(self):
         if self.cloud_config.get_api_version('identity') == '3':
             return k3_client.Client
         elif self.cloud_config.get_api_version('identity') in ('2', '2.0'):
@@ -380,34 +380,47 @@ class OpenStackCloud(object):
     @property
     def keystone_session(self):
         if self._keystone_session is None:
 
+            auth_plugin = self._get_auth_plugin_class()
             try:
-                keystone_auth = self.cloud_config.get_auth()
-                if not keystone_auth:
-                    raise OpenStackCloudException(
-                        "Problem with auth parameters")
-                self._keystone_session = ksa_session.Session(
+                keystone_auth = auth_plugin(**self.auth)
+            except Exception as e:
+                self.log.debug(
+                    "keystone couldn't construct plugin", exc_info=True)
+                raise OpenStackCloudException(
+                    "Error constructing auth plugin: {plugin} {error}".format(
+                        plugin=self.auth_type, error=str(e)))
+
+            try:
+                self._keystone_session = ksc_session.Session(
                     auth=keystone_auth,
                     verify=self.verify,
-                    cert=self.cert,
-                    timeout=self.api_timeout)
+                    cert=self.cert)
             except Exception as e:
+                self.log.debug("keystone unknown issue", exc_info=True)
                 raise OpenStackCloudException(
-                    "Error authenticating to keystone: %s " % str(e))
+                    "Error authenticating to the keystone: %s " % str(e))
         return self._keystone_session
 
     @property
     def keystone_client(self):
         if self._keystone_client is None:
-            self._keystone_client = self._get_client(
-                'identity', self._get_identity_client_class())
+            try:
+                self._keystone_client = self._get_identity_client_class()(
+                    session=self.keystone_session,
+                    timeout=self.api_timeout)
+            except Exception as e:
+                self.log.debug(
+                    "Couldn't construct keystone object", exc_info=True)
+                raise OpenStackCloudException(
+                    "Error constructing keystone client: %s" % str(e))
         return self._keystone_client
 
     @property
     def service_catalog(self):
         return self.keystone_session.auth.get_access(
-            self.keystone_session).service_catalog.catalog
+            self.keystone_session).service_catalog.get_data()
 
     @property
     def auth_token(self):
         # Keystone's session will reuse a token if it is still valid.
@@ -595,23 +608,36 @@ class OpenStackCloud(object):
         self.get_user_cache.invalidate(self)
 
     @property
     def glance_client(self):
+        service_key = 'image'
+        try:
+            # trigger exception on lack of service
+            self.get_session_endpoint(service_key)
+            self._glance_client = glanceclient.Client(
+                version=self.cloud_config.get_api_version(service_key),
+                session=self.keystone_session,
+                service_name=self.cloud_config.get_service_name(service_key),
+                service_type=self.cloud_config.get_service_type(service_key),
+                interface=self.cloud_config.get_interface(service_key),
+                region_name=self.region_name)
+        except Exception:
+            self.log.debug(
+                "Couldn't construct {service} object".format(
+                    service=service_key), exc_info=True)
+            raise
         if self._glance_client is None:
-            endpoint, version = glance_utils.strip_version(
-                self.get_session_endpoint(service_key='image'))
-            # TODO(mordred): Put check detected vs. configured version
-            # and warn if they're different.
-            self._glance_client = self._get_client(
-                'image', glanceclient.Client, interface_key='interface',
-                endpoint=endpoint)
+            raise OpenStackCloudException(
+                "Failed to instantiate {service} client."
+                " This could mean that your credentials are wrong.".format(
+                    service=service_key))
         return self._glance_client
 
     @property
     def swift_client(self):
         if self._swift_client is None:
             try:
-                token = self.keystone_session.get_token()
+                token = self.auth_token
                 endpoint = self.get_session_endpoint(
                     service_key='object-store')
                 self._swift_client = swift_client.Connection(
                     preauthurl=endpoint,
@@ -680,10 +706,15 @@ class OpenStackCloud(object):
 
     @property
     def neutron_client(self):
         if self._neutron_client is None:
-            self._neutron_client = self._get_client(
-                'network', neutron_client.Client, pass_version_arg=False)
+            # trigger exception on lack of neutron
+            self.get_session_endpoint('network')
+            self._neutron_client = neutron_client.Client(
+                token=self.auth_token,
+                session=self.keystone_session,
+                region_name=self.region_name,
+                timeout=self.api_timeout)
         return self._neutron_client
 
     @property
     def designate_client(self):
@@ -731,18 +762,18 @@ class OpenStackCloud(object):
         try:
             # keystone is a special case in keystone, because what?
             if service_key == 'identity':
                 endpoint = self.keystone_session.get_endpoint(
-                    interface=ksa_plugin.AUTH_INTERFACE)
+                    interface=ksc_auth.AUTH_INTERFACE)
             else:
                 endpoint = self.keystone_session.get_endpoint(
                     service_type=self.cloud_config.get_service_type(
                         service_key),
                     service_name=self.cloud_config.get_service_name(
                         service_key),
                     interface=self.cloud_config.get_interface(service_key),
                     region_name=self.region_name)
-        except keystoneauth1.exceptions.catalog.EndpointNotFound as e:
+        except keystone_exceptions.EndpointNotFound as e:
             self.log.debug(
                 "Endpoint not found in %s cloud: %s", self.name, str(e))
             endpoint = None
         except Exception as e:
@@ -3381,26 +3412,56 @@ class OperatorCloud(OpenStackCloud):
 
     See the :class:`OpenStackCloud` class for a description of most options.
     """
 
-    # Set the ironic API microversion to a known-good
-    # supported/tested with the contents of shade.
-    #
-    # Note(TheJulia): Defaulted to version 1.6 as the ironic
-    # state machine changes which will increment the version
-    # and break an automatic transition of an enrolled node
-    # to an available state. Locking the version is intended
-    # to utilize the original transition until shade supports
-    # calling for node inspection to allow the transition to
-    # take place automatically.
-    ironic_api_microversion = '1.6'
+    @property
+    def auth_token(self):
+        if self.auth_type in (None, "None", ''):
+            # Ironic can operate in no keystone mode. Signify this with a
+            # token of None.
+            return None
+        else:
+            # Keystone's session will reuse a token if it is still valid.
+            # We don't need to track validity here, just get_token() each time.
+            return self.keystone_session.get_token()
 
     @property
     def ironic_client(self):
         if self._ironic_client is None:
-            self._ironic_client = self._get_client(
-                'baremetal', ironic_client.Client,
-                os_ironic_api_version=self.ironic_api_microversion)
+            token = self.auth_token
+            # Set the ironic API microversion to a known-good
+            # supported/tested with the contents of shade.
+            #
+            # Note(TheJulia): Defaulted to version 1.6 as the ironic
+            # state machine changes which will increment the version
+            # and break an automatic transition of an enrolled node
+            # to an available state. Locking the version is intended
+            # to utilize the original transition until shade supports
+            # calling for node inspection to allow the transition to
+            # take place automatically.
+            ironic_api_microversion = '1.6'
+
+            if self.auth_type in (None, "None", ''):
+                # TODO: This needs to be improved logic wise, perhaps a list,
+                # or enhancement of the data stuctures with-in the library
+                # to allow for things aside password authentication, or no
+                # authentication if so desired by the user.
+                #
+                # Attempt to utilize a pre-stored endpoint in the auth
+                # dict as the endpoint.
+                endpoint = self.auth['endpoint']
+            else:
+                endpoint = self.get_session_endpoint(service_key='baremetal')
+            try:
+                self._ironic_client = ironic_client.Client(
+                    self.cloud_config.get_api_version('baremetal'),
+                    endpoint, token=token,
+                    timeout=self.api_timeout,
+                    os_ironic_api_version=ironic_api_microversion)
+            except Exception as e:
+                self.log.debug("ironic auth failed", exc_info=True)
+                raise OpenStackCloudException(
+                    "Error in connecting to ironic: %s" % str(e))
         return self._ironic_client
 
     def list_nics(self):
         try:
Index: shade-0.15.0/shade/tests/unit/test_shade_operator.py
===================================================================
--- shade-0.15.0.orig/shade/tests/unit/test_shade_operator.py
+++ shade-0.15.0/shade/tests/unit/test_shade_operator.py
@@ -11,9 +11,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystoneauth1 import plugin as ksc_plugin
+from keystoneclient import auth as ksc_auth
 
 import mock
 import testtools
 
@@ -774,9 +774,9 @@ class TestShadeOperator(base.TestCase):
     @mock.patch.object(shade.OpenStackCloud, 'keystone_session')
     def test_get_session_endpoint_identity(self, session_mock):
         self.cloud.get_session_endpoint('identity')
         session_mock.get_endpoint.assert_called_with(
-            interface=ksc_plugin.AUTH_INTERFACE)
+            interface=ksc_auth.AUTH_INTERFACE)
 
     @mock.patch.object(shade.OpenStackCloud, 'keystone_session')
     def test_has_service_no(self, session_mock):
         session_mock.get_endpoint.return_value = None
Index: shade-0.15.0/shade/tests/unit/test_shade.py
===================================================================
--- shade-0.15.0.orig/shade/tests/unit/test_shade.py
+++ shade-0.15.0/shade/tests/unit/test_shade.py
@@ -14,8 +14,10 @@
 
 import mock
 
 import glanceclient
+import keystoneclient.auth.identity.generic.password
+import keystoneclient.auth.token_endpoint
 from keystoneclient.v2_0 import client as k2_client
 from keystoneclient.v3 import client as k3_client
 from neutronclient.common import exceptions as n_exc
 
@@ -29,13 +31,32 @@ from shade.tests.unit import base
 class TestShade(base.TestCase):
 
     def setUp(self):
         super(TestShade, self).setUp()
-        self.cloud = shade.openstack_cloud(validate=False)
+        self.cloud = shade.openstack_cloud()
 
     def test_openstack_cloud(self):
         self.assertIsInstance(self.cloud, shade.OpenStackCloud)
 
+    def test_get_auth_token_endpoint(self):
+        self.cloud.auth_type = 'token_endpoint'
+        plugin = self.cloud._get_auth_plugin_class()
+
+        self.assertIs(plugin, keystoneclient.auth.token_endpoint.Token)
+
+    def test_get_auth_bogus(self):
+        self.cloud.auth_type = 'bogus'
+        self.assertRaises(
+            exc.OpenStackCloudException,
+            self.cloud._get_auth_plugin_class)
+
+    def test_get_auth_password(self):
+        plugin = self.cloud._get_auth_plugin_class()
+
+        self.assertIs(
+            plugin,
+            keystoneclient.auth.identity.generic.password.Password)
+
     @mock.patch.object(
         os_client_config.cloud_config.CloudConfig, 'get_api_version')
     def test_get_client_v2(self, mock_api_version):
         mock_api_version.return_value = '2'
Index: shade-0.15.0/requirements.txt
===================================================================
--- shade-0.15.0.orig/requirements.txt
+++ shade-0.15.0/requirements.txt
@@ -5,9 +5,8 @@ decorator
 jsonpatch
 os-client-config>=1.7.4
 six
 
-keystoneauth1>=1.0.0
 python-novaclient>=2.21.0,!=2.27.0
 python-keystoneclient>=0.11.0
 python-glanceclient>=1.0.0
 python-cinderclient<1.2
Index: shade-0.15.0/shade.egg-info/requires.txt
===================================================================
--- shade-0.15.0.orig/shade.egg-info/requires.txt
+++ shade-0.15.0/shade.egg-info/requires.txt
@@ -3,9 +3,8 @@ bunch
 decorator
 jsonpatch
 os-client-config>=1.7.4
 six
-keystoneauth1>=1.0.0
 python-novaclient>=2.21.0,!=2.27.0
 python-keystoneclient>=0.11.0
 python-glanceclient>=1.0.0
 python-cinderclient<1.2

Places

File revert-ksa.diff of Package python-shade (Revision 7518c70555eba9fd532e07b4c869030a)

Places