diff options
| author | zhangbailin <zhangbailin@inspur.com> | 2020-04-10 08:39:35 +0800 |
|---|---|---|
| committer | zhangbailin <zhangbailin@inspur.com> | 2020-04-10 08:39:39 +0800 |
| commit | c5f29d683315e1afbe944aca8b3ae819de74d286 (patch) | |
| tree | 14919a20e9ad88344a12a74dffb23c9d55c81887 | |
| parent | 4d6c70d25df99a4f28f263cd3160c74ccf1343e3 (diff) | |
| download | python-novaclient-c5f29d683315e1afbe944aca8b3ae819de74d286.tar.gz | |
FUP: Add volume-update CLI pre V285 tests
This commit mainly to fix some comments from [1].
[1]https://review.opendev.org/#/c/712651/19/novaclient/tests/unit/v2/test_shell.py@4001
Blueprint: destroy-instance-with-datavolume
Change-Id: Id809f22d0da2cdedf33a2c0df202f3953fd01673
| -rw-r--r-- | doc/source/cli/nova.rst | 4 | ||||
| -rw-r--r-- | novaclient/tests/unit/v2/test_shell.py | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/doc/source/cli/nova.rst b/doc/source/cli/nova.rst index 6db1cd0c..d661599e 100644 --- a/doc/source/cli/nova.rst +++ b/doc/source/cli/nova.rst @@ -3966,11 +3966,13 @@ new volume. ``--delete-on-termination`` Specify that the volume should be deleted when the server is destroyed. + It is mutually exclusive with '--no-delete-on-termination'. (Supported by API versions '2.85' - '2.latest') ``--no-delete-on-termination`` Specify that the attached volume should not be deleted when - the server is destroyed. (Supported by API versions '2.85' - '2.latest') + the server is destroyed. It is mutually exclusive with '--delete-on-termination'. + (Supported by API versions '2.85' - '2.latest') .. _nova_bash-completion: diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py index d21252bd..6aa37f7d 100644 --- a/novaclient/tests/unit/v2/test_shell.py +++ b/novaclient/tests/unit/v2/test_shell.py @@ -4006,6 +4006,18 @@ class ShellTest(utils.TestCase): self.assert_called('PUT', '/servers/1234/os-volume_attachments/Work', {'volumeAttachment': {'volumeId': 'Work'}}) + def test_volume_update_delete_on_termination_pre_v285(self): + self.assertRaises( + SystemExit, self.run_command, + 'volume-update sample-server --delete-on-termination Work Work', + api_version='2.84') + + def test_volume_update_no_delete_on_termination_pre_v285(self): + self.assertRaises( + SystemExit, self.run_command, + 'volume-update sample-server --no-delete-on-termination Work Work', + api_version='2.84') + def test_volume_update_v285(self): self.run_command('volume-update sample-server --delete-on-termination ' 'Work Work', api_version='2.85') |