openstack/python-cinderclient
Code Issues Proposed changes

Merge "Fix OS_AUTH_TYPE env var usage"

Browse Source
This commit is contained in:
Zuul
2017-10-19 02:12:06 +00:00
committed by Gerrit Code Review
parent f6f5a706ba ce1013d6b3
commit a8364340dd
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cinderclient/shell.py
View File

@@ -140,7 +140,8 @@ class OpenStackCinderShell(object):
parser.add_argument('--os-auth-system', parser.add_argument('--os-auth-system',
metavar='<os-auth-system>', metavar='<os-auth-system>',
dest='os_auth_type', dest='os_auth_type',
default=utils.env('OS_AUTH_SYSTEM'), default=(utils.env('OS_AUTH_TYPE') or
utils.env('OS_AUTH_SYSTEM')),
help=_('DEPRECATED! Use --os-auth-type. ' help=_('DEPRECATED! Use --os-auth-type. '
'Defaults to env[OS_AUTH_SYSTEM].')) 'Defaults to env[OS_AUTH_SYSTEM].'))
parser.add_argument('--os_auth_system', parser.add_argument('--os_auth_system',
@@ -148,7 +149,8 @@ class OpenStackCinderShell(object):
parser.add_argument('--os-auth-type', parser.add_argument('--os-auth-type',
metavar='<os-auth-type>', metavar='<os-auth-type>',
dest='os_auth_type', dest='os_auth_type',
default=utils.env('OS_AUTH_TYPE'), default=(utils.env('OS_AUTH_TYPE') or
utils.env('OS_AUTH_SYSTEM')),
help=_('Defaults to env[OS_AUTH_TYPE].')) help=_('Defaults to env[OS_AUTH_TYPE].'))
parser.add_argument('--os_auth_type', parser.add_argument('--os_auth_type',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)

20
cinderclient/tests/unit/test_shell.py
View File

@@ -72,6 +72,26 @@ class ShellTest(utils.TestCase):
return out return out
def test_default_auth_env(self):
_shell = shell.OpenStackCinderShell()
args, __ = _shell.get_base_parser().parse_known_args([])
self.assertEqual('', args.os_auth_type)
def test_auth_type_env(self):
self.make_env(exclude='OS_PASSWORD',
include={'OS_AUTH_SYSTEM': 'non existent auth',
'OS_AUTH_TYPE': 'noauth'})
_shell = shell.OpenStackCinderShell()
args, __ = _shell.get_base_parser().parse_known_args([])
self.assertEqual('noauth', args.os_auth_type)
def test_auth_system_env(self):
self.make_env(exclude='OS_PASSWORD',
include={'OS_AUTH_SYSTEM': 'noauth'})
_shell = shell.OpenStackCinderShell()
args, __ = _shell.get_base_parser().parse_known_args([])
self.assertEqual('noauth', args.os_auth_type)
def test_help_unknown_command(self): def test_help_unknown_command(self):
self.assertRaises(exceptions.CommandError, self.shell, 'help foofoo') self.assertRaises(exceptions.CommandError, self.shell, 'help foofoo')