diff options
| -rw-r--r-- | doc/source/cli/nova.rst | 6 | ||||
| -rw-r--r-- | novaclient/tests/unit/v2/test_shell.py | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/doc/source/cli/nova.rst b/doc/source/cli/nova.rst index 6db1cd0c..4b501949 100644 --- a/doc/source/cli/nova.rst +++ b/doc/source/cli/nova.rst @@ -2320,10 +2320,12 @@ present in the failure domain. ``--config-drive`` Display servers that have a config drive attached. + It is mutually exclusive with '--no-config-drive'. (Admin only until microversion 2.82). ``--no-config-drive`` Display servers that do not have a config drive attached. + It is mutually exclusive with '--config-drive'. (Admin only until microversion 2.82). ``--progress <progress>`` @@ -3966,11 +3968,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 0994b5bd..21c72840 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') |