openstack/python-openstackclient
Code Issues Proposed changes

only generate one clientmanager instance in interactive mode

Browse Source 
Currently, we repeated to generate clientmanager instance when run
command in interactive mode. This should be avoided.

Change-Id: I0536a690bc173be38af08a2e4443115532041efd
Closes-Bug: #1383083
This commit is contained in:
wanghong 2014-10-20 15:29:53 +08:00
parent 2166d7d3af
commit f600c0eafb
1 changed files with 11 additions and 5 deletions

16
openstackclient/shell.py

@ -68,6 +68,8 @@ class OpenStackShell(app.App):
# Assume TLS host certificate verification is enabled # Assume TLS host certificate verification is enabled
self.verify = True self.verify = True
self.client_manager = None
# NOTE(dtroyer): This hack changes the help action that Cliff # NOTE(dtroyer): This hack changes the help action that Cliff
# automatically adds to the parser so we can defer # automatically adds to the parser so we can defer
# its execution until after the api-versioned commands # its execution until after the api-versioned commands
@ -204,8 +206,12 @@ class OpenStackShell(app.App):
return clientmanager.build_plugin_option_parser(parser) return clientmanager.build_plugin_option_parser(parser)
def authenticate_user(self): def initialize_clientmanager(self):
"""Verify the required authentication credentials are present""" """Validating authentication options and generate a clientmanager"""
if self.client_manager:
self.log.debug('The clientmanager has been initialized already')
return
self.log.debug("validating authentication options") self.log.debug("validating authentication options")
@ -370,11 +376,11 @@ class OpenStackShell(app.App):
return return
if cmd.best_effort: if cmd.best_effort:
try: try:
self.authenticate_user() self.initialize_clientmanager()
except Exception: except Exception:
pass pass
else: else:
self.authenticate_user() self.initialize_clientmanager()
return return
def clean_up(self, cmd, result, err): def clean_up(self, cmd, result, err):
@ -409,7 +415,7 @@ class OpenStackShell(app.App):
def interact(self): def interact(self):
# NOTE(dtroyer): Maintain the old behaviour for interactive use as # NOTE(dtroyer): Maintain the old behaviour for interactive use as
# this path does not call prepare_to_run_command() # this path does not call prepare_to_run_command()
self.authenticate_user() self.initialize_clientmanager()
super(OpenStackShell, self).interact() super(OpenStackShell, self).interact()