7fdb8f0b53
tuskar overcloud-{show,delete,update} and
tuskar overcloud-role-{show,delete,update}
now work by specifying the name, not just by id.
If the find_resource method can not find the entity by id or uuid, it gets
the list of entities and looks it up by name.
The do_overcloud_show, do_overcloud_update, do_overcloud_delete and
do_overcloud_role_show, do_overcloud_role_update, do_overcloud_role_delete
methods have also been modified to reflect the changes.
Added unittest for find_resource and updated the existing unittests.
Change-Id: I053d26ca5a6ce727c77863c7f7a4ebfa0687a497
Closes-Bug: #1308173
122 lines
4.1 KiB
Python
122 lines
4.1 KiB
Python
# Copyright 2013 OpenStack LLC.
|
|
# All Rights Reserved.
|
|
#
|
|
# 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 mock
|
|
|
|
from tuskarclient.common import utils
|
|
from tuskarclient.openstack.common.apiclient import exceptions as exc
|
|
from tuskarclient.tests import utils as test_utils
|
|
|
|
|
|
class DefineCommandsTest(test_utils.TestCase):
|
|
|
|
def test_define_commands_from_module(self):
|
|
subparsers = mock.Mock()
|
|
subparser = mock.MagicMock()
|
|
subparsers.add_parser.return_value = subparser
|
|
dummy_module = self.dummy_command_module()
|
|
|
|
utils.define_commands_from_module(subparsers, dummy_module)
|
|
subparsers.add_parser.assert_called_with(
|
|
'dummy-list', help="Docstring.", description="Docstring.")
|
|
subparser.add_argument.assert_called_with(
|
|
'-a', metavar='<NUMBER>', help="Add a number.")
|
|
subparser.set_defaults.assert_called_with(
|
|
func=dummy_module.do_dummy_list)
|
|
|
|
def dummy_command_module(self):
|
|
@utils.arg('-a', metavar='<NUMBER>', help="Add a number.")
|
|
def do_dummy_list():
|
|
'''Docstring.'''
|
|
return 42
|
|
|
|
dummy = mock.Mock()
|
|
dummy.do_dummy_list = do_dummy_list
|
|
dummy.other_method = mock.Mock('other_method', return_value=43)
|
|
return dummy
|
|
|
|
|
|
class MarshalAssociationTest(test_utils.TestCase):
|
|
|
|
def setUp(self):
|
|
super(MarshalAssociationTest, self).setUp()
|
|
self.args = mock.Mock(spec=['rack'])
|
|
self.dict = {}
|
|
|
|
def test_with_id(self):
|
|
self.args.rack = '10'
|
|
utils.marshal_association(self.args, self.dict, 'rack')
|
|
self.assertEqual(self.dict['rack']['id'], '10')
|
|
|
|
def test_with_empty_association(self):
|
|
self.args.rack = ''
|
|
utils.marshal_association(self.args, self.dict, 'rack')
|
|
self.assertEqual(self.dict['rack'], None)
|
|
|
|
def test_when_unset(self):
|
|
self.args.rack = None
|
|
utils.marshal_association(self.args, self.dict, 'rack')
|
|
self.assertFalse('rack' in self.dict)
|
|
|
|
|
|
class FindResourceTest(test_utils.TestCase):
|
|
|
|
def setUp(self):
|
|
super(FindResourceTest, self).setUp()
|
|
|
|
self.overcloud1 = mock.Mock()
|
|
self.overcloud1.id = '1'
|
|
self.overcloud1.name = 'My Overcloud 1'
|
|
|
|
self.overcloud2 = mock.Mock()
|
|
self.overcloud2.id = '2'
|
|
self.overcloud2.name = 'My Overcloud 2'
|
|
|
|
self.overcloud3 = mock.Mock()
|
|
self.overcloud3.id = '3'
|
|
self.overcloud3.name = 'My Overcloud 2'
|
|
|
|
self.manager = mock.Mock()
|
|
self.manager.resource_class = None
|
|
self.manager.get.return_value = self.overcloud1
|
|
self.manager.resource_class = mock.Mock(__name__='Overcloud',
|
|
NAME_ATTR='name')
|
|
self.manager.list.return_value = [
|
|
self.overcloud1,
|
|
self.overcloud2,
|
|
self.overcloud3]
|
|
|
|
def test_with_id(self):
|
|
overcloud = utils.find_resource(self.manager, '1')
|
|
self.manager.get.assert_called_with(1)
|
|
self.assertEqual(self.overcloud1, overcloud)
|
|
|
|
def test_with_name(self):
|
|
overcloud = utils.find_resource(self.manager, 'My Overcloud 1')
|
|
self.assertEqual(self.overcloud1, overcloud)
|
|
|
|
def test_no_match(self):
|
|
self.assertRaises(exc.CommandError,
|
|
utils.find_resource,
|
|
self.manager,
|
|
'My Overcloud 3')
|
|
|
|
def test_multiple_matches(self):
|
|
self.assertRaises(exc.CommandError,
|
|
utils.find_resource,
|
|
self.manager,
|
|
'My Overcloud 2')
|