diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-10 17:45:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-10 17:45:52 +0000 |
| commit | 6b8d5eec07307c54c2756a4d3428297880c156bc (patch) | |
| tree | d0016a1f08bee4e657b1462d50ce128c9dfeceaf | |
| parent | 9afd37d211ecebd227a11a09ed69ca85d21f68e0 (diff) | |
| parent | 9f51df64e36f7af04e96440940aab23174d1b7f2 (diff) | |
| download | nova-6b8d5eec07307c54c2756a4d3428297880c156bc.tar.gz nova-6b8d5eec07307c54c2756a4d3428297880c156bc.tar.xz nova-6b8d5eec07307c54c2756a4d3428297880c156bc.zip | |
Merge "Cleanup trailing whitespace in api samples."
8 files changed, 26 insertions, 26 deletions
diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl index 37487e49f..27c6faa4e 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl @@ -1,6 +1,6 @@ { "servers": [ - { + { "status": "ACTIVE", "updated": "%(timestamp)s", "user_id": "fake", diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl index 48df845f1..a060332d4 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl @@ -1,6 +1,6 @@ { "servers": [ - { + { "status": "ACTIVE", "updated": "%(timestamp)s", "OS-EXT-STS:task_state": null, diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.json.tpl index 4c018975e..18eda9b9a 100644 --- a/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.json.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.json.tpl @@ -1,5 +1,5 @@ { "reboot" : { - "type" : "%(type)s" + "type" : "%(type)s" } } diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl index 84f0b9896..bd42f88b2 100644 --- a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<rebuild +<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" name="%(name)s" imageRef="%(host)s/v1.1/32278/images/%(uuid)s" diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-details-resp.json.tpl b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-details-resp.json.tpl index 6d44692e1..07529dfc9 100644 --- a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-details-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-details-resp.json.tpl @@ -1,47 +1,47 @@ { "availabilityZoneInfo": [ { - "zoneName": "zone-1", + "zoneName": "zone-1", "zoneState": { "available": true - }, + }, "hosts": { "fake_host-1": { "nova-compute": { - "active": true, - "available": true, + "active": true, + "available": true, "updated_at": "2012-12-26T14:45:25.000000" } } } - }, + }, { - "zoneName": "internal", + "zoneName": "internal", "zoneState": { "available": true - }, + }, "hosts": { "fake_host-1": { "nova-sched": { - "active": true, - "available": true, + "active": true, + "available": true, "updated_at": "2012-12-26T14:45:25.000000" } - }, + }, "fake_host-2": { "nova-network": { - "active": true, - "available": false, + "active": true, + "available": false, "updated_at": "2012-12-26T14:45:24.000000" } } } - }, + }, { - "zoneName": "zone-2", + "zoneName": "zone-2", "zoneState": { "available": false - }, + }, "hosts": null } ] diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-get-resp.json.tpl index 381708aaf..c512d182f 100644 --- a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-get-resp.json.tpl @@ -1,17 +1,17 @@ { "availabilityZoneInfo": [ { - "zoneName": "zone-1", + "zoneName": "zone-1", "zoneState": { "available": true - }, + }, "hosts": null - }, + }, { - "zoneName": "zone-2", + "zoneName": "zone-2", "zoneState": { "available": false - }, + }, "hosts": null } ] diff --git a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl b/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl index 676859de9..426f07e98 100644 --- a/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl +++ b/nova/tests/integrated/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json.tpl @@ -1,5 +1,5 @@ { - "floating_ips_bulk_create" : + "floating_ips_bulk_create" : { "ip_range": "%(ip_range)s", "pool": "%(pool)s", diff --git a/nova/tests/integrated/api_samples/server-action-reboot.json.tpl b/nova/tests/integrated/api_samples/server-action-reboot.json.tpl index 4c018975e..18eda9b9a 100644 --- a/nova/tests/integrated/api_samples/server-action-reboot.json.tpl +++ b/nova/tests/integrated/api_samples/server-action-reboot.json.tpl @@ -1,5 +1,5 @@ { "reboot" : { - "type" : "%(type)s" + "type" : "%(type)s" } } |