Merge "Fix errors for "volume type unset" command"

This commit is contained in:
Jenkins
2016-06-07 01:31:50 +00:00
committed by Gerrit Code Review
3 changed files with 6 additions and 3 deletions
doc/source/command-objects
openstackclient
tests
volume
volume

@ -150,7 +150,7 @@ Unset volume type properties
.. code:: bash .. code:: bash
os volume type unset os volume type unset
[--property <key>] [--property <key> [...] ]
[--project <project>] [--project <project>]
[--project-domain <project-domain>] [--project-domain <project-domain>]
<volume-type> <volume-type>

@ -397,17 +397,19 @@ class TestTypeUnset(TestType):
def test_type_unset(self): def test_type_unset(self):
arglist = [ arglist = [
'--property', 'property', '--property', 'property',
'--property', 'multi_property',
self.volume_type.id, self.volume_type.id,
] ]
verifylist = [ verifylist = [
('property', 'property'), ('property', ['property', 'multi_property']),
('volume_type', self.volume_type.id), ('volume_type', self.volume_type.id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.volume_type.unset_keys.assert_called_once_with('property') self.volume_type.unset_keys.assert_called_once_with(
['property', 'multi_property'])
self.assertIsNone(result) self.assertIsNone(result)
def test_type_unset_project_access(self): def test_type_unset_project_access(self):

@ -256,6 +256,7 @@ class UnsetVolumeType(command.Command):
parser.add_argument( parser.add_argument(
'--property', '--property',
metavar='<key>', metavar='<key>',
action='append',
help=_('Remove a property from this volume type ' help=_('Remove a property from this volume type '
'(repeat option to remove multiple properties)'), '(repeat option to remove multiple properties)'),
) )