diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-08-28 22:44:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-08-28 22:44:53 +0000 |
| commit | 3e4ef29cab65795eea40f06c0e85fc720d3fa76f (patch) | |
| tree | 8556855f1421e6e5727795806db6d778ce4031f7 /nova/tests/integrated/v3/api_samples | |
| parent | c2b5d454bf0135098800aeebe86bdb8240be38e1 (diff) | |
| parent | 0063d17d74111cb9732a17a81380b154ddce500b (diff) | |
| download | nova-3e4ef29cab65795eea40f06c0e85fc720d3fa76f.tar.gz | |
Merge "Change V3 access_ips extension into v2.1"
Diffstat (limited to 'nova/tests/integrated/v3/api_samples')
11 files changed, 22 insertions, 22 deletions
diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl index ed9c311145..901a42f229 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl @@ -1,7 +1,7 @@ { "server": { - "os-access-ips:access_ip_v4": "", - "os-access-ips:access_ip_v6": "", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl index 7f18b0677e..851af97c16 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl @@ -17,7 +17,7 @@ "name": "default" } ], - "os-access-ips:access_ip_v4": "", - "os-access-ips:access_ip_v6": "" + "accessIPv4": "", + "accessIPv6": "" } } diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl index ec50d2c8e8..f5e396607b 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl @@ -1,8 +1,8 @@ { "servers": [ { - "os-access-ips:access_ip_v4": "", - "os-access-ips:access_ip_v6": "", + "accessIPv4": "", + "accessIPv6": "", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl index bb115f6085..b77f2bad01 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl @@ -51,7 +51,7 @@ "tenant_id": "openstack", "updated": "%(isotime)s", "user_id": "fake", - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s" + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s" } } diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl index f1f7ed03c2..603363b409 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl @@ -1,7 +1,7 @@ { "rebuild" : { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "imageRef" : "%(glance_host)s/images/%(image_id)s", "name" : "new-server-test", "metadata" : { diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl index 9454f2be6d..9825b757a3 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl @@ -1,7 +1,7 @@ { "server": { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl index d99d2562aa..780f764cf5 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-req.json.tpl @@ -1,7 +1,7 @@ { "server" : { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "name" : "new-server-test", "imageRef" : "%(host)s/openstack/images/%(image_id)s", "flavorRef" : "%(host)s/openstack/flavors/1", diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl index 495b3188fa..fb0c23b504 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-post-resp.json.tpl @@ -1,7 +1,7 @@ { "server": { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "adminPass": "%(password)s", "id": "%(id)s", "links": [ diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl index 8a24a79dfa..d38d967042 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-req.json.tpl @@ -1,6 +1,6 @@ { "server": { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s" + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s" } } diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl index 7e4d0dd7aa..b64f39846a 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl @@ -1,7 +1,7 @@ { "server": { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl index 447fa00500..4820bf4907 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl @@ -1,8 +1,8 @@ { "servers": [ { - "os-access-ips:access_ip_v4": "%(access_ip_v4)s", - "os-access-ips:access_ip_v6": "%(access_ip_v6)s", + "accessIPv4": "%(access_ip_v4)s", + "accessIPv6": "%(access_ip_v6)s", "addresses": { "private": [ { |