summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorRui Chen <chenrui.momo@gmail.com>2017-01-10 15:13:47 +0800
committerRui Chen <chenrui.momo@gmail.com>2017-01-22 06:30:31 +0000
commit4d9da2c40ae02086258cfde852b297754d8085fa (patch)
tree9f280039428e68bb867d36e8e93f9843cdc619d6 /openstackclient/common
parent607f31d3db924517c18fd192239e5ef5963e17f3 (diff)
downloadpython-openstackclient-4d9da2c40ae02086258cfde852b297754d8085fa.tar.gz
Fix OSC networking commands help errors
OSC networking commands need to authenticate to get service catalog, then decide to show nova-network or neutron command help message. Fake token and fake auth_type in prepare_to_run_command() casue os-cloud-config use AdminToken auth plugin, but pass all the auth information (include: username, password and so on) to it, that casue the class initialization error. Pop the fake token and url, then try to load auth plugin again to fix the issue. Change-Id: I8b140f0b0a60681fc2a35a013bb0c84ff8cb9589 Closes-Bug: #1650026
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/clientmanager.py27
1 files changed, 25 insertions, 2 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 23c35a3b..3e1a50e3 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -59,6 +59,8 @@ class ClientManager(clientmanager.ClientManager):
self._interface = self.interface
self._cacert = self.cacert
self._insecure = not self.verify
+ # store original auth_type
+ self._original_auth_type = cli_options.auth_type
def setup_auth(self):
"""Set up authentication"""
@@ -73,12 +75,33 @@ class ClientManager(clientmanager.ClientManager):
if self._cli_options._openstack_config is not None:
self._cli_options._openstack_config._pw_callback = \
shell.prompt_for_password
+ try:
+ self._cli_options._auth = \
+ self._cli_options._openstack_config.load_auth_plugin(
+ self._cli_options.config,
+ )
+ except TypeError as e:
+ self._fallback_load_auth_plugin(e)
+
+ return super(ClientManager, self).setup_auth()
+
+ def _fallback_load_auth_plugin(self, e):
+ # NOTES(RuiChen): Hack to avoid auth plugins choking on data they don't
+ # expect, delete fake token and endpoint, then try to
+ # load auth plugin again with user specified options.
+ # We know it looks ugly, but it's necessary.
+ if self._cli_options.config['auth']['token'] == 'x':
+ # restore original auth_type
+ self._cli_options.config['auth_type'] = \
+ self._original_auth_type
+ del self._cli_options.config['auth']['token']
+ del self._cli_options.config['auth']['endpoint']
self._cli_options._auth = \
self._cli_options._openstack_config.load_auth_plugin(
self._cli_options.config,
)
-
- return super(ClientManager, self).setup_auth()
+ else:
+ raise e
def is_network_endpoint_enabled(self):
"""Check if the network endpoint is enabled"""