openstack/deb-python-openstackclient
Code Issues Proposed changes

Merge "Make bash comple command best effort to authorize"

Browse Source
This commit is contained in:
Jenkins
2014-04-17 02:06:11 +00:00
committed by Gerrit Code Review
parent 398dc6c0bd 211cd31d7a
commit 3c3f212d8b
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openstackclient/shell.py
View File

@@ -24,6 +24,7 @@ import traceback
from cliff import app from cliff import app
from cliff import command from cliff import command
from cliff import complete
from cliff import help from cliff import help
import openstackclient import openstackclient
@@ -64,8 +65,10 @@ class OpenStackShell(app.App):
def __init__(self): def __init__(self):
# Patch command.Command to add a default auth_required = True # Patch command.Command to add a default auth_required = True
command.Command.auth_required = True command.Command.auth_required = True
command.Command.best_effort = False
# But not help # But not help
help.HelpCommand.auth_required = False help.HelpCommand.auth_required = False
complete.CompleteCommand.best_effort = True
super(OpenStackShell, self).__init__( super(OpenStackShell, self).__init__(
description=__doc__.strip(), description=__doc__.strip(),
@@ -465,7 +468,15 @@ class OpenStackShell(app.App):
"""Set up auth and API versions""" """Set up auth and API versions"""
self.log.debug('prepare_to_run_command %s', cmd.__class__.__name__) self.log.debug('prepare_to_run_command %s', cmd.__class__.__name__)
if cmd.auth_required: if not cmd.auth_required:
return
if cmd.best_effort:
try:
self.authenticate_user()
self.restapi.set_auth(self.client_manager.identity.auth_token)
except Exception:
pass
else:
self.authenticate_user() self.authenticate_user()
self.restapi.set_auth(self.client_manager.identity.auth_token) self.restapi.set_auth(self.client_manager.identity.auth_token)
return return