a8d4b0eebb
The links field in the returned objects from the v3 Identity API aren't really useful, so let's remove them. Managed to remove most of them from the core API. I'll likely remove the extension/contribution (oauth/federation) related ones in another patch. Also in this patch the code for setting services and projects was changed. Though not incorrect, it was not needed to copy the entire returned object, we should just need to pass in the fields we want to update. Change-Id: I164ca9ad8b28fa10b291e9115ef40753e387c547
683 lines
21 KiB
Python
683 lines
21 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
|
|
import mock
|
|
|
|
from openstackclient.identity.v3 import project
|
|
from openstackclient.tests import fakes
|
|
from openstackclient.tests.identity.v3 import fakes as identity_fakes
|
|
|
|
|
|
class TestProject(identity_fakes.TestIdentityv3):
|
|
|
|
def setUp(self):
|
|
super(TestProject, self).setUp()
|
|
|
|
# Get a shortcut to the DomainManager Mock
|
|
self.domains_mock = self.app.client_manager.identity.domains
|
|
self.domains_mock.reset_mock()
|
|
|
|
# Get a shortcut to the ProjectManager Mock
|
|
self.projects_mock = self.app.client_manager.identity.projects
|
|
self.projects_mock.reset_mock()
|
|
|
|
|
|
class TestProjectCreate(TestProject):
|
|
|
|
def setUp(self):
|
|
super(TestProjectCreate, self).setUp()
|
|
|
|
self.domains_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.DOMAIN),
|
|
loaded=True,
|
|
)
|
|
|
|
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 = {
|
|
'name': identity_fakes.project_name,
|
|
'domain': None,
|
|
'description': None,
|
|
'enabled': True,
|
|
}
|
|
# ProjectManager.create(name=, domain=, description=,
|
|
# enabled=, **kwargs)
|
|
self.projects_mock.create.assert_called_with(
|
|
**kwargs
|
|
)
|
|
|
|
collist = ('description', 'domain_id', 'enabled', 'id', 'name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.project_description,
|
|
identity_fakes.domain_id,
|
|
True,
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
def test_project_create_description(self):
|
|
arglist = [
|
|
'--description', 'new desc',
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('description', 'new desc'),
|
|
('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 = {
|
|
'name': identity_fakes.project_name,
|
|
'domain': None,
|
|
'description': 'new desc',
|
|
'enabled': True,
|
|
}
|
|
# ProjectManager.create(name=, domain=, description=,
|
|
# enabled=, **kwargs)
|
|
self.projects_mock.create.assert_called_with(
|
|
**kwargs
|
|
)
|
|
|
|
collist = ('description', 'domain_id', 'enabled', 'id', 'name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.project_description,
|
|
identity_fakes.domain_id,
|
|
True,
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
def test_project_create_domain(self):
|
|
arglist = [
|
|
'--domain', identity_fakes.domain_name,
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('domain', identity_fakes.domain_name),
|
|
('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 = {
|
|
'name': identity_fakes.project_name,
|
|
'domain': identity_fakes.domain_id,
|
|
'description': None,
|
|
'enabled': True,
|
|
}
|
|
# ProjectManager.create(name=, domain=, description=,
|
|
# enabled=, **kwargs)
|
|
self.projects_mock.create.assert_called_with(
|
|
**kwargs
|
|
)
|
|
|
|
collist = ('description', 'domain_id', 'enabled', 'id', 'name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.project_description,
|
|
identity_fakes.domain_id,
|
|
True,
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
def test_project_create_domain_no_perms(self):
|
|
arglist = [
|
|
'--domain', identity_fakes.domain_id,
|
|
identity_fakes.project_name,
|
|
]
|
|
verifylist = [
|
|
('domain', identity_fakes.domain_id),
|
|
('enable', False),
|
|
('disable', False),
|
|
('name', identity_fakes.project_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
mocker = mock.Mock()
|
|
mocker.return_value = None
|
|
|
|
with mock.patch("openstackclient.common.utils.find_resource", mocker):
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'name': identity_fakes.project_name,
|
|
'domain': identity_fakes.domain_id,
|
|
'description': None,
|
|
'enabled': True,
|
|
}
|
|
self.projects_mock.create.assert_called_with(
|
|
**kwargs
|
|
)
|
|
collist = ('description', 'domain_id', 'enabled', 'id', 'name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.project_description,
|
|
identity_fakes.domain_id,
|
|
True,
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
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 = {
|
|
'name': identity_fakes.project_name,
|
|
'domain': None,
|
|
'description': None,
|
|
'enabled': True,
|
|
}
|
|
# ProjectManager.create(name=, domain=, description=,
|
|
# enabled=, **kwargs)
|
|
self.projects_mock.create.assert_called_with(
|
|
**kwargs
|
|
)
|
|
|
|
collist = ('description', 'domain_id', 'enabled', 'id', 'name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.project_description,
|
|
identity_fakes.domain_id,
|
|
True,
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
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 = {
|
|
'name': identity_fakes.project_name,
|
|
'domain': None,
|
|
'description': None,
|
|
'enabled': False,
|
|
}
|
|
# ProjectManager.create(name=, domain=,
|
|
# description=, enabled=, **kwargs)
|
|
self.projects_mock.create.assert_called_with(
|
|
**kwargs
|
|
)
|
|
|
|
collist = ('description', 'domain_id', 'enabled', 'id', 'name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.project_description,
|
|
identity_fakes.domain_id,
|
|
True,
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
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 = {
|
|
'name': identity_fakes.project_name,
|
|
'domain': None,
|
|
'description': None,
|
|
'enabled': True,
|
|
'fee': 'fi',
|
|
'fo': 'fum',
|
|
}
|
|
# ProjectManager.create(name=, domain=, description=,
|
|
# enabled=, **kwargs)
|
|
self.projects_mock.create.assert_called_with(
|
|
**kwargs
|
|
)
|
|
|
|
collist = ('description', 'domain_id', 'enabled', 'id', 'name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.project_description,
|
|
identity_fakes.domain_id,
|
|
True,
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
)
|
|
self.assertEqual(data, datalist)
|
|
|
|
|
|
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 = [
|
|
('project', identity_fakes.project_id),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.run(parsed_args)
|
|
self.assertEqual(result, 0)
|
|
|
|
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)
|
|
|
|
# DisplayCommandBase.take_action() returns two tuples
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
self.projects_mock.list.assert_called_with()
|
|
|
|
collist = ('ID', 'Name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = ((
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
), )
|
|
self.assertEqual(tuple(data), datalist)
|
|
|
|
def test_project_list_long(self):
|
|
arglist = [
|
|
'--long',
|
|
]
|
|
verifylist = [
|
|
('long', True),
|
|
]
|
|
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.list.assert_called_with()
|
|
|
|
collist = ('ID', 'Name', 'Domain ID', 'Description', 'Enabled')
|
|
self.assertEqual(columns, collist)
|
|
datalist = ((
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
identity_fakes.domain_id,
|
|
identity_fakes.project_description,
|
|
True,
|
|
), )
|
|
self.assertEqual(tuple(data), datalist)
|
|
|
|
def test_project_list_domain(self):
|
|
arglist = [
|
|
'--domain', identity_fakes.domain_name,
|
|
]
|
|
verifylist = [
|
|
('domain', identity_fakes.domain_name),
|
|
]
|
|
|
|
self.domains_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.DOMAIN),
|
|
loaded=True,
|
|
)
|
|
|
|
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.list.assert_called_with(
|
|
domain=identity_fakes.domain_id)
|
|
|
|
collist = ('ID', 'Name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = ((
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
), )
|
|
self.assertEqual(tuple(data), datalist)
|
|
|
|
def test_project_list_domain_no_perms(self):
|
|
arglist = [
|
|
'--domain', identity_fakes.domain_id,
|
|
]
|
|
verifylist = [
|
|
('domain', identity_fakes.domain_id),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
mocker = mock.Mock()
|
|
mocker.return_value = None
|
|
|
|
with mock.patch("openstackclient.common.utils.find_resource", mocker):
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
self.projects_mock.list.assert_called_with(
|
|
domain=identity_fakes.domain_id)
|
|
collist = ('ID', 'Name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = ((
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
), )
|
|
self.assertEqual(tuple(data), datalist)
|
|
|
|
|
|
class TestProjectSet(TestProject):
|
|
|
|
def setUp(self):
|
|
super(TestProjectSet, self).setUp()
|
|
|
|
self.domains_mock.get.return_value = fakes.FakeResource(
|
|
None,
|
|
copy.deepcopy(identity_fakes.DOMAIN),
|
|
loaded=True,
|
|
)
|
|
|
|
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(result, 0)
|
|
|
|
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(result, 0)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'name': 'qwerty',
|
|
}
|
|
# ProjectManager.update(project, name=, domain=, description=,
|
|
# enabled=, **kwargs)
|
|
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(result, 0)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'description': 'new desc',
|
|
}
|
|
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(result, 0)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'enabled': True,
|
|
}
|
|
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(result, 0)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'enabled': False,
|
|
}
|
|
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(result, 0)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'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', 'domain_id', 'enabled', 'id', 'name')
|
|
self.assertEqual(columns, collist)
|
|
datalist = (
|
|
identity_fakes.project_description,
|
|
identity_fakes.domain_id,
|
|
True,
|
|
identity_fakes.project_id,
|
|
identity_fakes.project_name,
|
|
)
|
|
self.assertEqual(data, datalist)
|