diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-26 22:16:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-26 22:16:39 +0000 |
| commit | 63ac82a55489d55246da939b5ae60b8a65fb9ec7 (patch) | |
| tree | a24b54069921eca1e367e8faa83b5b76607e4a26 /cinderclient/tests | |
| parent | 7547e55bbebfeb4232968780cfed4d9a448594ae (diff) | |
| parent | 0ea7b2e0cf1dfd31ee8f12ceae5193c4a68c60b3 (diff) | |
| download | python-cinderclient-63ac82a55489d55246da939b5ae60b8a65fb9ec7.tar.gz | |
Merge "cinder show with attachments is a mess"
Diffstat (limited to 'cinderclient/tests')
| -rw-r--r-- | cinderclient/tests/functional/test_cli.py | 3 | ||||
| -rw-r--r-- | cinderclient/tests/unit/v2/fakes.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cinderclient/tests/functional/test_cli.py b/cinderclient/tests/functional/test_cli.py index 01083c4..8047459 100644 --- a/cinderclient/tests/functional/test_cli.py +++ b/cinderclient/tests/functional/test_cli.py @@ -17,7 +17,8 @@ from cinderclient.tests.functional import base class CinderVolumeTests(base.ClientTestBase): """Check of base cinder volume commands.""" - VOLUME_PROPERTY = ('attachments', 'availability_zone', 'bootable', + VOLUME_PROPERTY = ('attachment_ids', 'attached_servers', + 'availability_zone', 'bootable', 'created_at', 'description', 'encrypted', 'id', 'metadata', 'name', 'size', 'status', 'user_id', 'volume_type') diff --git a/cinderclient/tests/unit/v2/fakes.py b/cinderclient/tests/unit/v2/fakes.py index 04c179d..a4c5d39 100644 --- a/cinderclient/tests/unit/v2/fakes.py +++ b/cinderclient/tests/unit/v2/fakes.py @@ -28,7 +28,8 @@ REQUEST_ID = 'req-test-request-id' def _stub_volume(*args, **kwargs): volume = { "migration_status": None, - "attachments": [{u'server_id': u'1234'}], + "attachments": [{u'server_id': u'1234', u'id': + u'3f88836f-adde-4296-9f6b-2c59a0bcda9a'}], "links": [ { "href": "http://localhost/v2/fake/volumes/1234", |