diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-07 01:31:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-07 01:31:50 +0000 |
| commit | dd0fe3d94ee6967c42c48be5181a2901b691a40c (patch) | |
| tree | 912728cffdf59d54b4240abe96d06eaf87f1c7b6 | |
| parent | 3f7f1c65828e84ad718f974aa8925d14e327e62a (diff) | |
| parent | 4bea5d37d9feb4a5925d70ea2a6298793bc924a4 (diff) | |
| download | python-openstackclient-dd0fe3d94ee6967c42c48be5181a2901b691a40c.tar.gz | |
Merge "Fix errors for "volume type unset" command"
| -rw-r--r-- | doc/source/command-objects/volume-type.rst | 2 | ||||
| -rw-r--r-- | openstackclient/tests/volume/v2/test_type.py | 6 | ||||
| -rw-r--r-- | openstackclient/volume/v2/volume_type.py | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/doc/source/command-objects/volume-type.rst b/doc/source/command-objects/volume-type.rst index b7aea632..50acf9fa 100644 --- a/doc/source/command-objects/volume-type.rst +++ b/doc/source/command-objects/volume-type.rst @@ -150,7 +150,7 @@ Unset volume type properties .. code:: bash os volume type unset - [--property <key>] + [--property <key> [...] ] [--project <project>] [--project-domain <project-domain>] <volume-type> diff --git a/openstackclient/tests/volume/v2/test_type.py b/openstackclient/tests/volume/v2/test_type.py index 872b4ae9..10c38612 100644 --- a/openstackclient/tests/volume/v2/test_type.py +++ b/openstackclient/tests/volume/v2/test_type.py @@ -397,17 +397,19 @@ class TestTypeUnset(TestType): def test_type_unset(self): arglist = [ '--property', 'property', + '--property', 'multi_property', self.volume_type.id, ] verifylist = [ - ('property', 'property'), + ('property', ['property', 'multi_property']), ('volume_type', self.volume_type.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) 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) def test_type_unset_project_access(self): diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py index e44e39ff..9aed17bc 100644 --- a/openstackclient/volume/v2/volume_type.py +++ b/openstackclient/volume/v2/volume_type.py @@ -256,6 +256,7 @@ class UnsetVolumeType(command.Command): parser.add_argument( '--property', metavar='<key>', + action='append', help=_('Remove a property from this volume type ' '(repeat option to remove multiple properties)'), ) |