Merge "add tests for identity v3 domain"
This commit is contained in:
Jenkins
@@ -135,13 +135,12 @@ class SetDomain(command.Command):
|
||||
'--enable',
|
||||
dest='enabled',
|
||||
action='store_true',
|
||||
default=True,
|
||||
help='Enable domain (default)',
|
||||
)
|
||||
enable_group.add_argument(
|
||||
'--disable',
|
||||
dest='enabled',
|
||||
action='store_false',
|
||||
dest='disabled',
|
||||
action='store_true',
|
||||
help='Disable domain',
|
||||
)
|
||||
return parser
|
||||
@@ -156,8 +155,10 @@ class SetDomain(command.Command):
|
||||
kwargs['name'] = parsed_args.name
|
||||
if parsed_args.description:
|
||||
kwargs['description'] = parsed_args.description
|
||||
if 'enabled' in parsed_args:
|
||||
kwargs['enabled'] = parsed_args.enabled
|
||||
if parsed_args.enabled:
|
||||
kwargs['enabled'] = True
|
||||
if parsed_args.disabled:
|
||||
kwargs['enabled'] = False
|
||||
|
||||
if not kwargs:
|
||||
sys.stdout.write("Domain not updated, no arguments present")
|
||||
|
||||
@@ -21,10 +21,13 @@ from openstackclient.tests import utils
|
||||
|
||||
domain_id = 'd1'
|
||||
domain_name = 'oftheking'
|
||||
domain_description = 'domain description'
|
||||
|
||||
DOMAIN = {
|
||||
'id': domain_id,
|
||||
'name': domain_name,
|
||||
'description': domain_description,
|
||||
'enabled': True,
|
||||
}
|
||||
|
||||
group_id = 'gr-010'
|
||||
|
||||
414
openstackclient/tests/identity/v3/test_domain.py
Normal file
414
openstackclient/tests/identity/v3/test_domain.py
Normal file
@@ -0,0 +1,414 @@
|
||||
# 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 openstackclient.identity.v3 import domain
|
||||
from openstackclient.tests import fakes
|
||||
from openstackclient.tests.identity.v3 import fakes as identity_fakes
|
||||
|
||||
|
||||
class TestDomain(identity_fakes.TestIdentityv3):
|
||||
|
||||
def setUp(self):
|
||||
super(TestDomain, self).setUp()
|
||||
|
||||
# Get a shortcut to the DomainManager Mock
|
||||
self.domains_mock = self.app.client_manager.identity.domains
|
||||
self.domains_mock.reset_mock()
|
||||
|
||||
|
||||
class TestDomainCreate(TestDomain):
|
||||
|
||||
def setUp(self):
|
||||
super(TestDomainCreate, self).setUp()
|
||||
|
||||
self.domains_mock.create.return_value = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(identity_fakes.DOMAIN),
|
||||
loaded=True,
|
||||
)
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = domain.CreateDomain(self.app, None)
|
||||
|
||||
def test_domain_create_no_options(self):
|
||||
arglist = [
|
||||
identity_fakes.domain_name,
|
||||
]
|
||||
verifylist = [
|
||||
('enabled', True),
|
||||
('name', identity_fakes.domain_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.domain_name,
|
||||
'description': None,
|
||||
'enabled': True,
|
||||
}
|
||||
self.domains_mock.create.assert_called_with(
|
||||
**kwargs
|
||||
)
|
||||
|
||||
collist = ('description', 'enabled', 'id', 'name')
|
||||
self.assertEqual(collist, columns)
|
||||
datalist = (
|
||||
identity_fakes.domain_description,
|
||||
True,
|
||||
identity_fakes.domain_id,
|
||||
identity_fakes.domain_name,
|
||||
)
|
||||
self.assertEqual(datalist, data)
|
||||
|
||||
def test_domain_create_description(self):
|
||||
arglist = [
|
||||
'--description', 'new desc',
|
||||
identity_fakes.domain_name,
|
||||
]
|
||||
verifylist = [
|
||||
('description', 'new desc'),
|
||||
('enabled', True),
|
||||
('name', identity_fakes.domain_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.domain_name,
|
||||
'description': 'new desc',
|
||||
'enabled': True,
|
||||
}
|
||||
self.domains_mock.create.assert_called_with(
|
||||
**kwargs
|
||||
)
|
||||
|
||||
collist = ('description', 'enabled', 'id', 'name')
|
||||
self.assertEqual(collist, columns)
|
||||
datalist = (
|
||||
identity_fakes.domain_description,
|
||||
True,
|
||||
identity_fakes.domain_id,
|
||||
identity_fakes.domain_name,
|
||||
)
|
||||
self.assertEqual(datalist, data)
|
||||
|
||||
def test_domain_create_enable(self):
|
||||
arglist = [
|
||||
'--enable',
|
||||
identity_fakes.domain_name,
|
||||
]
|
||||
verifylist = [
|
||||
('enabled', True),
|
||||
('name', identity_fakes.domain_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.domain_name,
|
||||
'description': None,
|
||||
'enabled': True,
|
||||
}
|
||||
self.domains_mock.create.assert_called_with(
|
||||
**kwargs
|
||||
)
|
||||
|
||||
collist = ('description', 'enabled', 'id', 'name')
|
||||
self.assertEqual(collist, columns)
|
||||
datalist = (
|
||||
identity_fakes.domain_description,
|
||||
True,
|
||||
identity_fakes.domain_id,
|
||||
identity_fakes.domain_name,
|
||||
)
|
||||
self.assertEqual(datalist, data)
|
||||
|
||||
def test_domain_create_disable(self):
|
||||
arglist = [
|
||||
'--disable',
|
||||
identity_fakes.domain_name,
|
||||
]
|
||||
verifylist = [
|
||||
('enabled', False),
|
||||
('name', identity_fakes.domain_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.domain_name,
|
||||
'description': None,
|
||||
'enabled': False,
|
||||
}
|
||||
self.domains_mock.create.assert_called_with(
|
||||
**kwargs
|
||||
)
|
||||
|
||||
collist = ('description', 'enabled', 'id', 'name')
|
||||
self.assertEqual(collist, columns)
|
||||
datalist = (
|
||||
identity_fakes.domain_description,
|
||||
True,
|
||||
identity_fakes.domain_id,
|
||||
identity_fakes.domain_name,
|
||||
)
|
||||
self.assertEqual(datalist, data)
|
||||
|
||||
|
||||
class TestDomainDelete(TestDomain):
|
||||
|
||||
def setUp(self):
|
||||
super(TestDomainDelete, self).setUp()
|
||||
|
||||
# This is the return value for utils.find_resource()
|
||||
self.domains_mock.get.return_value = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(identity_fakes.DOMAIN),
|
||||
loaded=True,
|
||||
)
|
||||
self.domains_mock.delete.return_value = None
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = domain.DeleteDomain(self.app, None)
|
||||
|
||||
def test_domain_delete(self):
|
||||
arglist = [
|
||||
identity_fakes.domain_id,
|
||||
]
|
||||
verifylist = [
|
||||
('domain', identity_fakes.domain_id),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
result = self.cmd.run(parsed_args)
|
||||
self.assertEqual(0, result)
|
||||
|
||||
self.domains_mock.delete.assert_called_with(
|
||||
identity_fakes.domain_id,
|
||||
)
|
||||
|
||||
|
||||
class TestDomainList(TestDomain):
|
||||
|
||||
def setUp(self):
|
||||
super(TestDomainList, self).setUp()
|
||||
|
||||
self.domains_mock.list.return_value = [
|
||||
fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(identity_fakes.DOMAIN),
|
||||
loaded=True,
|
||||
),
|
||||
]
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = domain.ListDomain(self.app, None)
|
||||
|
||||
def test_domain_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.domains_mock.list.assert_called_with()
|
||||
|
||||
collist = ('ID', 'Name', 'Enabled', 'Description')
|
||||
self.assertEqual(collist, columns)
|
||||
datalist = ((
|
||||
identity_fakes.domain_id,
|
||||
identity_fakes.domain_name,
|
||||
True,
|
||||
identity_fakes.domain_description,
|
||||
), )
|
||||
self.assertEqual(datalist, tuple(data))
|
||||
|
||||
|
||||
class TestDomainSet(TestDomain):
|
||||
|
||||
def setUp(self):
|
||||
super(TestDomainSet, self).setUp()
|
||||
|
||||
self.domains_mock.get.return_value = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(identity_fakes.DOMAIN),
|
||||
loaded=True,
|
||||
)
|
||||
|
||||
self.domains_mock.update.return_value = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(identity_fakes.DOMAIN),
|
||||
loaded=True,
|
||||
)
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = domain.SetDomain(self.app, None)
|
||||
|
||||
def test_domain_set_no_options(self):
|
||||
arglist = [
|
||||
identity_fakes.domain_name,
|
||||
]
|
||||
verifylist = [
|
||||
('domain', identity_fakes.domain_name),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
result = self.cmd.run(parsed_args)
|
||||
self.assertEqual(0, result)
|
||||
|
||||
self.assertNotCalled(self.domains_mock.update)
|
||||
|
||||
def test_domain_set_name(self):
|
||||
arglist = [
|
||||
'--name', 'qwerty',
|
||||
identity_fakes.domain_id,
|
||||
]
|
||||
verifylist = [
|
||||
('name', 'qwerty'),
|
||||
('domain', identity_fakes.domain_id),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
result = self.cmd.run(parsed_args)
|
||||
self.assertEqual(0, result)
|
||||
|
||||
# Set expected values
|
||||
kwargs = {
|
||||
'name': 'qwerty',
|
||||
}
|
||||
self.domains_mock.update.assert_called_with(
|
||||
identity_fakes.domain_id,
|
||||
**kwargs
|
||||
)
|
||||
|
||||
def test_domain_set_description(self):
|
||||
arglist = [
|
||||
'--description', 'new desc',
|
||||
identity_fakes.domain_id,
|
||||
]
|
||||
verifylist = [
|
||||
('description', 'new desc'),
|
||||
('domain', identity_fakes.domain_id),
|
||||
]
|
||||
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',
|
||||
}
|
||||
self.domains_mock.update.assert_called_with(
|
||||
identity_fakes.domain_id,
|
||||
**kwargs
|
||||
)
|
||||
|
||||
def test_domain_set_enable(self):
|
||||
arglist = [
|
||||
'--enable',
|
||||
identity_fakes.domain_id,
|
||||
]
|
||||
verifylist = [
|
||||
('enabled', True),
|
||||
('domain', identity_fakes.domain_id),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
result = self.cmd.run(parsed_args)
|
||||
self.assertEqual(0, result)
|
||||
|
||||
# Set expected values
|
||||
kwargs = {
|
||||
'enabled': True,
|
||||
}
|
||||
self.domains_mock.update.assert_called_with(
|
||||
identity_fakes.domain_id,
|
||||
**kwargs
|
||||
)
|
||||
|
||||
def test_domain_set_disable(self):
|
||||
arglist = [
|
||||
'--disable',
|
||||
identity_fakes.domain_id,
|
||||
]
|
||||
verifylist = [
|
||||
('disabled', True),
|
||||
('domain', identity_fakes.domain_id),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
result = self.cmd.run(parsed_args)
|
||||
self.assertEqual(0, result)
|
||||
|
||||
# Set expected values
|
||||
kwargs = {
|
||||
'enabled': False,
|
||||
}
|
||||
self.domains_mock.update.assert_called_with(
|
||||
identity_fakes.domain_id,
|
||||
**kwargs
|
||||
)
|
||||
|
||||
|
||||
class TestDomainShow(TestDomain):
|
||||
|
||||
def setUp(self):
|
||||
super(TestDomainShow, self).setUp()
|
||||
|
||||
self.domains_mock.get.return_value = fakes.FakeResource(
|
||||
None,
|
||||
copy.deepcopy(identity_fakes.DOMAIN),
|
||||
loaded=True,
|
||||
)
|
||||
|
||||
# Get the command object to test
|
||||
self.cmd = domain.ShowDomain(self.app, None)
|
||||
|
||||
def test_domain_show(self):
|
||||
arglist = [
|
||||
identity_fakes.domain_id,
|
||||
]
|
||||
verifylist = [
|
||||
('domain', identity_fakes.domain_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.domains_mock.get.assert_called_with(
|
||||
identity_fakes.domain_id,
|
||||
)
|
||||
|
||||
collist = ('description', 'enabled', 'id', 'name')
|
||||
self.assertEqual(collist, columns)
|
||||
datalist = (
|
||||
identity_fakes.domain_description,
|
||||
True,
|
||||
identity_fakes.domain_id,
|
||||
identity_fakes.domain_name,
|
||||
)
|
||||
self.assertEqual(datalist, data)
|
||||
Reference in New Issue
Block a user