d0c0cefb84
As bug #1477199 describes, the wrong comment below is all over the unit test code of OSC. # DisplayCommandBase.take_action() returns two tuples There is no such class named DisplayCommandBase in OSC. It is in cliff. All OSC command classes inherit from the base classes in cliff, class Command, class Lister and class ShowOne. It is like this: Object |--> Command |--> DisplayCommandBase |--> Lister |--> ShowOne take_action() is an abstract method of class Command, and generally is overwritten by subclasses. * Command.take_action() returns nothing. * Lister.take_action() returns a tuple which contains a tuple of columns and a generator used to generate the data. * ShowOne.take_action() returns an iterator which contains a tuple of columns and a tuple of data. So, this problem should be fixed in 3 steps: 1. Remove all DisplayCommandBase comments for tests of classes inheriting from class Command in cliff as it returns nothing. 2. Fix all DisplayCommandBase comments for tests of classes inheriting from class Lister in cliff. Lister.take_action() returns a tuple and a generator. 3. Fix all DisplayCommandBase comments for tests of classes inheriting from class ShowOne in cliff. ShowOne.take_action() returns two tuples. This patch finishes step 2 in all identity tests. Change-Id: I2929ee688b1d7afc52c6ab325982bdc24c60a995 Partial-bug: #1477199
617 lines
18 KiB
Python
617 lines
18 KiB
Python
# Copyright 2013 Nebula Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
import copy
|
|
|
|
from keystoneauth1 import exceptions as ks_exc
|
|
|
|
from openstackclient.identity.v2_0 import project
|
|
from openstackclient.tests import fakes
|
|
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
|
|
|
|
|
|
class TestProject(identity_fakes.TestIdentityv2):
|
|
|
|
def setUp(self):
|
|
super(TestProject, self).setUp()
|
|
|
|
# Get a shortcut to the TenantManager Mock
|
|
self.projects_mock = self.app.client_manager.identity.tenants
|
|
self.projects_mock.reset_mock()
|
|
|
|
|
|
class TestProjectCreate(TestProject):
|
|
|
|
columns = (
|
|
'description',
|
|
'enabled',
|
|
'id',
|
|
'name',
|
|
)
|
|
datalist = (
|
|
identity_fakes.project_description,
|
|
True,
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
)
|
|
|
|
def setUp(self):
|
|
super(TestProjectCreate, self).setUp()
|
|
|
|
self.projects_mock.create.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.PROJECT),
|
|
loaded=True,
|
|
)
|
|
|
|
# Get the command object to test
|
|
self.cmd = project.CreateProject(self.app, None)
|
|
|
|
def test_project_create_no_options(self):
|
|
arglist = [
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('enable', False),
|
|
('disable', False),
|
|
('name', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': None,
|
|
'enabled': True,
|
|
}
|
|
self.projects_mock.create.assert_called_with(
|
|
identity_fakes.project_name,
|
|
**kwargs
|
|
)
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, data)
|
|
|
|
def test_project_create_description(self):
|
|
arglist = [
|
|
'--description', 'new desc',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('description', 'new desc'),
|
|
('name', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': 'new desc',
|
|
'enabled': True,
|
|
}
|
|
self.projects_mock.create.assert_called_with(
|
|
identity_fakes.project_name,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, data)
|
|
|
|
def test_project_create_enable(self):
|
|
arglist = [
|
|
'--enable',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('enable', True),
|
|
('disable', False),
|
|
('name', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': None,
|
|
'enabled': True,
|
|
}
|
|
self.projects_mock.create.assert_called_with(
|
|
identity_fakes.project_name,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, data)
|
|
|
|
def test_project_create_disable(self):
|
|
arglist = [
|
|
'--disable',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('enable', False),
|
|
('disable', True),
|
|
('name', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': None,
|
|
'enabled': False,
|
|
}
|
|
self.projects_mock.create.assert_called_with(
|
|
identity_fakes.project_name,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, data)
|
|
|
|
def test_project_create_property(self):
|
|
arglist = [
|
|
'--property', 'fee=fi',
|
|
'--property', 'fo=fum',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('property', {'fee': 'fi', 'fo': 'fum'}),
|
|
('name', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': None,
|
|
'enabled': True,
|
|
'fee': 'fi',
|
|
'fo': 'fum',
|
|
}
|
|
self.projects_mock.create.assert_called_with(
|
|
identity_fakes.project_name,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, data)
|
|
|
|
def test_project_create_or_show_exists(self):
|
|
def _raise_conflict(*args, **kwargs):
|
|
raise ks_exc.Conflict(None)
|
|
|
|
# need to make this throw an exception...
|
|
self.projects_mock.create.side_effect = _raise_conflict
|
|
|
|
self.projects_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.PROJECT),
|
|
loaded=True,
|
|
)
|
|
|
|
arglist = [
|
|
'--or-show',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('name', identity_fakes.project_name),
|
|
('or_show', True),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# ProjectManager.create(name, description, enabled)
|
|
self.projects_mock.get.assert_called_with(identity_fakes.project_name)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': None,
|
|
'enabled': True,
|
|
}
|
|
self.projects_mock.create.assert_called_with(
|
|
identity_fakes.project_name,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, data)
|
|
|
|
def test_project_create_or_show_not_exists(self):
|
|
arglist = [
|
|
'--or-show',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('name', identity_fakes.project_name),
|
|
('or_show', True),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': None,
|
|
'enabled': True,
|
|
}
|
|
self.projects_mock.create.assert_called_with(
|
|
identity_fakes.project_name,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, data)
|
|
|
|
|
|
class TestProjectDelete(TestProject):
|
|
|
|
def setUp(self):
|
|
super(TestProjectDelete, self).setUp()
|
|
|
|
# This is the return value for utils.find_resource()
|
|
self.projects_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.PROJECT),
|
|
loaded=True,
|
|
)
|
|
self.projects_mock.delete.return_value = None
|
|
|
|
# Get the command object to test
|
|
self.cmd = project.DeleteProject(self.app, None)
|
|
|
|
def test_project_delete_no_options(self):
|
|
arglist = [
|
|
identity_fakes.project_id,
|
|
]
|
|
verifylist = [
|
|
('projects', [identity_fakes.project_id]),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.run(parsed_args)
|
|
self.assertEqual(0, result)
|
|
|
|
self.projects_mock.delete.assert_called_with(
|
|
identity_fakes.project_id,
|
|
)
|
|
|
|
|
|
class TestProjectList(TestProject):
|
|
|
|
def setUp(self):
|
|
super(TestProjectList, self).setUp()
|
|
|
|
self.projects_mock.list.return_value = [
|
|
fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.PROJECT),
|
|
loaded=True,
|
|
),
|
|
]
|
|
|
|
# Get the command object to test
|
|
self.cmd = project.ListProject(self.app, None)
|
|
|
|
def test_project_list_no_options(self):
|
|
arglist = []
|
|
verifylist = []
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
self.projects_mock.list.assert_called_with()
|
|
|
|
collist = ('ID', 'Name')
|
|
self.assertEqual(collist, columns)
|
|
datalist = ((
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
), )
|
|
self.assertEqual(datalist, tuple(data))
|
|
|
|
def test_project_list_long(self):
|
|
arglist = [
|
|
'--long',
|
|
]
|
|
verifylist = [
|
|
('long', True),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
self.projects_mock.list.assert_called_with()
|
|
|
|
collist = ('ID', 'Name', 'Description', 'Enabled')
|
|
self.assertEqual(collist, columns)
|
|
datalist = ((
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
identity_fakes.project_description,
|
|
True,
|
|
), )
|
|
self.assertEqual(datalist, tuple(data))
|
|
|
|
|
|
class TestProjectSet(TestProject):
|
|
|
|
def setUp(self):
|
|
super(TestProjectSet, self).setUp()
|
|
|
|
self.projects_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.PROJECT),
|
|
loaded=True,
|
|
)
|
|
self.projects_mock.update.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.PROJECT),
|
|
loaded=True,
|
|
)
|
|
|
|
# Get the command object to test
|
|
self.cmd = project.SetProject(self.app, None)
|
|
|
|
def test_project_set_no_options(self):
|
|
arglist = [
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('project', identity_fakes.project_name),
|
|
('enable', False),
|
|
('disable', False),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.run(parsed_args)
|
|
self.assertEqual(0, result)
|
|
|
|
def test_project_set_name(self):
|
|
arglist = [
|
|
'--name', 'qwerty',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('name', 'qwerty'),
|
|
('enable', False),
|
|
('disable', False),
|
|
('project', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.run(parsed_args)
|
|
self.assertEqual(0, result)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': identity_fakes.project_description,
|
|
'enabled': True,
|
|
'tenant_name': 'qwerty',
|
|
}
|
|
self.projects_mock.update.assert_called_with(
|
|
identity_fakes.project_id,
|
|
**kwargs
|
|
)
|
|
|
|
def test_project_set_description(self):
|
|
arglist = [
|
|
'--description', 'new desc',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('description', 'new desc'),
|
|
('enable', False),
|
|
('disable', False),
|
|
('project', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.run(parsed_args)
|
|
self.assertEqual(0, result)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': 'new desc',
|
|
'enabled': True,
|
|
'tenant_name': identity_fakes.project_name,
|
|
}
|
|
self.projects_mock.update.assert_called_with(
|
|
identity_fakes.project_id,
|
|
**kwargs
|
|
)
|
|
|
|
def test_project_set_enable(self):
|
|
arglist = [
|
|
'--enable',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('enable', True),
|
|
('disable', False),
|
|
('project', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.run(parsed_args)
|
|
self.assertEqual(0, result)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': identity_fakes.project_description,
|
|
'enabled': True,
|
|
'tenant_name': identity_fakes.project_name,
|
|
}
|
|
self.projects_mock.update.assert_called_with(
|
|
identity_fakes.project_id,
|
|
**kwargs
|
|
)
|
|
|
|
def test_project_set_disable(self):
|
|
arglist = [
|
|
'--disable',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('enable', False),
|
|
('disable', True),
|
|
('project', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.run(parsed_args)
|
|
self.assertEqual(0, result)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': identity_fakes.project_description,
|
|
'enabled': False,
|
|
'tenant_name': identity_fakes.project_name,
|
|
}
|
|
self.projects_mock.update.assert_called_with(
|
|
identity_fakes.project_id,
|
|
**kwargs
|
|
)
|
|
|
|
def test_project_set_property(self):
|
|
arglist = [
|
|
'--property', 'fee=fi',
|
|
'--property', 'fo=fum',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('property', {'fee': 'fi', 'fo': 'fum'}),
|
|
('project', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.run(parsed_args)
|
|
self.assertEqual(0, result)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': identity_fakes.project_description,
|
|
'enabled': True,
|
|
'tenant_name': identity_fakes.project_name,
|
|
'fee': 'fi',
|
|
'fo': 'fum',
|
|
}
|
|
self.projects_mock.update.assert_called_with(
|
|
identity_fakes.project_id,
|
|
**kwargs
|
|
)
|
|
|
|
|
|
class TestProjectShow(TestProject):
|
|
|
|
def setUp(self):
|
|
super(TestProjectShow, self).setUp()
|
|
|
|
self.projects_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.PROJECT),
|
|
loaded=True,
|
|
)
|
|
|
|
# Get the command object to test
|
|
self.cmd = project.ShowProject(self.app, None)
|
|
|
|
def test_project_show(self):
|
|
arglist = [
|
|
identity_fakes.project_id,
|
|
]
|
|
verifylist = [
|
|
('project', identity_fakes.project_id),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
self.projects_mock.get.assert_called_with(
|
|
identity_fakes.project_id,
|
|
)
|
|
|
|
collist = ('description', 'enabled', 'id', 'name', 'properties')
|
|
self.assertEqual(collist, columns)
|
|
datalist = (
|
|
identity_fakes.project_description,
|
|
True,
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
'',
|
|
)
|
|
self.assertEqual(datalist, data)
|
|
|
|
|
|
class TestProjectUnset(TestProject):
|
|
|
|
def setUp(self):
|
|
super(TestProjectUnset, self).setUp()
|
|
|
|
project_dict = {'fee': 'fi', 'fo': 'fum'}
|
|
project_dict.update(identity_fakes.PROJECT)
|
|
self.projects_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(project_dict),
|
|
loaded=True,
|
|
)
|
|
|
|
# Get the command object to test
|
|
self.cmd = project.UnsetProject(self.app, None)
|
|
|
|
def test_project_unset_key(self):
|
|
arglist = [
|
|
'--property', 'fee',
|
|
'--property', 'fo',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('property', ['fee', 'fo']),
|
|
]
|
|
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
self.cmd.run(parsed_args)
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': identity_fakes.project_description,
|
|
'enabled': True,
|
|
'fee': None,
|
|
'fo': None,
|
|
'id': identity_fakes.project_id,
|
|
'name': identity_fakes.project_name,
|
|
}
|
|
|
|
self.projects_mock.update.assert_called_with(
|
|
identity_fakes.project_id,
|
|
**kwargs
|
|
)
|