do some fixes to update openstacksdk version

Author: gtema

otcextensions/sdk/__init__.py

@@ -11,14 +11,11 @@
 # under the License.
 import importlib
 import os
-import sys
-import traceback
 import types
 import warnings
 
 from openstack import _log
 from openstack import connection
-# from openstack import proxy
 from openstack import service_description
 from openstack import utils
 
@@ -47,7 +44,7 @@
     'anti_ddos': {
         'service_type': 'anti_ddos',
         'append_project_id': True,
-        'endpoint_service_type': 'Anti-DDoS',
+        'endpoint_service_type': 'antiddos',
     },
     'auto_scaling': {
         'service_type': 'auto_scaling',
@@ -98,20 +95,6 @@
 }
 
 
-def _import_class(import_str):
-    """Returns a class from a string including module and class.
-    .. versionadded:: 0.3
-    """
-    mod_str, _sep, class_str = import_str.rpartition('.')
-    __import__(mod_str)
-    try:
-        return getattr(sys.modules[mod_str], class_str)
-    except AttributeError:
-        raise ImportError('Class %s cannot be found (%s)' %
-                          (class_str,
-                           traceback.format_exception(*sys.exc_info())))
-
-
 def _get_descriptor(service_name):
     """Find ServiceDescriptor class by the service name
     and instanciate it
@@ -122,7 +105,10 @@ def _get_descriptor(service_name):
 
         desc_class = _find_service_description_class(service_type)
         # _logger.debug('descriptor class %s' % desc_class)
-        descriptor_args = {'service_type': service_type}
+        descriptor_args = {
+            'service_type': service.get('endpoint_service_type', service_type)
+            # 'service_type': service_type
+        }
 
         if not desc_class.supported_versions:
             doc = _DOC_TEMPLATE.format(
@@ -197,11 +183,6 @@ def get_otc_proxy(self, service_name=None, service=None):
 
             proxy = descriptor.__get__(self, descriptor)
 
-            endpoint_service_type = service.get('endpoint_service_type', None)
-            if endpoint_service_type and \
-                    endpoint_service_type != service.get('service_type'):
-                proxy.service_type = endpoint_service_type
-
             # Set additional_headers into the proxy
             if 'additional_headers' in service:
                 proxy.additional_headers = service.get('additional_headers')

otcextensions/sdk/anti_ddos/v1/_proxy.py

@@ -20,6 +20,8 @@
 
 class Proxy(sdk_proxy.Proxy):
 
+    skip_discovery = True
+
     # ======== Alert Config ========
     def get_alert_config(self, **kwargs):
         """Get Alarm configuration

otcextensions/sdk/auto_scaling/v1/_proxy.py

@@ -24,6 +24,8 @@
 
 class Proxy(sdk_proxy.Proxy):
 
+    skip_discovery = True
+
     # ======== Groups ========
     def groups(self, **query):
         """Retrieve a generator of groups

otcextensions/sdk/cce/v1/_proxy.py

@@ -16,6 +16,8 @@
 
 class Proxy(sdk_proxy.Proxy):
 
+    skip_discovery = True
+
     # ======== Cluster ========
     def clusters(self):
         """List all Clusters.

otcextensions/sdk/cts/v1/_proxy.py

@@ -17,6 +17,8 @@
 
 class Proxy(sdk_proxy.Proxy):
 
+    skip_discovery = True
+
     def traces(self, tracker='system', limit=50, **query):
         """List all traces
 

otcextensions/sdk/dcs/v1/_proxy.py

@@ -21,6 +21,8 @@
 
 class Proxy(sdk_proxy.Proxy):
 
+    skip_discovery = True
+
     # ======== Instances ========
     def create_instance(self, **kwargs):
         """Create an instance

otcextensions/sdk/dms/v1/_proxy.py

@@ -20,6 +20,8 @@
 
 class Proxy(sdk_proxy.Proxy):
 
+    skip_discovery = True
+
     # ======== Queues ========
     def create_queue(self, **kwargs):
         """Create a queue

otcextensions/sdk/kms/v1/_proxy.py

@@ -17,6 +17,8 @@
 
 class Proxy(sdk_proxy.Proxy):
 
+    skip_discovery = True
+
     # ======== CMK Keys ========
     def keys(self, **query):
         """List all master keys.

otcextensions/sdk/obs/v1/_proxy.py

@@ -26,6 +26,8 @@ def _normalize_obs_keys(obj):
 
 class Proxy(sdk_proxy.Proxy):
 
+    skip_discovery = True
+
     CONTAINER_ENDPOINT = \
         'https://%(container)s.obs.%(region_name)s.otc.t-systems.com'
 

otcextensions/sdk/rds/v1/_proxy.py

@@ -24,6 +24,8 @@
 
 class Proxy(sdk_proxy.Proxy):
 
+    skip_discovery = True
+
     def get_os_endpoint(self, **kwargs):
         """Return OpenStack compliant endpoint