diff options
| author | Zuul <zuul@review.openstack.org> | 2018-11-08 19:11:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-11-08 19:11:06 +0000 |
| commit | 51986b1eae4b03c23641e9631487acc3ffcf458d (patch) | |
| tree | a0f46622f252012819ae2dbef3467493e14706bf /openstackclient | |
| parent | c3a60e11738a95663b3e27c9089671a1eab5f1c6 (diff) | |
| parent | f00ffebea61f94f2334d1c1578bc23986bbcf58c (diff) | |
| download | python-openstackclient-51986b1eae4b03c23641e9631487acc3ffcf458d.tar.gz | |
Merge "Remove invalid 'unlock-volume' migration arg"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/unit/volume/v2/test_volume.py | 24 | ||||
| -rw-r--r-- | openstackclient/volume/v2/volume.py | 10 |
2 files changed, 1 insertions, 33 deletions
diff --git a/openstackclient/tests/unit/volume/v2/test_volume.py b/openstackclient/tests/unit/volume/v2/test_volume.py index 183fb228..1f53ce94 100644 --- a/openstackclient/tests/unit/volume/v2/test_volume.py +++ b/openstackclient/tests/unit/volume/v2/test_volume.py @@ -1188,7 +1188,6 @@ class TestVolumeMigrate(TestVolume): verifylist = [ ("force_host_copy", False), ("lock_volume", False), - ("unlock_volume", False), ("host", "host@backend-name#pool"), ("volume", self._volume.id), ] @@ -1210,7 +1209,6 @@ class TestVolumeMigrate(TestVolume): verifylist = [ ("force_host_copy", True), ("lock_volume", True), - ("unlock_volume", False), ("host", "host@backend-name#pool"), ("volume", self._volume.id), ] @@ -1222,27 +1220,6 @@ class TestVolumeMigrate(TestVolume): self._volume.id, "host@backend-name#pool", True, True) self.assertIsNone(result) - def test_volume_migrate_with_unlock_volume(self): - arglist = [ - "--unlock-volume", - "--host", "host@backend-name#pool", - self._volume.id, - ] - verifylist = [ - ("force_host_copy", False), - ("lock_volume", False), - ("unlock_volume", True), - ("host", "host@backend-name#pool"), - ("volume", self._volume.id), - ] - parsed_args = self.check_parser(self.cmd, arglist, verifylist) - - result = self.cmd.take_action(parsed_args) - self.volumes_mock.get.assert_called_once_with(self._volume.id) - self.volumes_mock.migrate_volume.assert_called_once_with( - self._volume.id, "host@backend-name#pool", False, False) - self.assertIsNone(result) - def test_volume_migrate_without_host(self): arglist = [ self._volume.id, @@ -1250,7 +1227,6 @@ class TestVolumeMigrate(TestVolume): verifylist = [ ("force_host_copy", False), ("lock_volume", False), - ("unlock_volume", False), ("volume", self._volume.id), ] diff --git a/openstackclient/volume/v2/volume.py b/openstackclient/volume/v2/volume.py index 7a5c207a..14a454c2 100644 --- a/openstackclient/volume/v2/volume.py +++ b/openstackclient/volume/v2/volume.py @@ -480,21 +480,13 @@ class MigrateVolume(command.Command): help=_("Enable generic host-based force-migration, " "which bypasses driver optimizations") ) - lock_group = parser.add_mutually_exclusive_group() - lock_group.add_argument( + parser.add_argument( '--lock-volume', action="store_true", help=_("If specified, the volume state will be locked " "and will not allow a migration to be aborted " "(possibly by another operation)") ) - lock_group.add_argument( - '--unlock-volume', - action="store_true", - help=_("If specified, the volume state will not be " - "locked and the a migration can be aborted " - "(default) (possibly by another operation)") - ) return parser def take_action(self, parsed_args): |