diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-12 12:56:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-12 12:56:08 +0000 |
| commit | 48a9cd5acaf970ef32df95f39722db08fcff284b (patch) | |
| tree | 7270601b4d4a6005a400561fb12eb4e418bb95bc | |
| parent | 658de38c20e028898fe0641de2e18686703f7b70 (diff) | |
| parent | ceddb3cfd033661f63d1245a45e0e197561be19c (diff) | |
| download | python-cinderclient-48a9cd5acaf970ef32df95f39722db08fcff284b.tar.gz | |
Merge "Fix: --poll inconsistency"
| -rw-r--r-- | cinderclient/tests/unit/v3/test_shell.py | 1 | ||||
| -rw-r--r-- | cinderclient/v3/shell.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cinderclient/tests/unit/v3/test_shell.py b/cinderclient/tests/unit/v3/test_shell.py index bcf1e3d..e202655 100644 --- a/cinderclient/tests/unit/v3/test_shell.py +++ b/cinderclient/tests/unit/v3/test_shell.py @@ -1165,7 +1165,6 @@ class ShellTest(utils.TestCase): volume = self.shell.cs.volumes.get('1234') info = dict() info.update(volume._info) - info.pop('links', None) self.assertEqual(1, poll_method.call_count) timeout_period = 3600 poll_method.assert_has_calls([mock.call(self.shell.cs.volumes.get, diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py index 85feca5..1fb5cf8 100644 --- a/cinderclient/v3/shell.py +++ b/cinderclient/v3/shell.py @@ -676,6 +676,8 @@ def do_create(cs, args): shell_utils._poll_for_status( cs.volumes.get, volume.id, info, 'creating', ['available'], timeout_period, cs.client.global_request_id, cs.messages) + volume = cs.volumes.get(volume.id) + info.update(volume._info) utils.print_dict(info) |