summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/clientmanager.py14
-rw-r--r--openstackclient/common/utils.py15
2 files changed, 15 insertions, 14 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index a2f85aff..4dcec8e0 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -19,6 +19,7 @@ import logging
import pkg_resources
import sys
+from openstackclient.common import restapi
from openstackclient.identity import client as identity_client
@@ -77,7 +78,18 @@ class ClientManager(object):
self._insecure = not verify
else:
self._cacert = verify
- self._insecure = True
+ self._insecure = False
+
+ self.session = restapi.RESTApi(
+ verify=verify,
+ debug=True,
+ )
+
+ # Get logging from root logger
+ root_logger = logging.getLogger('')
+ LOG.setLevel(root_logger.getEffectiveLevel())
+ restapi_logger = logging.getLogger('restapi')
+ restapi_logger.setLevel(root_logger.getEffectiveLevel())
self.auth_ref = None
diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py
index eb7f1b0e..227b0438 100644
--- a/openstackclient/common/utils.py
+++ b/openstackclient/common/utils.py
@@ -19,10 +19,10 @@ import getpass
import logging
import os
import six
-import sys
import time
from openstackclient.common import exceptions
+from openstackclient.openstack.common import importutils
def find_resource(manager, name_or_id):
@@ -157,17 +157,6 @@ def env(*vars, **kwargs):
return kwargs.get('default', '')
-def import_class(import_str):
- """Returns a class from a string including module and class
-
- :param import_str: a string representation of the class name
- :rtype: the requested class
- """
- mod_str, _sep, class_str = import_str.rpartition('.')
- __import__(mod_str)
- return getattr(sys.modules[mod_str], class_str)
-
-
def get_client_class(api_name, version, version_map):
"""Returns the client class for the requested API version
@@ -183,7 +172,7 @@ def get_client_class(api_name, version, version_map):
(api_name, version, ', '.join(version_map.keys())))
raise exceptions.UnsupportedVersion(msg)
- return import_class(client_path)
+ return importutils.import_class(client_path)
def wait_for_status(status_f,