diff options
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/compute/v2/flavor.py | 58 | ||||
| -rw-r--r-- | openstackclient/tests/compute/v2/test_flavor.py | 274 | ||||
| -rw-r--r-- | openstackclient/tests/fakes.py | 23 | ||||
| -rw-r--r-- | openstackclient/tests/utils.py | 3 | ||||
| -rw-r--r-- | openstackclient/tests/volume/v1/fakes.py | 3 | ||||
| -rw-r--r-- | openstackclient/tests/volume/v1/test_volume.py | 196 | ||||
| -rw-r--r-- | openstackclient/volume/v1/volume.py | 5 |
7 files changed, 546 insertions, 16 deletions
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py index bb89a85b..195c9a0d 100644 --- a/openstackclient/compute/v2/flavor.py +++ b/openstackclient/compute/v2/flavor.py @@ -152,6 +152,36 @@ class ListFlavor(lister.Lister): log = logging.getLogger(__name__ + ".ListFlavor") + def get_parser(self, prog_name): + parser = super(ListFlavor, self).get_parser(prog_name) + public_group = parser.add_mutually_exclusive_group() + public_group.add_argument( + "--public", + dest="public", + action="store_true", + default=True, + help="List only public flavors (default)", + ) + public_group.add_argument( + "--private", + dest="public", + action="store_false", + help="List only private flavors", + ) + public_group.add_argument( + "--all", + dest="all", + action="store_true", + default=False, + help="List all flavors, whether public or private", + ) + parser.add_argument( + '--long', + action='store_true', + default=False, + help='List additional fields in output') + return parser + def take_action(self, parsed_args): self.log.debug("take_action(%s)", parsed_args) compute_client = self.app.client_manager.compute @@ -161,16 +191,32 @@ class ListFlavor(lister.Lister): "RAM", "Disk", "Ephemeral", - "Swap", "VCPUs", - "RXTX Factor", "Is Public", - "Extra Specs" ) - data = compute_client.flavors.list() - return (columns, + + # is_public is ternary - None means give all flavors, + # True is public only and False is private only + # By default Nova assumes True and gives admins public flavors + # and flavors from their own projects only. + is_public = None if parsed_args.all else parsed_args.public + + data = compute_client.flavors.list(is_public=is_public) + + if parsed_args.long: + columns = columns + ( + "Swap", + "RXTX Factor", + "Properties", + ) + for f in data: + f.properties = f.get_keys() + + column_headers = columns + + return (column_headers, (utils.get_item_properties( - s, columns, + s, columns, formatters={'Properties': utils.format_dict}, ) for s in data)) diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py new file mode 100644 index 00000000..8f33ccfe --- /dev/null +++ b/openstackclient/tests/compute/v2/test_flavor.py @@ -0,0 +1,274 @@ +# Copyright 2015 Symantec Corporation +# +# 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.compute.v2 import flavor +from openstackclient.tests.compute.v2 import fakes as compute_fakes +from openstackclient.tests import fakes + + +class FakeFlavorResource(fakes.FakeResource): + + def get_keys(self): + return {'property': 'value'} + + +class TestFlavor(compute_fakes.TestComputev2): + + def setUp(self): + super(TestFlavor, self).setUp() + + # Get a shortcut to the FlavorManager Mock + self.flavors_mock = self.app.client_manager.compute.flavors + self.flavors_mock.reset_mock() + + +class TestFlavorList(TestFlavor): + + def setUp(self): + super(TestFlavorList, self).setUp() + + self.flavors_mock.list.return_value = [ + FakeFlavorResource( + None, + copy.deepcopy(compute_fakes.FLAVOR), + loaded=True, + ), + ] + + # Get the command object to test + self.cmd = flavor.ListFlavor(self.app, None) + + def test_flavor_list_no_options(self): + arglist = [] + verifylist = [ + ('public', True), + ('all', False), + ('long', False), + ] + + 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 = { + 'is_public': True + } + + self.flavors_mock.list.assert_called_with( + **kwargs + ) + + collist = ( + 'ID', + 'Name', + 'RAM', + 'Disk', + 'Ephemeral', + 'VCPUs', + 'Is Public', + ) + self.assertEqual(collist, columns) + datalist = (( + compute_fakes.flavor_id, + compute_fakes.flavor_name, + compute_fakes.flavor_ram, + '', + '', + compute_fakes.flavor_vcpus, + '' + ), ) + self.assertEqual(datalist, tuple(data)) + + def test_flavor_list_all_flavors(self): + arglist = [ + '--all', + ] + verifylist = [ + ('all', 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 = { + 'is_public': None + } + + self.flavors_mock.list.assert_called_with( + **kwargs + ) + + collist = ( + 'ID', + 'Name', + 'RAM', + 'Disk', + 'Ephemeral', + 'VCPUs', + 'Is Public', + ) + self.assertEqual(collist, columns) + datalist = (( + compute_fakes.flavor_id, + compute_fakes.flavor_name, + compute_fakes.flavor_ram, + '', + '', + compute_fakes.flavor_vcpus, + '' + ), ) + self.assertEqual(datalist, tuple(data)) + + def test_flavor_list_private_flavors(self): + arglist = [ + '--private', + ] + verifylist = [ + ('public', False), + ] + + 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 = { + 'is_public': False + } + + self.flavors_mock.list.assert_called_with( + **kwargs + ) + + collist = ( + 'ID', + 'Name', + 'RAM', + 'Disk', + 'Ephemeral', + 'VCPUs', + 'Is Public', + ) + self.assertEqual(collist, columns) + datalist = (( + compute_fakes.flavor_id, + compute_fakes.flavor_name, + compute_fakes.flavor_ram, + '', + '', + compute_fakes.flavor_vcpus, + '' + ), ) + self.assertEqual(datalist, tuple(data)) + + def test_flavor_list_public_flavors(self): + arglist = [ + '--public', + ] + verifylist = [ + ('public', 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 = { + 'is_public': True + } + + self.flavors_mock.list.assert_called_with( + **kwargs + ) + + collist = ( + 'ID', + 'Name', + 'RAM', + 'Disk', + 'Ephemeral', + 'VCPUs', + 'Is Public', + ) + self.assertEqual(collist, columns) + datalist = (( + compute_fakes.flavor_id, + compute_fakes.flavor_name, + compute_fakes.flavor_ram, + '', + '', + compute_fakes.flavor_vcpus, + '' + ), ) + self.assertEqual(datalist, tuple(data)) + + def test_flavor_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) + + # Set expected values + kwargs = { + 'is_public': True + } + + self.flavors_mock.list.assert_called_with( + **kwargs + ) + + collist = ( + 'ID', + 'Name', + 'RAM', + 'Disk', + 'Ephemeral', + 'VCPUs', + 'Is Public', + 'Swap', + 'RXTX Factor', + 'Properties' + ) + self.assertEqual(collist, columns) + datalist = (( + compute_fakes.flavor_id, + compute_fakes.flavor_name, + compute_fakes.flavor_ram, + '', + '', + compute_fakes.flavor_vcpus, + '', + '', + '', + 'property=\'value\'' + ), ) + self.assertEqual(datalist, tuple(data)) diff --git a/openstackclient/tests/fakes.py b/openstackclient/tests/fakes.py index d37555e3..323f9543 100644 --- a/openstackclient/tests/fakes.py +++ b/openstackclient/tests/fakes.py @@ -52,13 +52,34 @@ class FakeStdout(object): return result +class FakeLog(object): + def __init__(self): + self.messages = {} + + def debug(self, msg): + self.messages['debug'] = msg + + def info(self, msg): + self.messages['info'] = msg + + def warning(self, msg): + self.messages['warning'] = msg + + def error(self, msg): + self.messages['error'] = msg + + def critical(self, msg): + self.messages['critical'] = msg + + class FakeApp(object): - def __init__(self, _stdout): + def __init__(self, _stdout, _log): self.stdout = _stdout self.client_manager = None self.stdin = sys.stdin self.stdout = _stdout or sys.stdout self.stderr = sys.stderr + self.log = _log class FakeClient(object): diff --git a/openstackclient/tests/utils.py b/openstackclient/tests/utils.py index 7fc7ddfe..d9abd572 100644 --- a/openstackclient/tests/utils.py +++ b/openstackclient/tests/utils.py @@ -80,7 +80,8 @@ class TestCommand(TestCase): super(TestCommand, self).setUp() # Build up a fake app self.fake_stdout = fakes.FakeStdout() - self.app = fakes.FakeApp(self.fake_stdout) + self.fake_log = fakes.FakeLog() + self.app = fakes.FakeApp(self.fake_stdout, self.fake_log) self.app.client_manager = fakes.FakeClientManager() def check_parser(self, cmd, args, verify_args): diff --git a/openstackclient/tests/volume/v1/fakes.py b/openstackclient/tests/volume/v1/fakes.py index 34778190..339fb2d4 100644 --- a/openstackclient/tests/volume/v1/fakes.py +++ b/openstackclient/tests/volume/v1/fakes.py @@ -23,6 +23,7 @@ from openstackclient.tests import utils volume_id = 'vvvvvvvv-vvvv-vvvv-vvvvvvvv' volume_name = 'nigel' volume_description = 'Nigel Tufnel' +volume_status = 'available' volume_size = 120 volume_type = 'to-eleven' volume_zone = 'stonehenge' @@ -38,7 +39,7 @@ VOLUME = { 'display_name': volume_name, 'display_description': volume_description, 'size': volume_size, - 'status': '', + 'status': volume_status, 'attach_status': 'detached', 'availability_zone': volume_zone, 'volume_type': volume_type, diff --git a/openstackclient/tests/volume/v1/test_volume.py b/openstackclient/tests/volume/v1/test_volume.py index cc5aeff8..f73260e9 100644 --- a/openstackclient/tests/volume/v1/test_volume.py +++ b/openstackclient/tests/volume/v1/test_volume.py @@ -114,7 +114,7 @@ class TestVolumeCreate(TestVolume): volume_fakes.volume_id, volume_fakes.volume_metadata_str, volume_fakes.volume_size, - '', + volume_fakes.volume_status, volume_fakes.volume_type, ) self.assertEqual(datalist, data) @@ -178,7 +178,7 @@ class TestVolumeCreate(TestVolume): volume_fakes.volume_id, volume_fakes.volume_metadata_str, volume_fakes.volume_size, - '', + volume_fakes.volume_status, volume_fakes.volume_type, ) self.assertEqual(datalist, data) @@ -253,7 +253,7 @@ class TestVolumeCreate(TestVolume): volume_fakes.volume_id, volume_fakes.volume_metadata_str, volume_fakes.volume_size, - '', + volume_fakes.volume_status, volume_fakes.volume_type, ) self.assertEqual(datalist, data) @@ -328,7 +328,7 @@ class TestVolumeCreate(TestVolume): volume_fakes.volume_id, volume_fakes.volume_metadata_str, volume_fakes.volume_size, - '', + volume_fakes.volume_status, volume_fakes.volume_type, ) self.assertEqual(datalist, data) @@ -389,7 +389,7 @@ class TestVolumeCreate(TestVolume): volume_fakes.volume_id, volume_fakes.volume_metadata_str, volume_fakes.volume_size, - '', + volume_fakes.volume_status, volume_fakes.volume_type, ) self.assertEqual(datalist, data) @@ -455,7 +455,7 @@ class TestVolumeCreate(TestVolume): volume_fakes.volume_id, volume_fakes.volume_metadata_str, volume_fakes.volume_size, - '', + volume_fakes.volume_status, volume_fakes.volume_type, ) self.assertEqual(datalist, data) @@ -521,7 +521,189 @@ class TestVolumeCreate(TestVolume): volume_fakes.volume_id, volume_fakes.volume_metadata_str, volume_fakes.volume_size, - '', + volume_fakes.volume_status, volume_fakes.volume_type, ) self.assertEqual(datalist, data) + + +class TestVolumeSet(TestVolume): + + def setUp(self): + super(TestVolumeSet, self).setUp() + + self.volumes_mock.get.return_value = fakes.FakeResource( + None, + copy.deepcopy(volume_fakes.VOLUME), + loaded=True, + ) + + self.volumes_mock.update.return_value = fakes.FakeResource( + None, + copy.deepcopy(volume_fakes.VOLUME), + loaded=True, + ) + # Get the command object to test + self.cmd = volume.SetVolume(self.app, None) + + def test_volume_set_no_options(self): + arglist = [ + volume_fakes.volume_name, + ] + verifylist = [ + ('name', None), + ('description', None), + ('size', None), + ('property', None), + ('volume', volume_fakes.volume_name), + ] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + result = self.cmd.run(parsed_args) + self.assertEqual(0, result) + self.assertEqual("No changes requested\n", + self.app.log.messages.get('error')) + + def test_volume_set_name(self): + arglist = [ + '--name', 'qwerty', + volume_fakes.volume_name, + ] + verifylist = [ + ('name', 'qwerty'), + ('description', None), + ('size', None), + ('property', None), + ('volume', volume_fakes.volume_name), + ] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + # DisplayCommandBase.take_action() returns two tuples + self.cmd.take_action(parsed_args) + + # Set expected values + kwargs = { + 'display_name': 'qwerty', + } + self.volumes_mock.update.assert_called_with( + volume_fakes.volume_id, + **kwargs + ) + + def test_volume_set_description(self): + arglist = [ + '--description', 'new desc', + volume_fakes.volume_name, + ] + verifylist = [ + ('name', None), + ('description', 'new desc'), + ('size', None), + ('property', None), + ('volume', volume_fakes.volume_name), + ] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + # DisplayCommandBase.take_action() returns two tuples + self.cmd.take_action(parsed_args) + + # Set expected values + kwargs = { + 'display_description': 'new desc', + } + self.volumes_mock.update.assert_called_with( + volume_fakes.volume_id, + **kwargs + ) + + def test_volume_set_size(self): + arglist = [ + '--size', '130', + volume_fakes.volume_name, + ] + verifylist = [ + ('name', None), + ('description', None), + ('size', 130), + ('property', None), + ('volume', volume_fakes.volume_name), + ] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + # DisplayCommandBase.take_action() returns two tuples + self.cmd.take_action(parsed_args) + + # Set expected values + size = 130 + + self.volumes_mock.extend.assert_called_with( + volume_fakes.volume_id, + size + ) + + def test_volume_set_size_smaller(self): + arglist = [ + '--size', '100', + volume_fakes.volume_name, + ] + verifylist = [ + ('name', None), + ('description', None), + ('size', 100), + ('property', None), + ('volume', volume_fakes.volume_name), + ] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + result = self.cmd.run(parsed_args) + self.assertEqual(0, result) + self.assertEqual("New size must be greater than %s GB" % + volume_fakes.volume_size, + self.app.log.messages.get('error')) + + def test_volume_set_size_not_available(self): + self.volumes_mock.get.return_value.status = 'error' + arglist = [ + '--size', '130', + volume_fakes.volume_name, + ] + verifylist = [ + ('name', None), + ('description', None), + ('size', 130), + ('property', None), + ('volume', volume_fakes.volume_name), + ] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + result = self.cmd.run(parsed_args) + self.assertEqual(0, result) + self.assertEqual("Volume is in %s state, it must be available before " + "size can be extended" % 'error', + self.app.log.messages.get('error')) + + def test_volume_set_property(self): + arglist = [ + '--property', 'myprop=myvalue', + volume_fakes.volume_name, + ] + verifylist = [ + ('name', None), + ('description', None), + ('size', None), + ('property', {'myprop': 'myvalue'}), + ('volume', volume_fakes.volume_name), + ] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + # DisplayCommandBase.take_action() returns two tuples + self.cmd.take_action(parsed_args) + + # Set expected values + metadata = { + 'myprop': 'myvalue' + } + self.volumes_mock.set_metadata.assert_called_with( + volume_fakes.volume_id, + metadata + ) diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py index 9e548977..3d26a5e9 100644 --- a/openstackclient/volume/v1/volume.py +++ b/openstackclient/volume/v1/volume.py @@ -348,6 +348,11 @@ class SetVolume(command.Command): volume = utils.find_resource(volume_client.volumes, parsed_args.volume) if parsed_args.size: + if volume.status != 'available': + self.app.log.error("Volume is in %s state, it must be " + "available before size can be extended" % + volume.status) + return if parsed_args.size <= volume.size: self.app.log.error("New size must be greater than %s GB" % volume.size) |