diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-11 15:59:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-11 15:59:44 +0000 |
| commit | d83998f6f0c18787a99ae189a4429fc142d8533a (patch) | |
| tree | 0039b6120fc7f3e3da7e69b549423014b804e982 /cinderclient/tests/unit | |
| parent | bafd84b9fad75426e8f0dc3f4e751f0201a7338d (diff) | |
| parent | 3c1b417959689c85a2f54505057ca995fedca075 (diff) | |
| download | python-cinderclient-d83998f6f0c18787a99ae189a4429fc142d8533a.tar.gz | |
Merge "Drop support for --allow-multiattach"
Diffstat (limited to 'cinderclient/tests/unit')
| -rw-r--r-- | cinderclient/tests/unit/v2/fakes.py | 1 | ||||
| -rw-r--r-- | cinderclient/tests/unit/v2/test_shell.py | 8 | ||||
| -rw-r--r-- | cinderclient/tests/unit/v2/test_volumes.py | 2 | ||||
| -rw-r--r-- | cinderclient/tests/unit/v3/test_shell.py | 2 | ||||
| -rw-r--r-- | cinderclient/tests/unit/v3/test_volumes.py | 1 |
5 files changed, 5 insertions, 9 deletions
diff --git a/cinderclient/tests/unit/v2/fakes.py b/cinderclient/tests/unit/v2/fakes.py index bd8bb34..0cf1faa 100644 --- a/cinderclient/tests/unit/v2/fakes.py +++ b/cinderclient/tests/unit/v2/fakes.py @@ -56,7 +56,6 @@ def _stub_volume(*args, **kwargs): "metadata": {}, "status": "available", 'description': None, - "multiattach": "false", "os-volume-replication:driver_data": None, "source_volid": None, "consistencygroup_id": None, diff --git a/cinderclient/tests/unit/v2/test_shell.py b/cinderclient/tests/unit/v2/test_shell.py index 1bc562b..22cb25e 100644 --- a/cinderclient/tests/unit/v2/test_shell.py +++ b/cinderclient/tests/unit/v2/test_shell.py @@ -105,7 +105,7 @@ class ShellTest(utils.TestCase): 'metadata': {'key1': '"--test1"'}, 'volume_type': None, 'description': None, - 'multiattach': False}} + }} self.assert_called_anytime('POST', '/volumes', expected) def test_metadata_args_limiter_display_name(self): @@ -121,7 +121,7 @@ class ShellTest(utils.TestCase): 'metadata': {'key1': '"--t1"'}, 'volume_type': None, 'description': None, - 'multiattach': False}} + }} self.assert_called_anytime('POST', '/volumes', expected) def test_delimit_metadata_args(self): @@ -137,7 +137,7 @@ class ShellTest(utils.TestCase): 'key2': '"test2"'}, 'volume_type': None, 'description': None, - 'multiattach': False}} + }} self.assert_called_anytime('POST', '/volumes', expected) def test_delimit_metadata_args_display_name(self): @@ -153,7 +153,7 @@ class ShellTest(utils.TestCase): 'metadata': {'key1': '"t1"'}, 'volume_type': None, 'description': None, - 'multiattach': False}} + }} self.assert_called_anytime('POST', '/volumes', expected) def test_list_filter_status(self): diff --git a/cinderclient/tests/unit/v2/test_volumes.py b/cinderclient/tests/unit/v2/test_volumes.py index 5240507..8704c66 100644 --- a/cinderclient/tests/unit/v2/test_volumes.py +++ b/cinderclient/tests/unit/v2/test_volumes.py @@ -100,7 +100,7 @@ class VolumesTest(utils.TestCase): 'volume_type': None, 'metadata': {}, 'consistencygroup_id': None, - 'multiattach': False}, + }, 'OS-SCH-HNT:scheduler_hints': 'uuid'} cs.assert_called('POST', '/volumes', body=expected) self._assert_request_id(vol) diff --git a/cinderclient/tests/unit/v3/test_shell.py b/cinderclient/tests/unit/v3/test_shell.py index 8c81de0..8969cab 100644 --- a/cinderclient/tests/unit/v3/test_shell.py +++ b/cinderclient/tests/unit/v3/test_shell.py @@ -692,7 +692,6 @@ class ShellTest(utils.TestCase): 'metadata': {}, 'volume_type': '4321', 'description': None, - 'multiattach': False, 'backup_id': None}} self.assert_called_anytime('POST', '/volumes', expected) @@ -715,7 +714,6 @@ class ShellTest(utils.TestCase): 'metadata': {}, 'volume_type': None, 'description': None, - 'multiattach': False, 'backup_id': None}} expected['volume'].update(update) self.assert_called_anytime('POST', '/volumes', body=expected) diff --git a/cinderclient/tests/unit/v3/test_volumes.py b/cinderclient/tests/unit/v3/test_volumes.py index 42e649b..79206f6 100644 --- a/cinderclient/tests/unit/v3/test_volumes.py +++ b/cinderclient/tests/unit/v3/test_volumes.py @@ -83,7 +83,6 @@ class VolumesTest(utils.TestCase): 'volume_type': '5678', 'metadata': {}, 'consistencygroup_id': None, - 'multiattach': False, 'group_id': '1234', 'backup_id': None}} cs.assert_called('POST', '/volumes', body=expected) |