diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-14 22:49:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-14 22:49:11 +0000 |
| commit | e8567aa98ab2588368125347e2ec89d7d2781fe7 (patch) | |
| tree | e61eb16e3aa3e82d3d38ea0a9388d389f28fc05c /nova/tests/integrated | |
| parent | 75af47a596b47674deec3867d81fabbea243d2a0 (diff) | |
| parent | 28f0b01717f17ecc545a25f6deb0aa240e5aaf0d (diff) | |
| download | nova-e8567aa98ab2588368125347e2ec89d7d2781fe7.tar.gz nova-e8567aa98ab2588368125347e2ec89d7d2781fe7.tar.xz nova-e8567aa98ab2588368125347e2ec89d7d2781fe7.zip | |
Merge "Fix response from snapshot create stub"
Diffstat (limited to 'nova/tests/integrated')
| -rw-r--r-- | nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.json.tpl | 23 | ||||
| -rw-r--r-- | nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.xml.tpl | 2 |
2 files changed, 2 insertions, 23 deletions
diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.json.tpl b/nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.json.tpl index 73cd02d9d..ddffd97a3 100644 --- a/nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.json.tpl @@ -6,27 +6,6 @@ "id": 100, "size": 100, "status": "available", - "volumeId": { - "attach_status": "attached", - "availability_zone": "fakeaz", - "created_at": "%(timestamp)s", - "display_description": "displaydesc", - "display_name": "displayname", - "host": "fakehost", - "id": "%(uuid)s", - "instance_uuid": "fakeuuid", - "mountpoint": "/", - "name": "vol name", - "project_id": "fakeproject", - "size": 1, - "snapshot_id": null, - "status": "fakestatus", - "user_id": "fakeuser", - "volume_metadata": [], - "volume_type": { - "name": "vol_type_name" - }, - "volume_type_id": "fakevoltype" - } + "volumeId": "%(uuid)s" } } diff --git a/nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.xml.tpl b/nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.xml.tpl index aa713311f..d75ae7ddd 100644 --- a/nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-volumes/snapshot-create-resp.xml.tpl @@ -1,2 +1,2 @@ <?xml version='1.0' encoding='UTF-8'?> -<snapshot status="available" displayDescription="%(description)s" displayName="%(snapshot_name)s" volumeId="{'instance_uuid': 'fakeuuid', 'status': 'fakestatus', 'user_id': 'fakeuser', 'name': 'vol name', 'display_name': 'displayname', 'availability_zone': 'fakeaz', 'created_at': datetime.datetime(1999, 1, 1, 1, 1, 1), 'attach_status': 'attached', 'display_description': 'displaydesc', 'host': 'fakehost', 'volume_type_id': 'fakevoltype', 'volume_metadata': [], 'volume_type': {'name': 'vol_type_name'}, 'snapshot_id': None, 'mountpoint': '/', 'project_id': 'fakeproject', 'id': u'521752a6-acf6-4b2d-bc7a-119f9148cd8c', 'size': 1}" id="100" createdAt="%(timestamp)s" size="100"/> +<snapshot status="available" displayDescription="%(description)s" displayName="%(snapshot_name)s" volumeId="521752a6-acf6-4b2d-bc7a-119f9148cd8c" id="100" createdAt="%(timestamp)s" size="100"/> |