summaryrefslogtreecommitdiff
path: root/openstackclient/common/clientmanager.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-07-11 18:22:06 +0000
committerGerrit Code Review <review@openstack.org>2014-07-11 18:22:06 +0000
commitbc6495c6a19abb67a9af9bc94e82e6c12b1a7b83 (patch)
tree367c6f6c359ebed491cefae63ceabf8ddbe55093 /openstackclient/common/clientmanager.py
parent70283744a04f868072edc0a31fe49a3122c4bc6e (diff)
parent4844a257790deef231176557776754dde929f840 (diff)
downloadpython-openstackclient-bc6495c6a19abb67a9af9bc94e82e6c12b1a7b83.tar.gz
Merge "Add basic timing support"
Diffstat (limited to 'openstackclient/common/clientmanager.py')
-rw-r--r--openstackclient/common/clientmanager.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index b310f3ac..a2f85aff 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -49,7 +49,7 @@ class ClientManager(object):
user_domain_id=None, user_domain_name=None,
project_domain_id=None, project_domain_name=None,
region_name=None, api_version=None, verify=True,
- trust_id=None):
+ trust_id=None, timing=None):
self._token = token
self._url = url
self._auth_url = auth_url
@@ -67,6 +67,7 @@ class ClientManager(object):
self._api_version = api_version
self._trust_id = trust_id
self._service_catalog = None
+ self.timing = timing
# verify is the Requests-compatible form
self._verify = verify
@@ -116,7 +117,7 @@ def get_extension_modules(group):
setattr(
ClientManager,
- ep.name,
+ module.API_NAME,
ClientCache(
getattr(sys.modules[ep.module_name], 'make_client', None)
),