
* Adds tenant-list, tenant-get and tenant-update to keystone command * Removes tenant-enable and tenant-disable * Fixes more overlap in cli args, clean up command args, particularly removing nargs from arguments that are not optional. * Fixes bug 932235 Change-Id: I1aafec1b2a3943e0f6c86f0228ab29f181a7ffce
88 lines
3.2 KiB
Python
88 lines
3.2 KiB
Python
import os
|
|
import mock
|
|
import httplib2
|
|
|
|
from keystoneclient import shell as openstack_shell
|
|
from keystoneclient.v2_0 import shell as shell_v2_0
|
|
from keystoneclient import exceptions
|
|
from tests import utils
|
|
|
|
|
|
DEFAULT_USERNAME = 'username'
|
|
DEFAULT_PASSWORD = 'password'
|
|
DEFAULT_TENANT_ID = 'tenant_id'
|
|
DEFAULT_TENANT_NAME = 'tenant_name'
|
|
DEFAULT_AUTH_URL = 'http://127.0.0.1:5000/v2.0/'
|
|
|
|
|
|
class ShellTest(utils.TestCase):
|
|
|
|
# Patch os.environ to avoid required auth info.
|
|
def setUp(self):
|
|
global _old_env
|
|
fake_env = {
|
|
'OS_USERNAME': DEFAULT_USERNAME,
|
|
'OS_PASSWORD': DEFAULT_PASSWORD,
|
|
'OS_TENANT_ID': DEFAULT_TENANT_ID,
|
|
'OS_TENANT_NAME': DEFAULT_TENANT_NAME,
|
|
'OS_AUTH_URL': DEFAULT_AUTH_URL,
|
|
}
|
|
_old_env, os.environ = os.environ, fake_env.copy()
|
|
|
|
# Make a fake shell object, a helping wrapper to call it, and a quick
|
|
# way of asserting that certain API calls were made.
|
|
global shell, _shell, assert_called, assert_called_anytime
|
|
_shell = openstack_shell.OpenStackIdentityShell()
|
|
shell = lambda cmd: _shell.main(cmd.split())
|
|
|
|
def tearDown(self):
|
|
global _old_env
|
|
os.environ = _old_env
|
|
|
|
def test_help_unknown_command(self):
|
|
self.assertRaises(exceptions.CommandError, shell, 'help foofoo')
|
|
|
|
def test_debug(self):
|
|
httplib2.debuglevel = 0
|
|
shell('--debug help')
|
|
assert httplib2.debuglevel == 1
|
|
|
|
def test_shell_args(self):
|
|
do_tenant_mock = mock.MagicMock()
|
|
with mock.patch('keystoneclient.v2_0.shell.do_user_list',
|
|
do_tenant_mock):
|
|
shell('user-list')
|
|
assert do_tenant_mock.called
|
|
((a, b), c) = do_tenant_mock.call_args
|
|
assert (b.auth_url, b.password, b.tenant_id,
|
|
b.tenant_name, b.username, b.version) == \
|
|
(DEFAULT_AUTH_URL, DEFAULT_PASSWORD, DEFAULT_TENANT_ID,
|
|
DEFAULT_TENANT_NAME, DEFAULT_USERNAME, '')
|
|
shell('--auth-url http://0.0.0.0:5000/ --password xyzpdq '
|
|
'--tenant_id 1234 --tenant_name fred --username barney '
|
|
'--version 2.0 user-list')
|
|
assert do_tenant_mock.called
|
|
((a, b), c) = do_tenant_mock.call_args
|
|
assert (b.auth_url, b.password, b.tenant_id,
|
|
b.tenant_name, b.username, b.version) == \
|
|
('http://0.0.0.0:5000/', 'xyzpdq', '1234',
|
|
'fred', 'barney', '2.0')
|
|
|
|
def test_do_tenant_create(self):
|
|
do_tenant_mock = mock.MagicMock()
|
|
with mock.patch('keystoneclient.v2_0.shell.do_tenant_create',
|
|
do_tenant_mock):
|
|
shell('tenant-create')
|
|
assert do_tenant_mock.called
|
|
# FIXME(dtroyer): how do you test the decorators?
|
|
#shell('tenant-create --tenant-name wilma '
|
|
# '--description "fred\'s wife"')
|
|
#assert do_tenant_mock.called
|
|
|
|
def test_do_tenant_list(self):
|
|
do_tenant_mock = mock.MagicMock()
|
|
with mock.patch('keystoneclient.v2_0.shell.do_tenant_list',
|
|
do_tenant_mock):
|
|
shell('tenant-list')
|
|
assert do_tenant_mock.called
|