You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2014/07/21 19:51:10 UTC
[1/6] JCLOUDS-554: Update Nova default API to v2
Repository: jclouds
Updated Branches:
refs/heads/master f17c876d8 -> 0d77d8c2b
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_details_devstack.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_details_devstack.json b/apis/openstack-nova/src/test/resources/server_details_devstack.json
index e41095f..28c0d17 100644
--- a/apis/openstack-nova/src/test/resources/server_details_devstack.json
+++ b/apis/openstack-nova/src/test/resources/server_details_devstack.json
@@ -1,44 +1,60 @@
-{"server": {
- "OS-EXT-STS:task_state": null,
- "addresses": {
- "private": [{"version": 4, "addr": "10.0.0.8"}]
- },
- "links":
- [
- {
- "href": "http://172.16.89.149:8774/v2/7f312675f9b84c97bff8f5054e181419/servers/141b775f-7ac1-45f0-9a95-146260f33a53", "rel": "self"
- },
- {
- "href": "http://172.16.89.149:8774/7f312675f9b84c97bff8f5054e181419/servers/141b775f-7ac1-45f0-9a95-146260f33a53", "rel": "bookmark"
- }
- ],
- "image": {
- "id": "8e6f5bc4-a210-45b2-841f-c510eae14300", "links": [
- {
- "href": "http://172.16.89.149:8774/7f312675f9b84c97bff8f5054e181419/images/8e6f5bc4-a210-45b2-841f-c510eae14300", "rel": "bookmark"
- }]
- },
- "OS-EXT-STS:vm_state": "paused",
- "OS-EXT-SRV-ATTR:instance_name": "instance-00000014",
- "flavor": {
- "id": "1",
- "links": [{"href": "http://172.16.89.149:8774/7f312675f9b84c97bff8f5054e181419/flavors/1", "rel": "bookmark"}]
- },
- "id": "141b775f-7ac1-45f0-9a95-146260f33a53",
- "user_id": "89c01b67395d4bea945f7f5bfd7f344a",
- "OS-DCF:diskConfig": "MANUAL",
- "accessIPv4": "",
- "accessIPv6": "",
- "OS-EXT-STS:power_state": 3,
- "config_drive": "",
- "status": "PAUSED",
- "updated": "2012-05-04T15:07:48Z",
- "hostId": "eab9a77d1c44b8833e4a3dc6d2d9d50de556e780a319f184d8c82d9b",
- "OS-EXT-SRV-ATTR:host": "ubuntu",
- "key_name": "",
- "OS-EXT-SRV-ATTR:hypervisor_hostname": null,
- "name": "test",
- "created": "2012-05-04T15:07:36Z",
- "tenant_id": "7f312675f9b84c97bff8f5054e181419",
- "metadata": {}
-}}
\ No newline at end of file
+{
+ "server": {
+ "OS-EXT-STS:task_state": null,
+ "addresses": {
+ "private": [
+ {
+ "version": 4,
+ "addr": "10.0.0.8"
+ }
+ ]
+ },
+ "links": [
+ {
+ "href": "http://172.16.89.149:8774/v2/7f312675f9b84c97bff8f5054e181419/servers/141b775f-7ac1-45f0-9a95-146260f33a53",
+ "rel": "self"
+ },
+ {
+ "href": "http://172.16.89.149:8774/7f312675f9b84c97bff8f5054e181419/servers/141b775f-7ac1-45f0-9a95-146260f33a53",
+ "rel": "bookmark"
+ }
+ ],
+ "image": {
+ "id": "8e6f5bc4-a210-45b2-841f-c510eae14300",
+ "links": [
+ {
+ "href": "http://172.16.89.149:8774/7f312675f9b84c97bff8f5054e181419/images/8e6f5bc4-a210-45b2-841f-c510eae14300",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "OS-EXT-STS:vm_state": "paused",
+ "OS-EXT-SRV-ATTR:instance_name": "instance-00000014",
+ "flavor": {
+ "id": "1",
+ "links": [
+ {
+ "href": "http://172.16.89.149:8774/7f312675f9b84c97bff8f5054e181419/flavors/1",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "141b775f-7ac1-45f0-9a95-146260f33a53",
+ "user_id": "89c01b67395d4bea945f7f5bfd7f344a",
+ "OS-DCF:diskConfig": "MANUAL",
+ "accessIPv4": "",
+ "accessIPv6": "",
+ "OS-EXT-STS:power_state": 3,
+ "config_drive": "",
+ "status": "PAUSED",
+ "updated": "2012-05-04T15:07:48Z",
+ "hostId": "eab9a77d1c44b8833e4a3dc6d2d9d50de556e780a319f184d8c82d9b",
+ "OS-EXT-SRV-ATTR:host": "ubuntu",
+ "key_name": "",
+ "OS-EXT-SRV-ATTR:hypervisor_hostname": null,
+ "name": "test",
+ "created": "2012-05-04T15:07:36Z",
+ "tenant_id": "7f312675f9b84c97bff8f5054e181419",
+ "metadata": {}
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_details_openstack.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_details_openstack.json b/apis/openstack-nova/src/test/resources/server_details_openstack.json
index 10b7a7d..7a7089c 100644
--- a/apis/openstack-nova/src/test/resources/server_details_openstack.json
+++ b/apis/openstack-nova/src/test/resources/server_details_openstack.json
@@ -5,26 +5,33 @@
"hostId": "881706597197955ac7cc4b353bc7ec884e13fa280de9cc82057796cb",
"user_id": "508151008",
"name": "mygroup-72c",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/servers/1459",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/servers/1459",
- "rel": "bookmark"
- }],
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/servers/1459",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/servers/1459",
+ "rel": "bookmark"
+ }
+ ],
"addresses": {
- "internet": [{
- "version": 4,
- "addr": "8.21.28.47"
- }]
+ "internet": [
+ {
+ "version": 4,
+ "addr": "8.21.28.47"
+ }
+ ]
},
"tenant_id": "37",
"image": {
"id": "14",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/37/images/14",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/14",
+ "rel": "bookmark"
+ }
+ ]
},
"created": "2012-03-23T01:30:26Z",
"uuid": "2443c9c7-9791-412e-ac09-a6d55ec25335",
@@ -34,13 +41,15 @@
"progress": 100,
"flavor": {
"id": "1",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/37/flavors/1",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/37/flavors/1",
+ "rel": "bookmark"
+ }
+ ]
},
"config_drive": "",
"id": 1459,
"metadata": {}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_details_without_image.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_details_without_image.json b/apis/openstack-nova/src/test/resources/server_details_without_image.json
index 036a5d1..bd4b9c8 100644
--- a/apis/openstack-nova/src/test/resources/server_details_without_image.json
+++ b/apis/openstack-nova/src/test/resources/server_details_without_image.json
@@ -63,11 +63,11 @@
"links": [
{
"rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6f006e54"
+ "href": "http://servers.api.openstack.org/v2/1234/servers/71752"
},
{
"rel": "bookmark",
- "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6f006e54"
+ "href": "http://servers.api.openstack.org/1234/servers/71752"
}
]
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_diagnostics.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_diagnostics.json b/apis/openstack-nova/src/test/resources/server_diagnostics.json
index d35988d..561f2fb 100644
--- a/apis/openstack-nova/src/test/resources/server_diagnostics.json
+++ b/apis/openstack-nova/src/test/resources/server_diagnostics.json
@@ -1,17 +1,17 @@
{
- "vnet0_tx_errors": 0,
- "vda_read": 77364736,
- "vda_write": 415446016,
- "vnet0_tx_packets": 9701,
- "vda_write_req": 47278,
- "cpu0_time": 143150000000,
- "vnet0_tx": 1691221,
- "vnet0_rx_drop": 0,
- "vda_errors": -1,
- "vnet0_rx_errors": 0,
- "memory": 524288,
- "vnet0_rx_packets": 11271,
- "vda_read_req": 9551,
- "vnet0_rx": 1805288,
+ "vnet0_tx_errors": 0,
+ "vda_read": 77364736,
+ "vda_write": 415446016,
+ "vnet0_tx_packets": 9701,
+ "vda_write_req": 47278,
+ "cpu0_time": 143150000000,
+ "vnet0_tx": 1691221,
+ "vnet0_rx_drop": 0,
+ "vda_errors": -1,
+ "vnet0_rx_errors": 0,
+ "memory": 524288,
+ "vnet0_rx_packets": 11271,
+ "vda_read_req": 9551,
+ "vnet0_rx": 1805288,
"vnet0_tx_drop": 0
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_list.json b/apis/openstack-nova/src/test/resources/server_list.json
index aa6cf0d..6cbc4c2 100644
--- a/apis/openstack-nova/src/test/resources/server_list.json
+++ b/apis/openstack-nova/src/test/resources/server_list.json
@@ -6,7 +6,7 @@
"links": [
{
"rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"
+ "href": "http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"
},
{
"rel": "bookmark",
@@ -20,7 +20,7 @@
"links": [
{
"rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f1f1350e5"
+ "href": "http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f1f1350e5"
},
{
"rel": "bookmark",
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_list_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_list_details.json b/apis/openstack-nova/src/test/resources/server_list_details.json
index 7624eaf..7d459db 100644
--- a/apis/openstack-nova/src/test/resources/server_list_details.json
+++ b/apis/openstack-nova/src/test/resources/server_list_details.json
@@ -1,79 +1,78 @@
{
"servers": [
- {
- "id": "71752",
- "tenant_id": "1234",
- "user_id": "5678",
- "name": "sample-server",
- "updated": "2010-10-10T12:00:00Z",
- "created": "2010-08-10T12:00:00Z",
- "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
- "accessIPv4" : "67.23.10.132",
- "accessIPv6" : "::babe:67.23.10.132",
- "status": "BUILD",
- "progress": 60,
- "image" : {
- "id": "52415800-8b69-11e0-9b19-734f6f006e54",
- "links": [
- {
- "rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
- },
- {
- "rel": "bookmark",
- "href": "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
- }
- ]
- },
- "flavor" : {
- "id": "52415800-8b69-11e0-9b19-734f216543fd",
- "links": [
- {
- "rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
- },
- {
- "rel": "bookmark",
- "href": "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
- }
- ]
- },
- "addresses": {
- "public" : [
- {
- "version": 4,
- "addr": "67.23.10.132"
- },
- {
- "version": 6,
- "addr": "::babe:67.23.10.132"
- },
- {
- "version": 4,
- "addr": "67.23.10.131"
- },
- {
- "version": 6,
- "addr": "::babe:4317:0A83"
- }
- ],
- "private" : [
- {
- "version": 4,
- "addr": "10.176.42.16"
- },
- {
- "version": 6,
- "addr": "::babe:10.176.42.16"
- }
- ]
- },
- "metadata": {
- "Server Label": "Web Head 1",
- "Image Version": "2.1"
- },
- "links": [
- ]
- }
+ {
+ "id": "71752",
+ "tenant_id": "1234",
+ "user_id": "5678",
+ "name": "sample-server",
+ "updated": "2010-10-10T12:00:00Z",
+ "created": "2010-08-10T12:00:00Z",
+ "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
+ "accessIPv4": "67.23.10.132",
+ "accessIPv6": "::babe:67.23.10.132",
+ "status": "BUILD",
+ "progress": 60,
+ "image": {
+ "id": "52415800-8b69-11e0-9b19-734f6f006e54",
+ "links": [
+ {
+ "rel": "self",
+ "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
+ },
+ {
+ "rel": "bookmark",
+ "href": "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
+ }
+ ]
+ },
+ "flavor": {
+ "id": "52415800-8b69-11e0-9b19-734f216543fd",
+ "links": [
+ {
+ "rel": "self",
+ "href": "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
+ },
+ {
+ "rel": "bookmark",
+ "href": "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
+ }
+ ]
+ },
+ "addresses": {
+ "public": [
+ {
+ "version": 4,
+ "addr": "67.23.10.132"
+ },
+ {
+ "version": 6,
+ "addr": "::babe:67.23.10.132"
+ },
+ {
+ "version": 4,
+ "addr": "67.23.10.131"
+ },
+ {
+ "version": 6,
+ "addr": "::babe:4317:0A83"
+ }
+ ],
+ "private": [
+ {
+ "version": 4,
+ "addr": "10.176.42.16"
+ },
+ {
+ "version": 6,
+ "addr": "::babe:10.176.42.16"
+ }
+ ]
+ },
+ "metadata": {
+ "Server Label": "Web Head 1",
+ "Image Version": "2.1"
+ },
+ "links": []
+ }
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_list_details_essex.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_list_details_essex.json b/apis/openstack-nova/src/test/resources/server_list_details_essex.json
index 9ca9445..a3fafa1 100644
--- a/apis/openstack-nova/src/test/resources/server_list_details_essex.json
+++ b/apis/openstack-nova/src/test/resources/server_list_details_essex.json
@@ -1,152 +1,188 @@
{
- "servers": [{
- "OS-EXT-STS:task_state": null,
- "addresses": {
- "Net TenantA Front-Middle": [{
- "version": 4,
- "addr": "172.16.11.5"
- }],
- "Public network": [{
- "version": 4,
- "addr": "172.16.1.13"
- }, {
- "version": 4,
- "addr": "10.193.112.119"
- }]
+ "servers": [
+ {
+ "OS-EXT-STS:task_state": null,
+ "addresses": {
+ "Net TenantA Front-Middle": [
+ {
+ "version": 4,
+ "addr": "172.16.11.5"
+ }
+ ],
+ "Public network": [
+ {
+ "version": 4,
+ "addr": "172.16.1.13"
+ },
+ {
+ "version": 4,
+ "addr": "10.193.112.119"
+ }
+ ]
+ },
+ "links": [
+ {
+ "href": "http://nova:8774/v2/8d10e6646d5d4585937395b04839a353/servers/0c80b392-db30-4736-ae02-4480090f1207",
+ "rel": "self"
+ },
+ {
+ "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/servers/0c80b392-db30-4736-ae02-4480090f1207",
+ "rel": "bookmark"
+ }
+ ],
+ "image": {
+ "id": "416af940-2d3c-4a7c-977c-a9030685ad5e",
+ "links": [
+ {
+ "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/images/416af940-2d3c-4a7c-977c-a9030685ad5e",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "OS-EXT-STS:vm_state": "active",
+ "flavor": {
+ "id": "1",
+ "links": [
+ {
+ "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/flavors/1",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "0c80b392-db30-4736-ae02-4480090f1207",
+ "user_id": "df13814f6c354d00a8acf66502836323",
+ "OS-DCF:diskConfig": "MANUAL",
+ "accessIPv4": "",
+ "accessIPv6": "",
+ "progress": 0,
+ "OS-EXT-STS:power_state": 1,
+ "config_drive": "",
+ "status": "ACTIVE",
+ "updated": "2012-04-12T11:21:33Z",
+ "hostId": "03d796ebb52b1b555e5f6d9262f7dbd52b3f7c181e3aa89b34ca5408",
+ "key_name": "",
+ "name": "VM proxy",
+ "created": "2012-04-12T11:21:23Z",
+ "tenant_id": "8d10e6646d5d4585937395b04839a353",
+ "metadata": {}
},
- "links": [{
- "href": "http://nova:8774/v1.1/8d10e6646d5d4585937395b04839a353/servers/0c80b392-db30-4736-ae02-4480090f1207",
- "rel": "self"
- }, {
- "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/servers/0c80b392-db30-4736-ae02-4480090f1207",
- "rel": "bookmark"
- }],
- "image": {
- "id": "416af940-2d3c-4a7c-977c-a9030685ad5e",
- "links": [{
- "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/images/416af940-2d3c-4a7c-977c-a9030685ad5e",
- "rel": "bookmark"
- }]
+ {
+ "OS-EXT-STS:task_state": null,
+ "addresses": {
+ "Net TenantA Front-Middle": [
+ {
+ "version": 4,
+ "addr": "172.16.11.4"
+ }
+ ],
+ "Net TenantA Middle-Back": [
+ {
+ "version": 4,
+ "addr": "172.16.12.5"
+ }
+ ]
+ },
+ "links": [
+ {
+ "href": "http://nova:8774/v2/8d10e6646d5d4585937395b04839a353/servers/b332b5cd-535e-4677-b68e-fc8badc13236",
+ "rel": "self"
+ },
+ {
+ "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/servers/b332b5cd-535e-4677-b68e-fc8badc13236",
+ "rel": "bookmark"
+ }
+ ],
+ "image": {
+ "id": "416af940-2d3c-4a7c-977c-a9030685ad5e",
+ "links": [
+ {
+ "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/images/416af940-2d3c-4a7c-977c-a9030685ad5e",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "OS-EXT-STS:vm_state": "active",
+ "flavor": {
+ "id": "1",
+ "links": [
+ {
+ "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/flavors/1",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "b332b5cd-535e-4677-b68e-fc8badc13236",
+ "user_id": "df13814f6c354d00a8acf66502836323",
+ "OS-DCF:diskConfig": "MANUAL",
+ "accessIPv4": "",
+ "accessIPv6": "",
+ "progress": 0,
+ "OS-EXT-STS:power_state": 1,
+ "config_drive": "",
+ "status": "ACTIVE",
+ "updated": "2012-04-12T11:18:58Z",
+ "hostId": "e5bbff80bebacfe1db63951e787b5341427060a602d33abfefb6a1bc",
+ "key_name": "",
+ "name": "VM blog",
+ "created": "2012-04-12T11:18:48Z",
+ "tenant_id": "8d10e6646d5d4585937395b04839a353",
+ "metadata": {}
},
- "OS-EXT-STS:vm_state": "active",
- "flavor": {
- "id": "1",
- "links": [{
- "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/flavors/1",
- "rel": "bookmark"
- }]
- },
- "id": "0c80b392-db30-4736-ae02-4480090f1207",
- "user_id": "df13814f6c354d00a8acf66502836323",
- "OS-DCF:diskConfig": "MANUAL",
- "accessIPv4": "",
- "accessIPv6": "",
- "progress": 0,
- "OS-EXT-STS:power_state": 1,
- "config_drive": "",
- "status": "ACTIVE",
- "updated": "2012-04-12T11:21:33Z",
- "hostId": "03d796ebb52b1b555e5f6d9262f7dbd52b3f7c181e3aa89b34ca5408",
- "key_name": "",
- "name": "VM proxy",
- "created": "2012-04-12T11:21:23Z",
- "tenant_id": "8d10e6646d5d4585937395b04839a353",
- "metadata": {}
- }, {
- "OS-EXT-STS:task_state": null,
- "addresses": {
- "Net TenantA Front-Middle": [{
- "version": 4,
- "addr": "172.16.11.4"
- }],
- "Net TenantA Middle-Back": [{
- "version": 4,
- "addr": "172.16.12.5"
- }]
- },
- "links": [{
- "href": "http://nova:8774/v1.1/8d10e6646d5d4585937395b04839a353/servers/b332b5cd-535e-4677-b68e-fc8badc13236",
- "rel": "self"
- }, {
- "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/servers/b332b5cd-535e-4677-b68e-fc8badc13236",
- "rel": "bookmark"
- }],
- "image": {
- "id": "416af940-2d3c-4a7c-977c-a9030685ad5e",
- "links": [{
- "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/images/416af940-2d3c-4a7c-977c-a9030685ad5e",
- "rel": "bookmark"
- }]
- },
- "OS-EXT-STS:vm_state": "active",
- "flavor": {
- "id": "1",
- "links": [{
- "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/flavors/1",
- "rel": "bookmark"
- }]
- },
- "id": "b332b5cd-535e-4677-b68e-fc8badc13236",
- "user_id": "df13814f6c354d00a8acf66502836323",
- "OS-DCF:diskConfig": "MANUAL",
- "accessIPv4": "",
- "accessIPv6": "",
- "progress": 0,
- "OS-EXT-STS:power_state": 1,
- "config_drive": "",
- "status": "ACTIVE",
- "updated": "2012-04-12T11:18:58Z",
- "hostId": "e5bbff80bebacfe1db63951e787b5341427060a602d33abfefb6a1bc",
- "key_name": "",
- "name": "VM blog",
- "created": "2012-04-12T11:18:48Z",
- "tenant_id": "8d10e6646d5d4585937395b04839a353",
- "metadata": {}
- }, {
- "OS-EXT-STS:task_state": null,
- "addresses": {
- "Net TenantA Middle-Back": [{
- "version": 4,
- "addr": "172.16.12.4"
- }]
- },
- "links": [{
- "href": "http://nova:8774/v1.1/8d10e6646d5d4585937395b04839a353/servers/f9d43436-4572-4c9b-9b74-5fa6890a2f21",
- "rel": "self"
- }, {
- "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/servers/f9d43436-4572-4c9b-9b74-5fa6890a2f21",
- "rel": "bookmark"
- }],
- "image": {
- "id": "416af940-2d3c-4a7c-977c-a9030685ad5e",
- "links": [{
- "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/images/416af940-2d3c-4a7c-977c-a9030685ad5e",
- "rel": "bookmark"
- }]
- },
- "OS-EXT-STS:vm_state": "active",
- "flavor": {
- "id": "1",
- "links": [{
- "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/flavors/1",
- "rel": "bookmark"
- }]
- },
- "id": "f9d43436-4572-4c9b-9b74-5fa6890a2f21",
- "user_id": "df13814f6c354d00a8acf66502836323",
- "OS-DCF:diskConfig": "MANUAL",
- "accessIPv4": "",
- "accessIPv6": "",
- "progress": 0,
- "OS-EXT-STS:power_state": 1,
- "config_drive": "",
- "status": "ACTIVE",
- "updated": "2012-04-12T11:15:09Z",
- "hostId": "03d796ebb52b1b555e5f6d9262f7dbd52b3f7c181e3aa89b34ca5408",
- "key_name": "",
- "name": "VM MySQL",
- "created": "2012-04-12T11:14:56Z",
- "tenant_id": "8d10e6646d5d4585937395b04839a353",
- "metadata": {}
- }]
-}
\ No newline at end of file
+ {
+ "OS-EXT-STS:task_state": null,
+ "addresses": {
+ "Net TenantA Middle-Back": [
+ {
+ "version": 4,
+ "addr": "172.16.12.4"
+ }
+ ]
+ },
+ "links": [
+ {
+ "href": "http://nova:8774/v2/8d10e6646d5d4585937395b04839a353/servers/f9d43436-4572-4c9b-9b74-5fa6890a2f21",
+ "rel": "self"
+ },
+ {
+ "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/servers/f9d43436-4572-4c9b-9b74-5fa6890a2f21",
+ "rel": "bookmark"
+ }
+ ],
+ "image": {
+ "id": "416af940-2d3c-4a7c-977c-a9030685ad5e",
+ "links": [
+ {
+ "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/images/416af940-2d3c-4a7c-977c-a9030685ad5e",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "OS-EXT-STS:vm_state": "active",
+ "flavor": {
+ "id": "1",
+ "links": [
+ {
+ "href": "http://nova:8774/8d10e6646d5d4585937395b04839a353/flavors/1",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "id": "f9d43436-4572-4c9b-9b74-5fa6890a2f21",
+ "user_id": "df13814f6c354d00a8acf66502836323",
+ "OS-DCF:diskConfig": "MANUAL",
+ "accessIPv4": "",
+ "accessIPv6": "",
+ "progress": 0,
+ "OS-EXT-STS:power_state": 1,
+ "config_drive": "",
+ "status": "ACTIVE",
+ "updated": "2012-04-12T11:15:09Z",
+ "hostId": "03d796ebb52b1b555e5f6d9262f7dbd52b3f7c181e3aa89b34ca5408",
+ "key_name": "",
+ "name": "VM MySQL",
+ "created": "2012-04-12T11:14:56Z",
+ "tenant_id": "8d10e6646d5d4585937395b04839a353",
+ "metadata": {}
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_public_ip_in_private.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_public_ip_in_private.json b/apis/openstack-nova/src/test/resources/server_public_ip_in_private.json
index 5a5b84e..4f42d48 100644
--- a/apis/openstack-nova/src/test/resources/server_public_ip_in_private.json
+++ b/apis/openstack-nova/src/test/resources/server_public_ip_in_private.json
@@ -5,29 +5,37 @@
"hostId": "cb0d9e5004bef8c21270a0b09f7624f4c387f3a523f3aaa4c5694a61",
"user_id": "54297837463082",
"name": "hpcloud-computes-38d",
- "links": [{
- "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/59662",
- "rel": "self"
- }, {
- "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/59662",
- "rel": "bookmark"
- }],
+ "links": [
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/59662",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/59662",
+ "rel": "bookmark"
+ }
+ ],
"addresses": {
- "private": [{
- "version": 4,
- "addr": "10.6.39.189"
- }, {
- "version": 4,
- "addr": "15.185.181.94"
- }]
+ "private": [
+ {
+ "version": 4,
+ "addr": "10.6.39.189"
+ },
+ {
+ "version": 4,
+ "addr": "15.185.181.94"
+ }
+ ]
},
"tenant_id": "37936628937291",
"image": {
"id": "229",
- "links": [{
- "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/229",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/229",
+ "rel": "bookmark"
+ }
+ ]
},
"created": "2012-03-22T22:11:19Z",
"uuid": "7aed8e05-1daf-476a-87b2-640e8f7dcafd",
@@ -37,10 +45,12 @@
"progress": 100,
"flavor": {
"id": "100",
- "links": [{
- "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
+ "rel": "bookmark"
+ }
+ ]
},
"config_drive": "",
"id": 59662,
@@ -48,4 +58,4 @@
"Name": "hpcloud-computes"
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_with_security_groups.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_with_security_groups.json b/apis/openstack-nova/src/test/resources/server_with_security_groups.json
index 16e03fe..879975f 100644
--- a/apis/openstack-nova/src/test/resources/server_with_security_groups.json
+++ b/apis/openstack-nova/src/test/resources/server_with_security_groups.json
@@ -1 +1,62 @@
-{"server": {"status": "ACTIVE", "updated": "2012-05-04T12:15:01Z", "hostId": "02c7c81e36024d2bfdb473cb762900138bc07777922479d3d4f8f690", "user_id": "1e8a56719e0d4ab4b7edb85c77f7290f", "name": "test", "links": [{"href": "http://172.16.89.148:8774/v2/4287930c796741aa898425f40832cb3c/servers/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb", "rel": "self"}, {"href": "http://172.16.89.148:8774/4287930c796741aa898425f40832cb3c/servers/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb", "rel": "bookmark"}], "created": "2012-05-04T12:14:57Z", "tenant_id": "4287930c796741aa898425f40832cb3c", "image": {"id": "ea17cc36-f7c9-40cd-b6bf-a952b74870f2", "links": [{"href": "http://172.16.89.148:8774/4287930c796741aa898425f40832cb3c/images/ea17cc36-f7c9-40cd-b6bf-a952b74870f2", "rel": "bookmark"}]}, "addresses": {"private": [{"version": 4, "addr": "10.0.0.8"}]}, "accessIPv4": "", "accessIPv6": "", "key_name": "", "progress": 0, "flavor": {"id": "1", "links": [{"href": "http://172.16.89.148:8774/4287930c796741aa898425f40832c
b3c/flavors/1", "rel": "bookmark"}]}, "config_drive": "", "id": "8d0a6ca5-8849-4b3d-b86e-f24c92490ebb", "security_groups": [{"name": "default"},{"name": "group1"}], "metadata": {}}}
\ No newline at end of file
+{
+ "server": {
+ "status": "ACTIVE",
+ "updated": "2012-05-04T12:15:01Z",
+ "hostId": "02c7c81e36024d2bfdb473cb762900138bc07777922479d3d4f8f690",
+ "user_id": "1e8a56719e0d4ab4b7edb85c77f7290f",
+ "name": "test",
+ "links": [
+ {
+ "href": "http://172.16.89.148:8774/v2/4287930c796741aa898425f40832cb3c/servers/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb",
+ "rel": "self"
+ },
+ {
+ "href": "http://172.16.89.148:8774/4287930c796741aa898425f40832cb3c/servers/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-05-04T12:14:57Z",
+ "tenant_id": "4287930c796741aa898425f40832cb3c",
+ "image": {
+ "id": "ea17cc36-f7c9-40cd-b6bf-a952b74870f2",
+ "links": [
+ {
+ "href": "http://172.16.89.148:8774/4287930c796741aa898425f40832cb3c/images/ea17cc36-f7c9-40cd-b6bf-a952b74870f2",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "addresses": {
+ "private": [
+ {
+ "version": 4,
+ "addr": "10.0.0.8"
+ }
+ ]
+ },
+ "accessIPv4": "",
+ "accessIPv6": "",
+ "key_name": "",
+ "progress": 0,
+ "flavor": {
+ "id": "1",
+ "links": [
+ {
+ "href": "http://172.16.89.148:8774/4287930c796741aa898425f40832cb3c/flavors/1",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "config_drive": "",
+ "id": "8d0a6ca5-8849-4b3d-b86e-f24c92490ebb",
+ "security_groups": [
+ {
+ "name": "default"
+ },
+ {
+ "name": "group1"
+ }
+ ],
+ "metadata": {}
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_with_security_groups_extension.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_with_security_groups_extension.json b/apis/openstack-nova/src/test/resources/server_with_security_groups_extension.json
index 7a3c4b2..b84259e 100644
--- a/apis/openstack-nova/src/test/resources/server_with_security_groups_extension.json
+++ b/apis/openstack-nova/src/test/resources/server_with_security_groups_extension.json
@@ -1 +1,59 @@
-{"server": {"status": "ACTIVE", "updated": "2012-05-04T12:15:01Z", "hostId": "02c7c81e36024d2bfdb473cb762900138bc07777922479d3d4f8f690", "user_id": "1e8a56719e0d4ab4b7edb85c77f7290f", "name": "test", "links": [{"href": "http://172.16.89.148:8774/v2/4287930c796741aa898425f40832cb3c/servers/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb", "rel": "self"}, {"href": "http://172.16.89.148:8774/4287930c796741aa898425f40832cb3c/servers/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb", "rel": "bookmark"}], "created": "2012-05-04T12:14:57Z", "tenant_id": "4287930c796741aa898425f40832cb3c", "image": {"id": "ea17cc36-f7c9-40cd-b6bf-a952b74870f2", "links": [{"href": "http://172.16.89.148:8774/4287930c796741aa898425f40832cb3c/images/ea17cc36-f7c9-40cd-b6bf-a952b74870f2", "rel": "bookmark"}]}, "addresses": {"private": [{"version": 4, "addr": "10.0.0.8"}]}, "accessIPv4": "", "accessIPv6": "", "key_name": "", "progress": 0, "flavor": {"id": "1", "links": [{"href": "http://172.16.89.148:8774/4287930c796741aa898425f40832c
b3c/flavors/1", "rel": "bookmark"}]}, "config_drive": "", "id": "8d0a6ca5-8849-4b3d-b86e-f24c92490ebb", "security_groups": [{"name": "name1"}], "metadata": {}}}
\ No newline at end of file
+{
+ "server": {
+ "status": "ACTIVE",
+ "updated": "2012-05-04T12:15:01Z",
+ "hostId": "02c7c81e36024d2bfdb473cb762900138bc07777922479d3d4f8f690",
+ "user_id": "1e8a56719e0d4ab4b7edb85c77f7290f",
+ "name": "test",
+ "links": [
+ {
+ "href": "http://172.16.89.148:8774/v2/4287930c796741aa898425f40832cb3c/servers/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb",
+ "rel": "self"
+ },
+ {
+ "href": "http://172.16.89.148:8774/4287930c796741aa898425f40832cb3c/servers/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-05-04T12:14:57Z",
+ "tenant_id": "4287930c796741aa898425f40832cb3c",
+ "image": {
+ "id": "ea17cc36-f7c9-40cd-b6bf-a952b74870f2",
+ "links": [
+ {
+ "href": "http://172.16.89.148:8774/4287930c796741aa898425f40832cb3c/images/ea17cc36-f7c9-40cd-b6bf-a952b74870f2",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "addresses": {
+ "private": [
+ {
+ "version": 4,
+ "addr": "10.0.0.8"
+ }
+ ]
+ },
+ "accessIPv4": "",
+ "accessIPv6": "",
+ "key_name": "",
+ "progress": 0,
+ "flavor": {
+ "id": "1",
+ "links": [
+ {
+ "href": "http://172.16.89.148:8774/4287930c796741aa898425f40832cb3c/flavors/1",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "config_drive": "",
+ "id": "8d0a6ca5-8849-4b3d-b86e-f24c92490ebb",
+ "security_groups": [
+ {
+ "name": "name1"
+ }
+ ],
+ "metadata": {}
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/simple_tenant_usage.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/simple_tenant_usage.json b/apis/openstack-nova/src/test/resources/simple_tenant_usage.json
index de07dc4..87ec78c 100644
--- a/apis/openstack-nova/src/test/resources/simple_tenant_usage.json
+++ b/apis/openstack-nova/src/test/resources/simple_tenant_usage.json
@@ -1 +1,39 @@
-{"tenant_usage": {"total_memory_mb_usage": 0.0014847999999999999, "total_vcpus_usage": 7.249999999999999e-07, "total_hours": 4.833333333333333e-07, "tenant_id": "f8535069c3fb404cb61c873b1a0b4921", "stop": "2012-04-18 13:32:07.255830", "server_usages": [{"hours": 2.4166666666666665e-07, "uptime": 91149, "local_gb": 50, "ended_at": null, "name": "test1", "tenant_id": "f8535069c3fb404cb61c873b1a0b4921", "vcpus": 2, "memory_mb": 4096, "state": "active", "flavor": "m1.medium", "started_at": "2012-04-17 12:12:58"}, {"hours": 2.4166666666666665e-07, "uptime": 84710, "local_gb": 30, "ended_at": null, "name": "mish_test", "tenant_id": "f8535069c3fb404cb61c873b1a0b4921", "vcpus": 1, "memory_mb": 2048, "state": "active", "flavor": "m1.small", "started_at": "2012-04-17 14:00:17"}], "start": "2012-04-18 13:32:07.255743", "total_local_gb_usage": 1.933333333333333e-05}}
\ No newline at end of file
+{
+ "tenant_usage": {
+ "total_memory_mb_usage": 0.0014847999999999999,
+ "total_vcpus_usage": 7.249999999999999e-7,
+ "total_hours": 4.833333333333333e-7,
+ "tenant_id": "f8535069c3fb404cb61c873b1a0b4921",
+ "stop": "2012-04-18 13:32:07.255830",
+ "server_usages": [
+ {
+ "hours": 2.4166666666666665e-7,
+ "uptime": 91149,
+ "local_gb": 50,
+ "ended_at": null,
+ "name": "test1",
+ "tenant_id": "f8535069c3fb404cb61c873b1a0b4921",
+ "vcpus": 2,
+ "memory_mb": 4096,
+ "state": "active",
+ "flavor": "m1.medium",
+ "started_at": "2012-04-17 12:12:58"
+ },
+ {
+ "hours": 2.4166666666666665e-7,
+ "uptime": 84710,
+ "local_gb": 30,
+ "ended_at": null,
+ "name": "mish_test",
+ "tenant_id": "f8535069c3fb404cb61c873b1a0b4921",
+ "vcpus": 1,
+ "memory_mb": 2048,
+ "state": "active",
+ "flavor": "m1.small",
+ "started_at": "2012-04-17 14:00:17"
+ }
+ ],
+ "start": "2012-04-18 13:32:07.255743",
+ "total_local_gb_usage": 0.00001933333333333333
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/simple_tenant_usages.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/simple_tenant_usages.json b/apis/openstack-nova/src/test/resources/simple_tenant_usages.json
index 6f3c0d7..c29f6b1 100644
--- a/apis/openstack-nova/src/test/resources/simple_tenant_usages.json
+++ b/apis/openstack-nova/src/test/resources/simple_tenant_usages.json
@@ -1 +1,13 @@
-{"tenant_usages": [{"total_memory_mb_usage": 0.0015018666666666667, "total_vcpus_usage": 7.333333333333333e-07, "start": "2012-04-18 12:18:39.702411", "tenant_id": "f8535069c3fb404cb61c873b1a0b4921", "stop": "2012-04-18 12:18:39.702499", "total_hours": 4.888888888888889e-07, "total_local_gb_usage": 1.9555555555555557e-05}]
\ No newline at end of file
+{
+ "tenant_usages": [
+ {
+ "total_memory_mb_usage": 0.0015018666666666667,
+ "total_vcpus_usage": 7.333333333333333e-7,
+ "start": "2012-04-18 12:18:39.702411",
+ "tenant_id": "f8535069c3fb404cb61c873b1a0b4921",
+ "stop": "2012-04-18 12:18:39.702499",
+ "total_hours": 4.888888888888889e-7,
+ "total_local_gb_usage": 0.000019555555555555557
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/snapshot_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/snapshot_details.json b/apis/openstack-nova/src/test/resources/snapshot_details.json
index 375127b..59b279b 100644
--- a/apis/openstack-nova/src/test/resources/snapshot_details.json
+++ b/apis/openstack-nova/src/test/resources/snapshot_details.json
@@ -1 +1,11 @@
-{"snapshot": {"status": "available", "displayDescription": "jclouds live test snapshot", "displayName": "jclouds-live-test", "volumeId": 9, "id": 7, "createdAt": "2012-04-24 13:34:42", "size": 1}}
\ No newline at end of file
+{
+ "snapshot": {
+ "status": "available",
+ "displayDescription": "jclouds live test snapshot",
+ "displayName": "jclouds-live-test",
+ "volumeId": 9,
+ "id": 7,
+ "createdAt": "2012-04-24 13:34:42",
+ "size": 1
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/snapshot_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/snapshot_list.json b/apis/openstack-nova/src/test/resources/snapshot_list.json
index 03980b1..2b14942 100644
--- a/apis/openstack-nova/src/test/resources/snapshot_list.json
+++ b/apis/openstack-nova/src/test/resources/snapshot_list.json
@@ -1 +1,13 @@
-{"snapshots": [{"status": "available", "displayDescription": "jclouds live test snapshot", "displayName": "jclouds-live-test", "volumeId": 9, "id": 7, "createdAt": "2012-04-24 13:34:42", "size": 1}]}
\ No newline at end of file
+{
+ "snapshots": [
+ {
+ "status": "available",
+ "displayDescription": "jclouds live test snapshot",
+ "displayName": "jclouds-live-test",
+ "volumeId": 9,
+ "id": 7,
+ "createdAt": "2012-04-24 13:34:42",
+ "size": 1
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/snapshot_list_detail.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/snapshot_list_detail.json b/apis/openstack-nova/src/test/resources/snapshot_list_detail.json
index 03980b1..2b14942 100644
--- a/apis/openstack-nova/src/test/resources/snapshot_list_detail.json
+++ b/apis/openstack-nova/src/test/resources/snapshot_list_detail.json
@@ -1 +1,13 @@
-{"snapshots": [{"status": "available", "displayDescription": "jclouds live test snapshot", "displayName": "jclouds-live-test", "volumeId": 9, "id": 7, "createdAt": "2012-04-24 13:34:42", "size": 1}]}
\ No newline at end of file
+{
+ "snapshots": [
+ {
+ "status": "available",
+ "displayDescription": "jclouds live test snapshot",
+ "displayName": "jclouds-live-test",
+ "volumeId": 9,
+ "id": 7,
+ "createdAt": "2012-04-24 13:34:42",
+ "size": 1
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/virtual_interfaces_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/virtual_interfaces_list.json b/apis/openstack-nova/src/test/resources/virtual_interfaces_list.json
index 7df0182..7430b6a 100644
--- a/apis/openstack-nova/src/test/resources/virtual_interfaces_list.json
+++ b/apis/openstack-nova/src/test/resources/virtual_interfaces_list.json
@@ -1 +1,8 @@
-{"virtual_interfaces": [{"id": "02315827-b05c-4668-9c05-75c68838074a", "mac_address": "fa:16:3e:09:71:34"}]}
\ No newline at end of file
+{
+ "virtual_interfaces": [
+ {
+ "id": "02315827-b05c-4668-9c05-75c68838074a",
+ "mac_address": "fa:16:3e:09:71:34"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/volume_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/volume_details.json b/apis/openstack-nova/src/test/resources/volume_details.json
index 8dd11dc..13f04c1 100644
--- a/apis/openstack-nova/src/test/resources/volume_details.json
+++ b/apis/openstack-nova/src/test/resources/volume_details.json
@@ -1 +1,22 @@
-{"volume": {"status": "in-use", "displayDescription": "This is a test volume", "availabilityZone": "nova", "displayName": "test", "attachments": [{"device": "/dev/vdc", "serverId": "b4785058-cb80-491b-baa3-e4ee6546450e", "id": 1, "volumeId": 1}], "volumeType": null, "snapshotId": null, "size": 1, "id": 1, "createdAt": "2012-04-23 12:16:45", "metadata": {}}}
\ No newline at end of file
+{
+ "volume": {
+ "status": "in-use",
+ "displayDescription": "This is a test volume",
+ "availabilityZone": "nova",
+ "displayName": "test",
+ "attachments": [
+ {
+ "device": "/dev/vdc",
+ "serverId": "b4785058-cb80-491b-baa3-e4ee6546450e",
+ "id": 1,
+ "volumeId": 1
+ }
+ ],
+ "volumeType": null,
+ "snapshotId": null,
+ "size": 1,
+ "id": 1,
+ "createdAt": "2012-04-23 12:16:45",
+ "metadata": {}
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/volume_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/volume_list.json b/apis/openstack-nova/src/test/resources/volume_list.json
index d2179e7..a62059b 100644
--- a/apis/openstack-nova/src/test/resources/volume_list.json
+++ b/apis/openstack-nova/src/test/resources/volume_list.json
@@ -1 +1,24 @@
-{"volumes": [{"status": "in-use", "displayDescription": "This is a test volume", "availabilityZone": "nova", "displayName": "test", "attachments": [{"device": "/dev/vdc", "serverId": "b4785058-cb80-491b-baa3-e4ee6546450e", "id": 1, "volumeId": 1}], "volumeType": null, "snapshotId": null, "size": 1, "id": 1, "createdAt": "2012-04-23 12:16:45", "metadata": {}}]}
\ No newline at end of file
+{
+ "volumes": [
+ {
+ "status": "in-use",
+ "displayDescription": "This is a test volume",
+ "availabilityZone": "nova",
+ "displayName": "test",
+ "attachments": [
+ {
+ "device": "/dev/vdc",
+ "serverId": "b4785058-cb80-491b-baa3-e4ee6546450e",
+ "id": 1,
+ "volumeId": 1
+ }
+ ],
+ "volumeType": null,
+ "snapshotId": null,
+ "size": 1,
+ "id": 1,
+ "createdAt": "2012-04-23 12:16:45",
+ "metadata": {}
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/volume_list_detail.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/volume_list_detail.json b/apis/openstack-nova/src/test/resources/volume_list_detail.json
index d2179e7..a62059b 100644
--- a/apis/openstack-nova/src/test/resources/volume_list_detail.json
+++ b/apis/openstack-nova/src/test/resources/volume_list_detail.json
@@ -1 +1,24 @@
-{"volumes": [{"status": "in-use", "displayDescription": "This is a test volume", "availabilityZone": "nova", "displayName": "test", "attachments": [{"device": "/dev/vdc", "serverId": "b4785058-cb80-491b-baa3-e4ee6546450e", "id": 1, "volumeId": 1}], "volumeType": null, "snapshotId": null, "size": 1, "id": 1, "createdAt": "2012-04-23 12:16:45", "metadata": {}}]}
\ No newline at end of file
+{
+ "volumes": [
+ {
+ "status": "in-use",
+ "displayDescription": "This is a test volume",
+ "availabilityZone": "nova",
+ "displayName": "test",
+ "attachments": [
+ {
+ "device": "/dev/vdc",
+ "serverId": "b4785058-cb80-491b-baa3-e4ee6546450e",
+ "id": 1,
+ "volumeId": 1
+ }
+ ],
+ "volumeType": null,
+ "snapshotId": null,
+ "size": 1,
+ "id": 1,
+ "createdAt": "2012-04-23 12:16:45",
+ "metadata": {}
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/volume_type.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/volume_type.json b/apis/openstack-nova/src/test/resources/volume_type.json
index 8739d09..2c92c8a 100644
--- a/apis/openstack-nova/src/test/resources/volume_type.json
+++ b/apis/openstack-nova/src/test/resources/volume_type.json
@@ -1,9 +1,14 @@
-{"volume_type": {
- "name": "jclouds-test-1",
- "deleted": false,
- "created_at": "2012-05-10 12:33:06",
- "updated_at": null,
- "extra_specs": {"test": "value1", "test1": "wibble"},
- "deleted_at": null,
- "id": 8
-}}
\ No newline at end of file
+{
+ "volume_type": {
+ "name": "jclouds-test-1",
+ "deleted": false,
+ "created_at": "2012-05-10 12:33:06",
+ "updated_at": null,
+ "extra_specs": {
+ "test": "value1",
+ "test1": "wibble"
+ },
+ "deleted_at": null,
+ "id": 8
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/volume_type_extra_specs.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/volume_type_extra_specs.json b/apis/openstack-nova/src/test/resources/volume_type_extra_specs.json
index 6e71d5d..8e0f1ff 100644
--- a/apis/openstack-nova/src/test/resources/volume_type_extra_specs.json
+++ b/apis/openstack-nova/src/test/resources/volume_type_extra_specs.json
@@ -1 +1,5 @@
-{"extra_specs": {"test": "value1"}}
\ No newline at end of file
+{
+ "extra_specs": {
+ "test": "value1"
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/volume_type_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/volume_type_list.json b/apis/openstack-nova/src/test/resources/volume_type_list.json
index 3e613a3..f950916 100644
--- a/apis/openstack-nova/src/test/resources/volume_type_list.json
+++ b/apis/openstack-nova/src/test/resources/volume_type_list.json
@@ -1 +1,16 @@
-{"volume_types": [{"name": "jclouds-test-1", "deleted": false, "created_at": "2012-05-10 12:33:06", "updated_at": null, "extra_specs": {"test": "value1", "test1": "wibble"}, "deleted_at": null, "id": 8}]}
\ No newline at end of file
+{
+ "volume_types": [
+ {
+ "name": "jclouds-test-1",
+ "deleted": false,
+ "created_at": "2012-05-10 12:33:06",
+ "updated_at": null,
+ "extra_specs": {
+ "test": "value1",
+ "test1": "wibble"
+ },
+ "deleted_at": null,
+ "id": 8
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/providers/hpcloud-compute/src/test/resources/access_hpcloud.json
----------------------------------------------------------------------
diff --git a/providers/hpcloud-compute/src/test/resources/access_hpcloud.json b/providers/hpcloud-compute/src/test/resources/access_hpcloud.json
index ad156f3..d44e7bb 100644
--- a/providers/hpcloud-compute/src/test/resources/access_hpcloud.json
+++ b/providers/hpcloud-compute/src/test/resources/access_hpcloud.json
@@ -1,340 +1,346 @@
-{"access": {
- "token": {
- "expires": "2014-05-07T08:38:39.421Z",
- "id": "HPAuth10_xxxx",
- "tenant": {
- "id": "123456789",
- "name": "test-project1"
- }
- },
- "user": {
- "id": "10951776012508",
- "name": "ccustine",
- "otherAttributes": {
- "domainStatus": "enabled",
- "domainStatusCode": "00"
+{
+ "access": {
+ "token": {
+ "expires": "2014-05-07T08:38:39.421Z",
+ "id": "HPAuth10_xxxx",
+ "tenant": {
+ "id": "123456789",
+ "name": "test-project1"
+ }
},
- "roles": [
- {
- "id": "00000000004004",
- "serviceId": "100",
- "name": "domainuser"
- },
- {
- "id": "00000000004016",
- "serviceId": "120",
- "name": "netadmin",
- "tenantId": "123456789"
- },
- {
- "id": "00000000004014",
- "serviceId": "150",
- "name": "cdn-admin",
- "tenantId": "123456789"
+ "user": {
+ "id": "10951776012508",
+ "name": "ccustine",
+ "otherAttributes": {
+ "domainStatus": "enabled",
+ "domainStatusCode": "00"
},
- {
- "id": "00000000004022",
- "serviceId": "110",
- "name": "Admin",
- "tenantId": "123456789"
- },
- {
- "id": "00000000004032",
- "serviceId": "160",
- "name": "mysql-user",
- "tenantId": "123456789"
- },
- {
- "id": "00000000004024",
- "serviceId": "140",
- "name": "user",
- "tenantId": "123456789"
- },
- {
- "id": "00000000004013",
- "serviceId": "130",
- "name": "block-admin",
- "tenantId": "123456789"
- },
- {
- "id": "00000000004025",
- "serviceId": "120",
- "name": "sysadmin",
- "tenantId": "123456789"
- },
- {
- "id": "91643347410087",
- "serviceId": "240",
- "name": "dns-admin",
- "tenantId": "123456789"
- },
- {
- "id": "00000000004003",
- "serviceId": "100",
- "name": "domainadmin"
- },
- {
- "id": "10419409370304",
- "serviceId": "170",
- "name": "net-admin",
- "tenantId": "123456789"
- }
- ]
- },
- "serviceCatalog": [
- {
- "name": "Usage Reporting",
- "type": "metering",
- "endpoints": [
+ "roles": [
{
- "publicURL": "",
- "region": "region-a.geo-1",
- "versionId": "2",
- "versionInfo": "https:\/\/region-a.geo-1.usage-reporting-internal.hpcloudsvc.com:8777",
- "versionList": "https:\/\/region-a.geo-1.usage-reporting-internal.hpcloudsvc.com:8777"
+ "id": "00000000004004",
+ "serviceId": "100",
+ "name": "domainuser"
},
{
- "publicURL": "",
- "region": "region-b.geo-1",
- "versionId": "2",
- "versionInfo": "https:\/\/region-b.geo-1.usage-reporting-internal.hpcloudsvc.com:8777",
- "versionList": "https:\/\/region-b.geo-1.usage-reporting-internal.hpcloudsvc.com:8777"
- }
- ]
- },
- {
- "name": "Networking",
- "type": "network",
- "endpoints": [
- {
- "tenantId": "123456789",
- "publicURL": "",
- "publicURL2": "",
- "region": "az-1.region-a.geo-1",
- "versionId": "",
- "versionInfo": "",
- "versionList": ""
+ "id": "00000000004016",
+ "serviceId": "120",
+ "name": "netadmin",
+ "tenantId": "123456789"
},
{
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-a.geo-1.network.hpcloudsvc.com",
- "publicURL2": "",
- "region": "region-a.geo-1",
- "versionId": "2.0",
- "versionInfo": "https:\/\/region-a.geo-1.network.hpcloudsvc.com",
- "versionList": "https:\/\/region-a.geo-1.network.hpcloudsvc.com"
+ "id": "00000000004014",
+ "serviceId": "150",
+ "name": "cdn-admin",
+ "tenantId": "123456789"
},
{
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-b.geo-1.network.hpcloudsvc.com",
- "publicURL2": "",
- "region": "region-b.geo-1",
- "versionId": "2.0",
- "versionInfo": "https:\/\/region-b.geo-1.network.hpcloudsvc.com",
- "versionList": "https:\/\/region-b.geo-1.network.hpcloudsvc.com"
- }
- ]
- },
- {
- "name": "Relational DB MySQL",
- "type": "database",
- "endpoints": [{
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-a.geo-1.database.hpcloudsvc.com\/v1.0\/123456789",
- "publicURL2": "",
- "region": "region-a.geo-1",
- "versionId": "v13.6",
- "versionInfo": "https:\/\/region-a.geo-1.database.hpcloudsvc.com\/v1.0",
- "versionList": "https:\/\/region-a.geo-1.database.hpcloudsvc.com"
- }]
- },
- {
- "name": "CDN",
- "type": "hpext:cdn",
- "endpoints": [
- {
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-a.geo-1.cdnmgmt.hpcloudsvc.com\/v1.0\/123456789",
- "region": "region-a.geo-1",
- "versionId": "1.0",
- "versionInfo": "https:\/\/region-a.geo-1.cdnmgmt.hpcloudsvc.com\/v1.0\/",
- "versionList": "https:\/\/region-a.geo-1.cdnmgmt.hpcloudsvc.com\/"
+ "id": "00000000004022",
+ "serviceId": "110",
+ "name": "Admin",
+ "tenantId": "123456789"
},
{
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-b.geo-1.cdnmgmt.hpcloudsvc.com\/v1.0\/123456789",
- "region": "region-b.geo-1",
- "versionId": "1.0",
- "versionInfo": "https:\/\/region-b.geo-1.cdnmgmt.hpcloudsvc.com\/v1.0\/",
- "versionList": "https:\/\/region-b.geo-1.cdnmgmt.hpcloudsvc.com\/"
- }
- ]
- },
- {
- "name": "Object Storage",
- "type": "object-store",
- "endpoints": [
- {
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-a.geo-1.objects.hpcloudsvc.com\/v1\/123456789",
- "region": "region-a.geo-1",
- "versionId": "1.0",
- "versionInfo": "https:\/\/region-a.geo-1.objects.hpcloudsvc.com\/v1.0\/",
- "versionList": "https:\/\/region-a.geo-1.objects.hpcloudsvc.com"
+ "id": "00000000004032",
+ "serviceId": "160",
+ "name": "mysql-user",
+ "tenantId": "123456789"
},
{
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-b.geo-1.objects.hpcloudsvc.com:443\/v1\/123456789",
- "region": "region-b.geo-1",
- "versionId": "1",
- "versionInfo": "https:\/\/region-b.geo-1.objects.hpcloudsvc.com:443\/v1\/",
- "versionList": "https:\/\/region-b.geo-1.objects.hpcloudsvc.com:443"
- }
- ]
- },
- {
- "name": "Identity",
- "type": "identity",
- "endpoints": [
- {
- "publicURL": "https:\/\/region-a.geo-1.identity.hpcloudsvc.com:35357\/v2.0\/",
- "region": "region-a.geo-1",
- "versionId": "2.0",
- "versionInfo": "https:\/\/region-a.geo-1.identity.hpcloudsvc.com:35357\/v2.0\/",
- "versionList": "https:\/\/region-a.geo-1.identity.hpcloudsvc.com:35357"
+ "id": "00000000004024",
+ "serviceId": "140",
+ "name": "user",
+ "tenantId": "123456789"
},
{
- "publicURL": "https:\/\/region-a.geo-1.identity.hpcloudsvc.com:35357\/v3\/",
- "region": "region-a.geo-1",
- "versionId": "3.0",
- "versionInfo": "https:\/\/region-a.geo-1.identity.hpcloudsvc.com:35357\/v3\/",
- "versionList": "https:\/\/region-a.geo-1.identity.hpcloudsvc.com:35357"
+ "id": "00000000004013",
+ "serviceId": "130",
+ "name": "block-admin",
+ "tenantId": "123456789"
},
{
- "publicURL": "https:\/\/region-b.geo-1.identity.hpcloudsvc.com:35357\/v2.0\/",
- "region": "region-b.geo-1",
- "versionId": "2.0",
- "versionInfo": "https:\/\/region-b.geo-1.identity.hpcloudsvc.com:35357\/v2.0\/",
- "versionList": "https:\/\/region-b.geo-1.identity.hpcloudsvc.com:35357"
+ "id": "00000000004025",
+ "serviceId": "120",
+ "name": "sysadmin",
+ "tenantId": "123456789"
},
{
- "publicURL": "https:\/\/region-b.geo-1.identity.hpcloudsvc.com:35357\/v3\/",
- "region": "region-b.geo-1",
- "versionId": "3.0",
- "versionInfo": "https:\/\/region-b.geo-1.identity.hpcloudsvc.com:35357\/v3\/",
- "versionList": "https:\/\/region-b.geo-1.identity.hpcloudsvc.com:35357"
- }
- ]
- },
- {
- "name": "Image Management",
- "type": "image",
- "endpoints": [
- {
- "tenantId": "123456789",
- "publicURL": "https:\/\/glance1.uswest.hpcloud.net:9292\/v1.0",
- "publicURL2": "",
- "region": "az-1.region-a.geo-1",
- "versionId": "1.0",
- "versionInfo": "https:\/\/glance1.uswest.hpcloud.net:9292\/v1.0\/",
- "versionList": "https:\/\/glance1.uswest.hpcloud.net:9292"
- },
- {
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-a.geo-1.images.hpcloudsvc.com:443\/v1.0",
- "publicURL2": "",
- "region": "region-a.geo-1",
- "versionId": "1.0",
- "versionInfo": "https:\/\/region-a.geo-1.images.hpcloudsvc.com:443\/v1.0",
- "versionList": "https:\/\/region-a.geo-1.images.hpcloudsvc.com:443"
- },
- {
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-b.geo-1.images.hpcloudsvc.com:443\/v1.0",
- "publicURL2": "",
- "region": "region-b.geo-1",
- "versionId": "1.0",
- "versionInfo": "https:\/\/region-b.geo-1.images.hpcloudsvc.com:443\/v1.0",
- "versionList": "https:\/\/region-b.geo-1.images.hpcloudsvc.com:443"
- }
- ]
- },
- {
- "name": "DNS",
- "type": "hpext:dns",
- "endpoints": [{
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-a.geo-1.dns.hpcloudsvc.com\/v1\/",
- "publicURL2": "",
- "region": "region-a.geo-1",
- "versionId": "1",
- "versionInfo": "https:\/\/region-a.geo-1.dns.hpcloudsvc.com\/v1\/",
- "versionList": "https:\/\/region-a.geo-1.dns.hpcloudsvc.com\/"
- }]
- },
- {
- "name": "Block Storage",
- "type": "volume",
- "endpoints": [
- {
- "tenantId": "123456789",
- "publicURL": "https:\/\/az-1.region-a.geo-1.compute.hpcloudsvc.com\/v1.1\/123456789",
- "publicURL2": "",
- "region": "az-1.region-a.geo-1",
- "versionId": "1.1",
- "versionInfo": "https:\/\/az-1.region-a.geo-1.compute.hpcloudsvc.com\/v1.1\/",
- "versionList": "https:\/\/az-1.region-a.geo-1.compute.hpcloudsvc.com"
+ "id": "91643347410087",
+ "serviceId": "240",
+ "name": "dns-admin",
+ "tenantId": "123456789"
},
{
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-a.geo-1.block.hpcloudsvc.com\/v1\/123456789",
- "publicURL2": "",
- "region": "region-a.geo-1",
- "versionId": "1.0",
- "versionInfo": "https:\/\/region-a.geo-1.block.hpcloudsvc.com\/v1",
- "versionList": "https:\/\/region-a.geo-1.block.hpcloudsvc.com"
+ "id": "00000000004003",
+ "serviceId": "100",
+ "name": "domainadmin"
},
{
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-b.geo-1.block.hpcloudsvc.com\/v1\/123456789",
- "publicURL2": "",
- "region": "region-b.geo-1",
- "versionId": "1.0",
- "versionInfo": "https:\/\/region-b.geo-1.block.hpcloudsvc.com\/v1",
- "versionList": "https:\/\/region-b.geo-1.block.hpcloudsvc.com"
+ "id": "10419409370304",
+ "serviceId": "170",
+ "name": "net-admin",
+ "tenantId": "123456789"
}
]
},
- {
- "name": "Compute",
- "type": "compute",
- "endpoints": [
- {
- "tenantId": "123456789",
- "publicURL": "https:\/\/az-1.region-a.geo-1.compute.hpcloudsvc.com\/v1.1\/123456789",
- "publicURL2": "https:\/\/az-1.region-a.geo-1.ec2-compute.hpcloudsvc.com\/services\/Cloud",
- "region": "az-1.region-a.geo-1",
- "versionId": "1.1",
- "versionInfo": "https:\/\/az-1.region-a.geo-1.compute.hpcloudsvc.com\/v1.1\/",
- "versionList": "https:\/\/az-1.region-a.geo-1.compute.hpcloudsvc.com"
- },
- {
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-a.geo-1.compute.hpcloudsvc.com\/v2\/123456789",
- "region": "region-a.geo-1",
- "versionId": "2",
- "versionInfo": "https:\/\/region-a.geo-1.compute.hpcloudsvc.com\/v2\/",
- "versionList": "https:\/\/region-a.geo-1.compute.hpcloudsvc.com"
- },
- {
- "tenantId": "123456789",
- "publicURL": "https:\/\/region-b.geo-1.compute.hpcloudsvc.com\/v2\/123456789",
- "region": "region-b.geo-1",
- "versionId": "2",
- "versionInfo": "https:\/\/region-b.geo-1.compute.hpcloudsvc.com\/v2\/",
- "versionList": "https:\/\/region-b.geo-1.compute.hpcloudsvc.com"
- }
- ]
- }
- ]
-}}
\ No newline at end of file
+ "serviceCatalog": [
+ {
+ "name": "Usage Reporting",
+ "type": "metering",
+ "endpoints": [
+ {
+ "publicURL": "",
+ "region": "region-a.geo-1",
+ "versionId": "2",
+ "versionInfo": "https://region-a.geo-1.usage-reporting-internal.hpcloudsvc.com:8777",
+ "versionList": "https://region-a.geo-1.usage-reporting-internal.hpcloudsvc.com:8777"
+ },
+ {
+ "publicURL": "",
+ "region": "region-b.geo-1",
+ "versionId": "2",
+ "versionInfo": "https://region-b.geo-1.usage-reporting-internal.hpcloudsvc.com:8777",
+ "versionList": "https://region-b.geo-1.usage-reporting-internal.hpcloudsvc.com:8777"
+ }
+ ]
+ },
+ {
+ "name": "Networking",
+ "type": "network",
+ "endpoints": [
+ {
+ "tenantId": "123456789",
+ "publicURL": "",
+ "publicURL2": "",
+ "region": "az-1.region-a.geo-1",
+ "versionId": "",
+ "versionInfo": "",
+ "versionList": ""
+ },
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-a.geo-1.network.hpcloudsvc.com",
+ "publicURL2": "",
+ "region": "region-a.geo-1",
+ "versionId": "2.0",
+ "versionInfo": "https://region-a.geo-1.network.hpcloudsvc.com",
+ "versionList": "https://region-a.geo-1.network.hpcloudsvc.com"
+ },
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-b.geo-1.network.hpcloudsvc.com",
+ "publicURL2": "",
+ "region": "region-b.geo-1",
+ "versionId": "2.0",
+ "versionInfo": "https://region-b.geo-1.network.hpcloudsvc.com",
+ "versionList": "https://region-b.geo-1.network.hpcloudsvc.com"
+ }
+ ]
+ },
+ {
+ "name": "Relational DB MySQL",
+ "type": "database",
+ "endpoints": [
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-a.geo-1.database.hpcloudsvc.com/v1.0/123456789",
+ "publicURL2": "",
+ "region": "region-a.geo-1",
+ "versionId": "v13.6",
+ "versionInfo": "https://region-a.geo-1.database.hpcloudsvc.com/v1.0",
+ "versionList": "https://region-a.geo-1.database.hpcloudsvc.com"
+ }
+ ]
+ },
+ {
+ "name": "CDN",
+ "type": "hpext:cdn",
+ "endpoints": [
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-a.geo-1.cdnmgmt.hpcloudsvc.com/v1.0/123456789",
+ "region": "region-a.geo-1",
+ "versionId": "1.0",
+ "versionInfo": "https://region-a.geo-1.cdnmgmt.hpcloudsvc.com/v1.0/",
+ "versionList": "https://region-a.geo-1.cdnmgmt.hpcloudsvc.com/"
+ },
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-b.geo-1.cdnmgmt.hpcloudsvc.com/v1.0/123456789",
+ "region": "region-b.geo-1",
+ "versionId": "1.0",
+ "versionInfo": "https://region-b.geo-1.cdnmgmt.hpcloudsvc.com/v1.0/",
+ "versionList": "https://region-b.geo-1.cdnmgmt.hpcloudsvc.com/"
+ }
+ ]
+ },
+ {
+ "name": "Object Storage",
+ "type": "object-store",
+ "endpoints": [
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-a.geo-1.objects.hpcloudsvc.com/v1/123456789",
+ "region": "region-a.geo-1",
+ "versionId": "1.0",
+ "versionInfo": "https://region-a.geo-1.objects.hpcloudsvc.com/v1.0/",
+ "versionList": "https://region-a.geo-1.objects.hpcloudsvc.com"
+ },
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-b.geo-1.objects.hpcloudsvc.com:443/v1/123456789",
+ "region": "region-b.geo-1",
+ "versionId": "1",
+ "versionInfo": "https://region-b.geo-1.objects.hpcloudsvc.com:443/v1/",
+ "versionList": "https://region-b.geo-1.objects.hpcloudsvc.com:443"
+ }
+ ]
+ },
+ {
+ "name": "Identity",
+ "type": "identity",
+ "endpoints": [
+ {
+ "publicURL": "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/",
+ "region": "region-a.geo-1",
+ "versionId": "2.0",
+ "versionInfo": "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/",
+ "versionList": "https://region-a.geo-1.identity.hpcloudsvc.com:35357"
+ },
+ {
+ "publicURL": "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v3/",
+ "region": "region-a.geo-1",
+ "versionId": "3.0",
+ "versionInfo": "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v3/",
+ "versionList": "https://region-a.geo-1.identity.hpcloudsvc.com:35357"
+ },
+ {
+ "publicURL": "https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/",
+ "region": "region-b.geo-1",
+ "versionId": "2.0",
+ "versionInfo": "https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/",
+ "versionList": "https://region-b.geo-1.identity.hpcloudsvc.com:35357"
+ },
+ {
+ "publicURL": "https://region-b.geo-1.identity.hpcloudsvc.com:35357/v3/",
+ "region": "region-b.geo-1",
+ "versionId": "3.0",
+ "versionInfo": "https://region-b.geo-1.identity.hpcloudsvc.com:35357/v3/",
+ "versionList": "https://region-b.geo-1.identity.hpcloudsvc.com:35357"
+ }
+ ]
+ },
+ {
+ "name": "Image Management",
+ "type": "image",
+ "endpoints": [
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://glance1.uswest.hpcloud.net:9292/v1.0",
+ "publicURL2": "",
+ "region": "az-1.region-a.geo-1",
+ "versionId": "1.0",
+ "versionInfo": "https://glance1.uswest.hpcloud.net:9292/v1.0/",
+ "versionList": "https://glance1.uswest.hpcloud.net:9292"
+ },
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-a.geo-1.images.hpcloudsvc.com:443/v1.0",
+ "publicURL2": "",
+ "region": "region-a.geo-1",
+ "versionId": "1.0",
+ "versionInfo": "https://region-a.geo-1.images.hpcloudsvc.com:443/v1.0",
+ "versionList": "https://region-a.geo-1.images.hpcloudsvc.com:443"
+ },
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-b.geo-1.images.hpcloudsvc.com:443/v1.0",
+ "publicURL2": "",
+ "region": "region-b.geo-1",
+ "versionId": "1.0",
+ "versionInfo": "https://region-b.geo-1.images.hpcloudsvc.com:443/v1.0",
+ "versionList": "https://region-b.geo-1.images.hpcloudsvc.com:443"
+ }
+ ]
+ },
+ {
+ "name": "DNS",
+ "type": "hpext:dns",
+ "endpoints": [
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-a.geo-1.dns.hpcloudsvc.com/v1/",
+ "publicURL2": "",
+ "region": "region-a.geo-1",
+ "versionId": "1",
+ "versionInfo": "https://region-a.geo-1.dns.hpcloudsvc.com/v1/",
+ "versionList": "https://region-a.geo-1.dns.hpcloudsvc.com/"
+ }
+ ]
+ },
+ {
+ "name": "Block Storage",
+ "type": "volume",
+ "endpoints": [
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/123456789",
+ "publicURL2": "",
+ "region": "az-1.region-a.geo-1",
+ "versionId": "1.1",
+ "versionInfo": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/",
+ "versionList": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com"
+ },
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-a.geo-1.block.hpcloudsvc.com/v1/123456789",
+ "publicURL2": "",
+ "region": "region-a.geo-1",
+ "versionId": "1.0",
+ "versionInfo": "https://region-a.geo-1.block.hpcloudsvc.com/v1",
+ "versionList": "https://region-a.geo-1.block.hpcloudsvc.com"
+ },
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-b.geo-1.block.hpcloudsvc.com/v1/123456789",
+ "publicURL2": "",
+ "region": "region-b.geo-1",
+ "versionId": "1.0",
+ "versionInfo": "https://region-b.geo-1.block.hpcloudsvc.com/v1",
+ "versionList": "https://region-b.geo-1.block.hpcloudsvc.com"
+ }
+ ]
+ },
+ {
+ "name": "Compute",
+ "type": "compute",
+ "endpoints": [
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/123456789",
+ "publicURL2": "https://az-1.region-a.geo-1.ec2-compute.hpcloudsvc.com/services/Cloud",
+ "region": "az-1.region-a.geo-1",
+ "versionId": "1.1",
+ "versionInfo": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/",
+ "versionList": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com"
+ },
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-a.geo-1.compute.hpcloudsvc.com/v2/123456789",
+ "region": "region-a.geo-1",
+ "versionId": "2",
+ "versionInfo": "https://region-a.geo-1.compute.hpcloudsvc.com/v2/",
+ "versionList": "https://region-a.geo-1.compute.hpcloudsvc.com"
+ },
+ {
+ "tenantId": "123456789",
+ "publicURL": "https://region-b.geo-1.compute.hpcloudsvc.com/v2/123456789",
+ "region": "region-b.geo-1",
+ "versionId": "2",
+ "versionInfo": "https://region-b.geo-1.compute.hpcloudsvc.com/v2/",
+ "versionList": "https://region-b.geo-1.compute.hpcloudsvc.com"
+ }
+ ]
+ }
+ ]
+ }
+}
[6/6] git commit: JCLOUDS-554: Update Nova default API to v2
Posted by jd...@apache.org.
JCLOUDS-554: Update Nova default API to v2
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0d77d8c2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0d77d8c2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0d77d8c2
Branch: refs/heads/master
Commit: 0d77d8c2b11197146d4970ee4407e99dc1c9ec40
Parents: f17c876
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Mon Jun 2 09:10:21 2014 -0700
Committer: Jeremy Daggett <jd...@apache.org>
Committed: Mon Jul 21 10:50:46 2014 -0700
----------------------------------------------------------------------
.../keystone/v2_0/internal/KeystoneFixture.java | 27 +-
.../keystone/v2_0/parse/ParseAccessTest.java | 18 +-
...nIdToURIFromAccessForTypeAndVersionTest.java | 16 +-
...AdminURIFromAccessForTypeAndVersionTest.java | 2 +-
...nIdToURIFromAccessForTypeAndVersionTest.java | 8 +-
...eIdToURIFromAccessForTypeAndVersionTest.java | 8 +-
.../test/resources/keystoneAuthResponse.json | 20 +-
.../keystoneAuthResponse_openstack.json | 6 +-
.../openstack/nova/v2_0/NovaApiMetadata.java | 2 +-
...tKeyAndTenantIdAuthenticationExpectTest.java | 2 +-
...antNamePropertyAuthenticationExpectTest.java | 2 +-
...KeyAndSecretKeyAuthenticationExpectTest.java | 2 +-
.../v2_0/PasswordAuthenticationExpectTest.java | 2 +-
...dAuthenticationWithTenantNameExpectTest.java | 2 +-
.../NovaComputeServiceAdapterExpectTest.java | 20 +-
.../compute/NovaComputeServiceExpectTest.java | 28 +-
.../NovaImageExtensionExpectTest.java | 8 +-
.../NovaSecurityGroupExtensionExpectTest.java | 36 +-
...llocateAndAddFloatingIpToNodeExpectTest.java | 8 +-
.../ServerInZoneToNodeMetadataTest.java | 8 +-
.../extensions/AdminActionsApiExpectTest.java | 48 +-
.../AvailabilityZoneApiExpectTest.java | 2 +-
.../FlavorExtraSpecsApiExpectTest.java | 16 +-
.../extensions/FloatingIPApiExpectTest.java | 14 +-
.../HostAdministrationApiExpectTest.java | 26 +-
.../extensions/HostAggregateApiExpectTest.java | 22 +-
.../v2_0/extensions/KeyPairApiExpectTest.java | 14 +-
.../v2_0/extensions/QuotaApiExpectTest.java | 12 +-
.../extensions/SecurityGroupApiExpectTest.java | 18 +-
.../ServerWithSecurityGroupsApiExpectTest.java | 4 +-
.../SimpleTenantUsageApiExpectTest.java | 4 +-
.../VirtualInterfaceApiExpectTest.java | 4 +-
.../v2_0/extensions/VolumeApiExpectTest.java | 56 +-
.../VolumeAttachmentApiExpectTest.java | 16 +-
.../extensions/VolumeTypeApiExpectTest.java | 32 +-
.../v2_0/features/ExtensionApiExpectTest.java | 8 +-
.../nova/v2_0/features/FlavorApiExpectTest.java | 12 +-
.../nova/v2_0/features/ImageApiExpectTest.java | 30 +-
.../nova/v2_0/features/ServerApiExpectTest.java | 66 +-
.../CreateSecurityGroupIfNeededTest.java | 10 +-
...ityGroupWithNameAndReturnTrueExpectTest.java | 4 +-
.../v2_0/handlers/NovaErrorHandlerTest.java | 6 +-
...BaseNovaComputeServiceContextExpectTest.java | 16 +-
.../nova/v2_0/internal/BaseNovaExpectTest.java | 2 +-
.../nova/v2_0/parse/ParseCreateFlavorTest.java | 32 +-
.../nova/v2_0/parse/ParseCreatedServerTest.java | 4 +-
.../nova/v2_0/parse/ParseFlavorListTest.java | 4 +-
.../nova/v2_0/parse/ParseFlavorTest.java | 2 +-
.../nova/v2_0/parse/ParseImageListTest.java | 4 +-
.../nova/v2_0/parse/ParseImageTest.java | 4 +-
.../v2_0/parse/ParseServerDetailsEssexTest.java | 6 +-
.../nova/v2_0/parse/ParseServerListTest.java | 4 +-
.../nova/v2_0/parse/ParseServerTest.java | 8 +-
.../ParseServerWithInternetAddressesTest.java | 2 +-
.../v2_0/parse/ParseServerWithoutImageTest.java | 4 +-
...ublicIpsInPrivateAddressBlockExpectTest.java | 2 +-
.../src/test/resources/access.json | 208 +++---
.../src/test/resources/attachment_details.json | 9 +-
.../src/test/resources/attachment_list.json | 11 +-
.../src/test/resources/extension_details.json | 28 +-
.../src/test/resources/extension_list.json | 2 +-
.../src/test/resources/extension_list_full.json | 563 ++++++++--------
.../test/resources/extension_list_normal.json | 65 +-
.../resources/extension_list_openstack.json | 253 ++++----
.../src/test/resources/flavor_details.json | 22 +-
.../src/test/resources/flavor_list.json | 6 +-
.../src/test/resources/flavor_list_detail.json | 125 +++-
.../resources/flavor_list_detail_openstack.json | 185 +++---
.../src/test/resources/flavor_new.json | 14 +-
.../src/test/resources/floatingip_list.json | 4 +-
.../openstack-nova/src/test/resources/host.json | 41 +-
.../test/resources/host_aggregate_details.json | 18 +-
.../src/test/resources/host_aggregate_list.json | 20 +-
.../host_aggregate_with_host_details.json | 20 +-
.../src/test/resources/hosts_list.json | 9 +-
.../src/test/resources/image_active.json | 42 +-
.../src/test/resources/image_details.json | 42 +-
.../src/test/resources/image_list.json | 20 +-
.../src/test/resources/image_list_detail.json | 504 ++++++++++++++-
.../image_list_detail_imageextension.json | 263 ++++----
.../resources/image_list_detail_openstack.json | 175 ++---
.../keypair_created_computeservice.json | 2 +-
.../src/test/resources/keypair_details.json | 2 +-
.../src/test/resources/keypair_list.json | 2 +-
.../src/test/resources/metadata_item.json | 4 +-
.../src/test/resources/metadata_list.json | 4 +-
.../src/test/resources/metadata_updated.json | 4 +-
.../src/test/resources/new_server.json | 39 +-
.../resources/new_server_disk_config_auto.json | 39 +-
.../new_server_disk_config_manual.json | 39 +-
.../src/test/resources/new_server_in_zone.json | 39 +-
.../resources/new_server_networks_response.json | 2 +-
.../test/resources/new_server_no_adminpass.json | 2 +-
.../src/test/resources/quotas.json | 32 +-
.../test/resources/securitygroup_created.json | 4 +-
.../test/resources/securitygroup_details.json | 51 +-
...itygroup_details_computeservice_typical.json | 87 +--
.../securitygroup_details_extension.json | 51 +-
...securitygroup_details_extension_norules.json | 17 +-
.../resources/securitygroup_details_port22.json | 26 +-
.../src/test/resources/securitygroup_list.json | 90 ++-
...oup_list_details_computeservice_typical.json | 109 ++--
.../resources/securitygroup_list_extension.json | 90 ++-
.../resources/securitygrouprule_created.json | 5 +-
.../securitygrouprule_created_cidr.json | 2 +-
.../securitygrouprule_created_group.json | 2 +-
.../src/test/resources/server_details.json | 38 +-
.../test/resources/server_details_devstack.json | 104 +--
.../resources/server_details_openstack.json | 49 +-
.../resources/server_details_without_image.json | 4 +-
.../src/test/resources/server_diagnostics.json | 30 +-
.../src/test/resources/server_list.json | 4 +-
.../src/test/resources/server_list_details.json | 151 +++--
.../resources/server_list_details_essex.json | 334 +++++-----
.../resources/server_public_ip_in_private.json | 56 +-
.../resources/server_with_security_groups.json | 63 +-
.../server_with_security_groups_extension.json | 60 +-
.../src/test/resources/simple_tenant_usage.json | 40 +-
.../test/resources/simple_tenant_usages.json | 14 +-
.../src/test/resources/snapshot_details.json | 12 +-
.../src/test/resources/snapshot_list.json | 14 +-
.../test/resources/snapshot_list_detail.json | 14 +-
.../test/resources/virtual_interfaces_list.json | 9 +-
.../src/test/resources/volume_details.json | 23 +-
.../src/test/resources/volume_list.json | 25 +-
.../src/test/resources/volume_list_detail.json | 25 +-
.../src/test/resources/volume_type.json | 23 +-
.../test/resources/volume_type_extra_specs.json | 6 +-
.../src/test/resources/volume_type_list.json | 17 +-
.../src/test/resources/access_hpcloud.json | 634 ++++++++++---------
130 files changed, 3562 insertions(+), 2323 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/KeystoneFixture.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/KeystoneFixture.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/KeystoneFixture.java
index 0d0d6d0..674f4db 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/KeystoneFixture.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/KeystoneFixture.java
@@ -37,9 +37,9 @@ public enum KeystoneFixture {
public String getTenantId() {
return "12346637803162";
}
-
+
public String getTenantName() {
- return "adrian@jclouds.org";
+ return "user@jclouds.apache.org";
}
public HttpRequest initialAuthWithUsernameAndPassword(String username, String password) {
@@ -52,7 +52,7 @@ public enum KeystoneFixture {
"{\"auth\":{\"passwordCredentials\":{\"username\":\"%s\",\"password\":\"%s\"}}}",
username, password), "application/json")).build();
}
-
+
public HttpRequest initialAuthWithUsernameAndPasswordAndTenantName(String username, String password) {
return HttpRequest.builder().method("POST")
.endpoint("http://localhost:5000/v2.0/tokens")
@@ -63,7 +63,7 @@ public enum KeystoneFixture {
"{\"auth\":{\"passwordCredentials\":{\"username\":\"%s\",\"password\":\"%s\"},\"tenantName\":\"%s\"}}",
username, password, getTenantName()), "application/json")).build();
}
-
+
public HttpRequest initialAuthWithAccessKeyAndSecretKeyAndTenantName(String accessKey, String secretKey) {
return HttpRequest.builder().method("POST")
.endpoint("http://localhost:5000/v2.0/tokens")
@@ -74,18 +74,17 @@ public enum KeystoneFixture {
"{\"auth\":{\"apiAccessKeyCredentials\":{\"accessKey\":\"%s\",\"secretKey\":\"%s\"},\"tenantName\":\"%s\"}}",
accessKey, secretKey, getTenantName()), "application/json")).build();
}
-
+
public HttpRequest initialAuthWithAccessKeyAndSecretKeyAndTenantId(String accessKey, String secretKey) {
return HttpRequest.builder().method("POST")
-
- .endpoint("http://localhost:5000/v2.0/tokens")
- .addHeader(HttpHeaders.ACCEPT, "application/json")
- .payload(
- payloadFromStringWithContentType(
- format(
- "{\"auth\":{\"apiAccessKeyCredentials\":{\"accessKey\":\"%s\",\"secretKey\":\"%s\"},\"tenantId\":\"%s\"}}",
- accessKey, secretKey, getTenantId()), "application/json")).build();
- }
+ .endpoint("http://localhost:5000/v2.0/tokens")
+ .addHeader(HttpHeaders.ACCEPT, "application/json")
+ .payload(
+ payloadFromStringWithContentType(
+ format(
+ "{\"auth\":{\"apiAccessKeyCredentials\":{\"accessKey\":\"%s\",\"secretKey\":\"%s\"},\"tenantId\":\"%s\"}}",
+ accessKey, secretKey, getTenantId()), "application/json")).build();
+ }
public String getAuthToken() {
return "Auth_4f173437e4b013bee56d1007";
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java
index bfb5d38..b4dba5c 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseAccessTest.java
@@ -87,24 +87,24 @@ public class ParseAccessTest extends BaseItemParserTest<Access> {
.service(Service.builder().name("Compute").type(COMPUTE)
.endpoint(Endpoint.builder()
.tenantId("3456")
- .publicURL("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")
+ .publicURL("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")
.region("az-1.region-a.geo-1")
- .versionId("1.1")
- .versionInfo("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/")
+ .versionId("2")
+ .versionInfo("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/")
.versionList("https://az-1.region-a.geo-1.compute.hpcloudsvc.com").build())
.endpoint(Endpoint.builder()
.tenantId("3456")
- .publicURL("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")
+ .publicURL("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")
.region("az-2.region-a.geo-1")
- .versionId("1.1")
- .versionInfo("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/")
+ .versionId("2")
+ .versionInfo("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/")
.versionList("https://az-2.region-a.geo-1.compute.hpcloudsvc.com").build())
.endpoint(Endpoint.builder()
.tenantId("3456")
- .publicURL("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")
+ .publicURL("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")
.region("az-3.region-a.geo-1")
- .versionId("1.1")
- .versionInfo("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/")
+ .versionId("2")
+ .versionInfo("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/")
.versionList("https://az-3.region-a.geo-1.compute.hpcloudsvc.com").build()).build())
.service(Service.builder().name("Neutron Service").type(NETWORK)
.endpoint(Endpoint.builder()
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java
index 4db8110..f530329 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersionTest.java
@@ -67,19 +67,19 @@ public class LocationIdToURIFromAccessForTypeAndVersionTest {
}).getInstance(LocationIdToURIFromAccessForTypeAndVersion.Factory.class);
public void testRegionUnmatchesOkWhenNoVersionIdSet() {
- assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "1.1").get(), Suppliers
+ assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "2").get(), Suppliers
.<URI> supplierFunction()), ImmutableMap.of("az-1.region-a.geo-1", URI
- .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-2.region-a.geo-1", URI
- .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-3.region-a.geo-1", URI
- .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")));
+ .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-2.region-a.geo-1", URI
+ .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-3.region-a.geo-1", URI
+ .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")));
}
public void testRegionMatches() {
- assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "1.1").get(), Suppliers
+ assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "2").get(), Suppliers
.<URI> supplierFunction()), ImmutableMap.of("az-1.region-a.geo-1", URI
- .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-2.region-a.geo-1", URI
- .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-3.region-a.geo-1", URI
- .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")));
+ .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-2.region-a.geo-1", URI
+ .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-3.region-a.geo-1", URI
+ .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")));
}
private final LocationIdToURIFromAccessForTypeAndVersion.Factory raxFactory = Guice.createInjector(new AbstractModule() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java
index 3db29d6..91ebb61 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersionTest.java
@@ -67,7 +67,7 @@ public class RegionIdToAdminURIFromAccessForTypeAndVersionTest {
map.put("region-a.geo-1", null);
map.put("region-b.geo-1", null);
map.put("region-c.geo-1", null);
- assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "1.1").get(), Suppliers
+ assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "2").get(), Suppliers
.<URI> supplierFunction()), map);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java
index 92bd4f3..68843a1 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersionTest.java
@@ -68,11 +68,11 @@ public class RegionIdToURIFromAccessForTypeAndVersionTest {
}
public void testRegionMatches() {
- assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "1.1").get(), Suppliers
+ assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "2").get(), Suppliers
.<URI> supplierFunction()), ImmutableMap.of("az-1.region-a.geo-1", URI
- .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-2.region-a.geo-1", URI
- .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"), "az-3.region-a.geo-1", URI
- .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")));
+ .create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-2.region-a.geo-1", URI
+ .create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"), "az-3.region-a.geo-1", URI
+ .create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")));
}
private final RegionIdToURISupplier.Factory raxFactory = Guice.createInjector(new AbstractModule() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java
index 9e1b191..a7eb893 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersionTest.java
@@ -68,10 +68,10 @@ public class ZoneIdToURIFromAccessForTypeAndVersionTest {
}
public void testZoneMatches() {
- assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "1.1").get(), Suppliers
- .<URI> supplierFunction()), ImmutableMap.of("az-1.region-a.geo-1", URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"),
- "az-2.region-a.geo-1", URI.create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456"),
- "az-3.region-a.geo-1", URI.create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456")));
+ assertEquals(Maps.transformValues(factory.createForApiTypeAndVersion("compute", "2").get(), Suppliers
+ .<URI> supplierFunction()), ImmutableMap.of("az-1.region-a.geo-1", URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"),
+ "az-2.region-a.geo-1", URI.create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456"),
+ "az-3.region-a.geo-1", URI.create("https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456")));
}
private final ZoneIdToURISupplier.Factory raxFactory = Guice.createInjector(new AbstractModule() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
index e20670f..eab46bd 100644
--- a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
+++ b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json
@@ -83,29 +83,29 @@
"endpoints": [
{
"tenantId": "3456",
- "publicURL": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456",
+ "publicURL": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456",
"publicURL2": "https://az-1.region-a.geo-1.ec2-compute.hpcloudsvc.com/services/Cloud",
"region": "az-1.region-a.geo-1",
- "versionId": "1.1",
- "versionInfo": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/",
+ "versionId": "2",
+ "versionInfo": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/",
"versionList": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com"
},
{
"tenantId": "3456",
- "publicURL": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456",
+ "publicURL": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/3456",
"publicURL2": "https://az-2.region-a.geo-1.ec2-compute.hpcloudsvc.com/services/Cloud",
"region": "az-2.region-a.geo-1",
- "versionId": "1.1",
- "versionInfo": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/",
+ "versionId": "2",
+ "versionInfo": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/",
"versionList": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com"
},
{
"tenantId": "3456",
- "publicURL": "https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456",
+ "publicURL": "https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/3456",
"publicURL2": "https://az-3.region-a.geo-1.ec2-compute.hpcloudsvc.com/services/Cloud",
"region": "az-3.region-a.geo-1",
- "versionId": "1.1",
- "versionInfo": "https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v1.1/",
+ "versionId": "2",
+ "versionInfo": "https://az-3.region-a.geo-1.compute.hpcloudsvc.com/v2/",
"versionList": "https://az-3.region-a.geo-1.compute.hpcloudsvc.com"
}
]
@@ -191,4 +191,4 @@
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json
index 214be22..f5fea55 100644
--- a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json
+++ b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json
@@ -12,10 +12,10 @@
{
"endpoints": [
{
- "adminURL": "https://nova-api.openstack.org:9774/v1.1/3456",
+ "adminURL": "https://nova-api.openstack.org:9774/v2/3456",
"region": "RegionOne",
- "internalURL": "https://nova-api.openstack.org:9774/v1.1/3456",
- "publicURL": "https://nova-api.openstack.org:9774/v1.1/3456"
+ "internalURL": "https://nova-api.openstack.org:9774/v2/3456",
+ "publicURL": "https://nova-api.openstack.org:9774/v2/3456"
}
],
"type": "compute",
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
index 2958c4e..4dfd401 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
@@ -85,7 +85,7 @@ public class NovaApiMetadata extends BaseHttpApiMetadata<NovaApi> {
.credentialName("${password}")
.endpointName("Keystone base url ending in /v2.0/")
.documentation(URI.create("http://api.openstack.org/"))
- .version("1.1")
+ .version("2")
.defaultEndpoint("http://localhost:5000/v2.0/")
.defaultProperties(NovaApiMetadata.defaultProperties())
.view(typeToken(ComputeServiceContext.class))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java
index 7d5299f..7cafdd5 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest.java
@@ -54,7 +54,7 @@ public class AccessKeyAndSecretKeyAndTenantIdAuthenticationExpectTest extends Ba
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest.java
index 53771c1..a013889 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest.java
@@ -54,7 +54,7 @@ public class AccessKeyAndSecretKeyAndTenantNamePropertyAuthenticationExpectTest
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java
index 166d542..8cc0539 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/AccessKeyAndSecretKeyAuthenticationExpectTest.java
@@ -49,7 +49,7 @@ public class AccessKeyAndSecretKeyAuthenticationExpectTest extends BaseNovaApiEx
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationExpectTest.java
index e3bde10..22b446e 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationExpectTest.java
@@ -40,7 +40,7 @@ public class PasswordAuthenticationExpectTest extends BaseNovaApiExpectTest {
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationWithTenantNameExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationWithTenantNameExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationWithTenantNameExpectTest.java
index 81184d5..b6cb881 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationWithTenantNameExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/PasswordAuthenticationWithTenantNameExpectTest.java
@@ -49,7 +49,7 @@ public class PasswordAuthenticationWithTenantNameExpectTest extends BaseNovaApiE
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
index c63f7e9..0a9aa06 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapterExpectTest.java
@@ -55,7 +55,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest serverDetail = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71752")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71752")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -67,7 +67,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -102,7 +102,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -137,7 +137,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -171,7 +171,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -218,7 +218,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -259,7 +259,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -309,7 +309,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest createServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -348,7 +348,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest suspendServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71752/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71752/action")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -384,7 +384,7 @@ public class NovaComputeServiceAdapterExpectTest extends BaseNovaComputeServiceC
HttpRequest suspendServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71752/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71752/action")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
"{\"suspend\":null}", "application/json"))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java
index f87f66e..f62e97e 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceExpectTest.java
@@ -93,18 +93,18 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
payloadFromResourceWithContentType("/keystoneAuthResponse_openstack.json", "application/json"))
.build())
.put(extensionsOfNovaRequest.toBuilder()
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/extensions").build(),
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/extensions").build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/extension_list_openstack.json"))
.build())
.put(listDetail.toBuilder()
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/images/detail").build(),
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/images/detail").build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/image_list_detail_openstack.json"))
.build())
.put(listServers.toBuilder()
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers/detail").build(),
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/servers/detail").build(),
listServersResponse)
.put(listFlavorsDetail.toBuilder()
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/flavors/detail").build(),
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/flavors/detail").build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/flavor_list_detail_openstack.json"))
.build()).build();
@@ -131,7 +131,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/detail")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/detail")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -146,7 +146,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest list = HttpRequest
.builder()
.method("GET")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-groups")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/os-security-groups")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -155,7 +155,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest createWithPrefixOnGroup = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-groups")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/os-security-groups")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -169,7 +169,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest createRuleForDefaultPort22 = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-group-rules")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -183,7 +183,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest getSecurityGroup = HttpRequest
.builder()
.method("GET")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-security-groups/160")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/os-security-groups/160")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -193,7 +193,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest create = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/os-keypairs")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/os-keypairs")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -207,7 +207,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest serverDetail = HttpRequest
.builder()
.method("GET")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers/71752")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/servers/71752")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -233,7 +233,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest createServerWithGeneratedKeyPair = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -288,7 +288,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest createServerWithSuppliedKeyPair = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -339,7 +339,7 @@ public class NovaComputeServiceExpectTest extends BaseNovaComputeServiceExpectTe
HttpRequest createServerWithSuppliedKeyPairAndGroup = HttpRequest
.builder()
.method("POST")
- .endpoint("https://nova-api.openstack.org:9774/v1.1/3456/servers")
+ .endpoint("https://nova-api.openstack.org:9774/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtensionExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtensionExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtensionExpectTest.java
index 11fba54..8021cb9 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtensionExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaImageExtensionExpectTest.java
@@ -43,7 +43,7 @@ public class NovaImageExtensionExpectTest extends BaseNovaComputeServiceExpectTe
}
HttpRequest serverDetail = HttpRequest.builder().method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71752")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71752")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -51,7 +51,7 @@ public class NovaImageExtensionExpectTest extends BaseNovaComputeServiceExpectTe
.payload(payloadFromResource("/server_details.json")).build();
HttpRequest createImage = HttpRequest.builder().method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71752/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71752/action")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -60,11 +60,11 @@ public class NovaImageExtensionExpectTest extends BaseNovaComputeServiceExpectTe
"application/json")).build();
HttpResponse createImageResponse = HttpResponse.builder().statusCode(202)
- .addHeader("Location", "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
+ .addHeader("Location", "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
.build();
HttpRequest getImage = HttpRequest.builder().method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
index 5bf3fcd..775490a 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
@@ -49,7 +49,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
protected String zone = "az-1.region-a.geo-1";
protected HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -79,7 +79,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
public void testListSecurityGroupsInLocation() {
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -104,7 +104,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
public void testListSecurityGroupsForNode() {
HttpRequest serverReq = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-create-server-ext/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb"))
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-create-server-ext/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb"))
.headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -113,7 +113,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/server_with_security_groups_extension.json")).build();
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -135,7 +135,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
public void testGetSecurityGroupById() {
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -156,7 +156,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
public void testCreateSecurityGroup() {
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -164,7 +164,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygroup_details_extension.json")).build();
HttpRequest create = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build())
.payload(
@@ -176,7 +176,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygroup_created.json")).build();
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String>builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -202,7 +202,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
public void testRemoveSecurityGroup() {
HttpRequest delete = HttpRequest.builder().method("DELETE").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160"))
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160"))
.headers(
ImmutableMultimap.<String, String>builder().put("Accept", "application/json")
.put("X-Auth-Token", authToken).build()).build();
@@ -210,7 +210,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
HttpResponse deleteResponse = HttpResponse.builder().statusCode(202).build();
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -232,7 +232,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
HttpRequest createRule = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -244,7 +244,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygrouprule_created_cidr.json")).build();
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -281,7 +281,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
HttpRequest createRule = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -293,7 +293,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygrouprule_created_cidr.json")).build();
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -327,7 +327,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
HttpRequest createRule = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -339,7 +339,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygrouprule_created_group.json")).build();
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -376,7 +376,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
HttpRequest createRule = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -388,7 +388,7 @@ public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeService
payloadFromResource("/securitygrouprule_created_group.json")).build();
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
index 2c3e285..28cc533 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
@@ -58,7 +58,7 @@ public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeSer
final NovaTemplateOptions options = NovaTemplateOptions.Builder.autoAssignFloatingIp(false);
HttpRequest createFloatingIP = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).payload(payloadFromStringWithContentType("{}", "application/json")).build();
@@ -92,7 +92,7 @@ public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeSer
private HttpRequest addFloatingIPForAddress(String address) {
HttpRequest addFloatingIPRequest = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/71592/action"))
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71592/action"))
.headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json")
.put("X-Auth-Token", authToken).build()).payload(
@@ -111,7 +111,7 @@ public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeSer
"application/json")).build();
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -149,7 +149,7 @@ public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeSer
"application/json")).build();
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
index d0cedfe..b5c1646 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ServerInZoneToNodeMetadataTest.java
@@ -273,8 +273,8 @@ public class ServerInZoneToNodeMetadataTest {
assertNotNull(convertedNodeMetadata.getUserMetadata());
assertEquals(convertedNodeMetadata.getUserMetadata(),
ImmutableMap.<String, String> of("Server Label", "Web Head 1", "Image Version", "2.1"));
-
- URI expectedURI = URI.create("http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6f006e54");
+
+ URI expectedURI = URI.create("http://servers.api.openstack.org/v2/1234/servers/71752");
assertEquals(convertedNodeMetadata.getUri(), expectedURI);
}
@@ -300,7 +300,7 @@ public class ServerInZoneToNodeMetadataTest {
assertEquals(convertedNodeMetadata.getLocation(), zone);
- URI expectedURI = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752");
+ URI expectedURI = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752");
assertEquals(convertedNodeMetadata.getUri(), expectedURI);
}
@@ -334,7 +334,7 @@ public class ServerInZoneToNodeMetadataTest {
URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100")))
.build())
.links(
- Link.create(Link.Relation.SELF, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752")),
+ Link.create(Link.Relation.SELF, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752")),
Link.create(Link.Relation.BOOKMARK, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752"))).build();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java
index aa849c7..b3a80a7 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AdminActionsApiExpectTest.java
@@ -42,7 +42,7 @@ import com.google.common.collect.ImmutableMap;
public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
public void testSuspend() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -54,7 +54,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testSuspendFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -67,7 +67,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = AuthorizationException.class)
public void testSuspendFailsNotAuthorized() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -79,7 +79,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testResume() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -91,7 +91,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testResumeFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -104,7 +104,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = AuthorizationException.class)
public void testResumeFailsNotAuthorized() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -116,7 +116,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testLock() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -128,7 +128,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testLockFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -140,7 +140,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testUnlock() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -152,7 +152,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testUnlockFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -164,7 +164,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testPause() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -176,7 +176,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testPauseFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -188,7 +188,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testUnpause() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -200,7 +200,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testUnpauseFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -212,7 +212,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testMigrateServer() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -225,7 +225,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
public void testMigrateServerFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -237,7 +237,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testResetNetworkOfServer() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -249,7 +249,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testResetNetworkOfServerFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -261,7 +261,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testInjectNetworkInfoIntoServer() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -273,7 +273,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testInjectNetworkInfoIntoServerFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -288,7 +288,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
- authenticatedGET().endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action").method("POST")
+ authenticatedGET().endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action").method("POST")
.payload(payloadFromStringWithContentType("{\"createBackup\":{\"backup_type\":\"weekly\",\"rotation\":3,\"name\":\"mybackup\",\"metadata\":{\"some\":\"data or other\"}}}", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(202).addHeader("Location", "http://172.16.89.149:8774/v2/images/1976b3b3-409a-468d-b16c-a9172c341b46").build()
).getServerAdminExtensionForZone("az-1.region-a.geo-1").get();
@@ -299,7 +299,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = ResourceNotFoundException.class)
public void testBackupServerFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -312,7 +312,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testLiveMigrateServer() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -325,7 +325,7 @@ public class AdminActionsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testLiveMigrateServerFailsNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/action");
ServerAdminApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
index d3b71db..bc2eba4 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/AvailabilityZoneApiExpectTest.java
@@ -36,7 +36,7 @@ public class AvailabilityZoneApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest list = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-availability-zone")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-availability-zone")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
[3/6] JCLOUDS-554: Update Nova default API to v2
Posted by jd...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/extension_list_full.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/extension_list_full.json b/apis/openstack-nova/src/test/resources/extension_list_full.json
index 3d18b12..c54a010 100644
--- a/apis/openstack-nova/src/test/resources/extension_list_full.json
+++ b/apis/openstack-nova/src/test/resources/extension_list_full.json
@@ -1,281 +1,284 @@
-{"extensions": [
{
- "updated": "2011-09-27T00:00:00+00:00",
- "name": "DiskConfig",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/disk_config/api/v1.1",
- "alias": "OS-DCF",
- "description": "Disk Management Extension"
-},
-{
- "updated": "2011-06-29T00:00:00+00:00",
- "name": "Hosts",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/hosts/api/v1.1",
- "alias": "os-hosts",
- "description": "Admin-only host administration"
-},
-{
- "updated": "2011-07-19T00:00:00+00:00",
- "name": "SchedulerHints",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/scheduler-hints/api/v2",
- "alias": "os-scheduler-hints",
- "description": "Pass arbitrary key/value pairs to the scheduler"
-},
-{
- "updated": "2011-08-08T00:00:00+00:00",
- "name": "Quotas",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1",
- "alias": "os-quota-sets",
- "description": "Quotas management support"
-},
-{
- "updated": "2011-12-23T00:00:00+00:00",
- "name": "Floating_ip_dns",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/floating_ip_dns/api/v1.1",
- "alias": "os-floating-ip-dns",
- "description": "Floating IP DNS support"
-},
-{
- "updated": "2011-09-14T00:00:00+00:00",
- "name": "FlavorExtraData",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1",
- "alias": "OS-FLV-EXT-DATA",
- "description": "Provide additional data for flavors"
-},
-{
- "updated": "2011-06-23T00:00:00+00:00",
- "name": "FlavorExtraSpecs",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_specs/api/v1.1",
- "alias": "os-flavor-extra-specs",
- "description": "Instance type (flavor) extra specs"
-},
-{
- "updated": "2011-08-17T00:00:00+00:00",
- "name": "VirtualInterfaces",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/virtual_interfaces/api/v1.1",
- "alias": "virtual_interfaces",
- "description": "Virtual interface support"
-},
-{
- "updated": "2011-12-23T00:00:00+00:00",
- "name": "Accounts",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/accounts/api/v1.1",
- "alias": "os-accounts",
- "description": "Admin-only access to accounts"
-},
-{
- "updated": "2011-03-25T00:00:00+00:00",
- "name": "Volumes",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/volumes/api/v1.1",
- "alias": "os-volumes",
- "description": "Volumes support"
-},
-{
- "updated": "2011-11-03T00:00:00+00:00",
- "name": "ExtendedStatus",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1",
- "alias": "OS-EXT-STS",
- "description": "Extended Status support"
-},
-{
- "updated": "2011-12-23T00:00:00+00:00",
- "name": "Consoles",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/os-consoles/api/v2",
- "alias": "os-consoles",
- "description": "Interactive Console support."
-},
-{
- "updated": "2011-07-21T00:00:00+00:00",
- "name": "SecurityGroups",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/securitygroups/api/v1.1",
- "alias": "security_groups",
- "description": "Security group support"
-},
-{
- "updated": "2012-01-12T00:00:00+00:00",
- "name": "Aggregates",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/aggregates/api/v1.1",
- "alias": "os-aggregates",
- "description": "Admin-only aggregate administration"
-},
-{
- "updated": "2011-07-19T00:00:00+00:00",
- "name": "Createserverext",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/createserverext/api/v1.1",
- "alias": "os-create-server-ext",
- "description": "Extended support to the Create Server v1.1 API"
-},
-{
- "updated": "2011-09-01T00:00:00+00:00",
- "name": "DeferredDelete",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/deferred-delete/api/v1.1",
- "alias": "os-deferred-delete",
- "description": "Instance deferred delete"
-},
-{
- "updated": "2011-12-21T00:00:00+00:00",
- "name": "ServerDiagnostics",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/server-diagnostics/api/v1.1",
- "alias": "os-server-diagnostics",
- "description": "Allow Admins to view server diagnostics through server action"
-},
-{
- "updated": "2011-12-23T00:00:00+00:00",
- "name": "Networks",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/networks/api/v1.1",
- "alias": "os-networks",
- "description": "Admin-only Network Management Extension"
-},
-{
- "updated": "2011-11-03T00:00:00+00:00",
- "name": "ExtendedServerAttributes",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1",
- "alias": "OS-EXT-SRV-ATTR",
- "description": "Extended Server Attributes support."
-},
-{
- "updated": "2011-08-08T00:00:00+00:00",
- "name": "Keypairs",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/keypairs/api/v1.1",
- "alias": "os-keypairs",
- "description": "Keypair Support"
-},
-{
- "updated": "2011-08-24T00:00:00+00:00",
- "name": "VolumeTypes",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/volume_types/api/v1.1",
- "alias": "os-volume-types",
- "description": "Volume types support"
-},
-{
- "updated": "2011-08-19T00:00:00+00:00",
- "name": "SimpleTenantUsage",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1",
- "alias": "os-simple-tenant-usage",
- "description": "Simple tenant usage extension"
-},
-{
- "updated": "2012-01-04T00:00:00+00:00",
- "name": "Floating_ip_pools",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/floating_ip_pools/api/v1.1",
- "alias": "os-floating-ip-pools",
- "description": "Floating IPs support"
-},
-{
- "updated": "2012-01-23T00:00:00+00:00",
- "name": "ServerStartStop",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/servers/api/v1.1",
- "alias": "os-server-start-stop",
- "description": "Start/Stop instance compute API support"
-},
-{
- "updated": "2012-01-19T00:00:00+00:00",
- "name": "Certificates",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/certificates/api/v1.1",
- "alias": "os-certificates",
- "description": "Certificates support"
-},
-{
- "updated": "2011-08-18T00:00:00+00:00",
- "name": "Rescue",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/rescue/api/v1.1",
- "alias": "os-rescue",
- "description": "Instance rescue mode"
-},
-{
- "updated": "2012-01-19T00:00:00+00:00",
- "name": "FlavorManage",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/flavor_manage/api/v1.1",
- "alias": "os-flavor-manage",
- "description": "\n Flavor create/delete API support\n "
-},
-{
- "updated": "2011-12-16T00:00:00+00:00",
- "name": "Cloudpipe",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/cloudpipe/api/v1.1",
- "alias": "os-cloudpipe",
- "description": "Adds actions to create cloudpipe instances.\n\n When running with the Vlan network mode, you need a mechanism to route\n from the public Internet to your vlans. This mechanism is known as a\n cloudpipe.\n\n At the time of creating this class, only OpenVPN is supported. Support for\n a SSH Bastion host is forthcoming.\n "
-},
-{
- "updated": "2011-06-09T00:00:00+00:00",
- "name": "Multinic",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/multinic/api/v1.1",
- "alias": "NMN",
- "description": "Multiple network support"
-},
-{
- "updated": "2011-08-08T00:00:00+00:00",
- "name": "Users",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/users/api/v1.1",
- "alias": "os-users",
- "description": "Allow admins to acces user information"
-},
-{
- "updated": "2011-09-20T00:00:00+00:00",
- "name": "AdminActions",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/admin-actions/api/v1.1",
- "alias": "os-admin-actions",
- "description": "Enable admin-only server actions\n\n Actions include: pause,unpause, suspend, resume, migrate,\n resetNetwork, injectNetworkInfo, lock, unlock, createBackup\n "
-},
-{
- "updated": "2011-12-21T00:00:00+00:00",
- "name": "ServerActionList",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/server-actions-list/api/v1.1",
- "alias": "os-server-action-list",
- "description": "Allow Admins to view pending server actions"
-},
-{
- "updated": "2011-12-08T00:00:00+00:00",
- "name": "Console_output",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/os-console-output/api/v2",
- "alias": "os-console-output",
- "description": "Console log output support, with tailing ability."
-},
-{
- "updated": "2011-06-16T00:00:00+00:00",
- "name": "Floating_ips",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/floating_ips/api/v1.1",
- "alias": "os-floating-ips",
- "description": "Floating IPs support"
-},
-{
- "updated": "2012-12-21T00:00:00+00:00",
- "name": "AvailabilityZone",
- "links": [],
- "namespace": "http://docs.openstack.org/compute/ext/availabilityzone/api/v1.1",
- "alias": "os-availability-zone",
- "description": "1. Add availability_zone to the Create Server v1.1 API.\n 2. Add availability zones describing.\n "}
-]}
+ "extensions": [
+ {
+ "updated": "2011-09-27T00:00:00+00:00",
+ "name": "DiskConfig",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/disk_config/api/v1.1",
+ "alias": "OS-DCF",
+ "description": "Disk Management Extension"
+ },
+ {
+ "updated": "2011-06-29T00:00:00+00:00",
+ "name": "Hosts",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/hosts/api/v1.1",
+ "alias": "os-hosts",
+ "description": "Admin-only host administration"
+ },
+ {
+ "updated": "2011-07-19T00:00:00+00:00",
+ "name": "SchedulerHints",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/scheduler-hints/api/v2",
+ "alias": "os-scheduler-hints",
+ "description": "Pass arbitrary key/value pairs to the scheduler"
+ },
+ {
+ "updated": "2011-08-08T00:00:00+00:00",
+ "name": "Quotas",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1",
+ "alias": "os-quota-sets",
+ "description": "Quotas management support"
+ },
+ {
+ "updated": "2011-12-23T00:00:00+00:00",
+ "name": "Floating_ip_dns",
+ "links": [],
+ "namespace": "http://docs.openstack.org/ext/floating_ip_dns/api/v1.1",
+ "alias": "os-floating-ip-dns",
+ "description": "Floating IP DNS support"
+ },
+ {
+ "updated": "2011-09-14T00:00:00+00:00",
+ "name": "FlavorExtraData",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1",
+ "alias": "OS-FLV-EXT-DATA",
+ "description": "Provide additional data for flavors"
+ },
+ {
+ "updated": "2011-06-23T00:00:00+00:00",
+ "name": "FlavorExtraSpecs",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_specs/api/v1.1",
+ "alias": "os-flavor-extra-specs",
+ "description": "Instance type (flavor) extra specs"
+ },
+ {
+ "updated": "2011-08-17T00:00:00+00:00",
+ "name": "VirtualInterfaces",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/virtual_interfaces/api/v1.1",
+ "alias": "virtual_interfaces",
+ "description": "Virtual interface support"
+ },
+ {
+ "updated": "2011-12-23T00:00:00+00:00",
+ "name": "Accounts",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/accounts/api/v1.1",
+ "alias": "os-accounts",
+ "description": "Admin-only access to accounts"
+ },
+ {
+ "updated": "2011-03-25T00:00:00+00:00",
+ "name": "Volumes",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/volumes/api/v1.1",
+ "alias": "os-volumes",
+ "description": "Volumes support"
+ },
+ {
+ "updated": "2011-11-03T00:00:00+00:00",
+ "name": "ExtendedStatus",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1",
+ "alias": "OS-EXT-STS",
+ "description": "Extended Status support"
+ },
+ {
+ "updated": "2011-12-23T00:00:00+00:00",
+ "name": "Consoles",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/os-consoles/api/v2",
+ "alias": "os-consoles",
+ "description": "Interactive Console support."
+ },
+ {
+ "updated": "2011-07-21T00:00:00+00:00",
+ "name": "SecurityGroups",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/securitygroups/api/v1.1",
+ "alias": "security_groups",
+ "description": "Security group support"
+ },
+ {
+ "updated": "2012-01-12T00:00:00+00:00",
+ "name": "Aggregates",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/aggregates/api/v1.1",
+ "alias": "os-aggregates",
+ "description": "Admin-only aggregate administration"
+ },
+ {
+ "updated": "2011-07-19T00:00:00+00:00",
+ "name": "Createserverext",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/createserverext/api/v1.1",
+ "alias": "os-create-server-ext",
+ "description": "Extended support to the Create Server v1.1 API"
+ },
+ {
+ "updated": "2011-09-01T00:00:00+00:00",
+ "name": "DeferredDelete",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/deferred-delete/api/v1.1",
+ "alias": "os-deferred-delete",
+ "description": "Instance deferred delete"
+ },
+ {
+ "updated": "2011-12-21T00:00:00+00:00",
+ "name": "ServerDiagnostics",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/server-diagnostics/api/v1.1",
+ "alias": "os-server-diagnostics",
+ "description": "Allow Admins to view server diagnostics through server action"
+ },
+ {
+ "updated": "2011-12-23T00:00:00+00:00",
+ "name": "Networks",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/networks/api/v1.1",
+ "alias": "os-networks",
+ "description": "Admin-only Network Management Extension"
+ },
+ {
+ "updated": "2011-11-03T00:00:00+00:00",
+ "name": "ExtendedServerAttributes",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1",
+ "alias": "OS-EXT-SRV-ATTR",
+ "description": "Extended Server Attributes support."
+ },
+ {
+ "updated": "2011-08-08T00:00:00+00:00",
+ "name": "Keypairs",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/keypairs/api/v1.1",
+ "alias": "os-keypairs",
+ "description": "Keypair Support"
+ },
+ {
+ "updated": "2011-08-24T00:00:00+00:00",
+ "name": "VolumeTypes",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/volume_types/api/v1.1",
+ "alias": "os-volume-types",
+ "description": "Volume types support"
+ },
+ {
+ "updated": "2011-08-19T00:00:00+00:00",
+ "name": "SimpleTenantUsage",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1",
+ "alias": "os-simple-tenant-usage",
+ "description": "Simple tenant usage extension"
+ },
+ {
+ "updated": "2012-01-04T00:00:00+00:00",
+ "name": "Floating_ip_pools",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/floating_ip_pools/api/v1.1",
+ "alias": "os-floating-ip-pools",
+ "description": "Floating IPs support"
+ },
+ {
+ "updated": "2012-01-23T00:00:00+00:00",
+ "name": "ServerStartStop",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/servers/api/v1.1",
+ "alias": "os-server-start-stop",
+ "description": "Start/Stop instance compute API support"
+ },
+ {
+ "updated": "2012-01-19T00:00:00+00:00",
+ "name": "Certificates",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/certificates/api/v1.1",
+ "alias": "os-certificates",
+ "description": "Certificates support"
+ },
+ {
+ "updated": "2011-08-18T00:00:00+00:00",
+ "name": "Rescue",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/rescue/api/v1.1",
+ "alias": "os-rescue",
+ "description": "Instance rescue mode"
+ },
+ {
+ "updated": "2012-01-19T00:00:00+00:00",
+ "name": "FlavorManage",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/flavor_manage/api/v1.1",
+ "alias": "os-flavor-manage",
+ "description": "\n Flavor create/delete API support\n "
+ },
+ {
+ "updated": "2011-12-16T00:00:00+00:00",
+ "name": "Cloudpipe",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/cloudpipe/api/v1.1",
+ "alias": "os-cloudpipe",
+ "description": "Adds actions to create cloudpipe instances.\n\n When running with the Vlan network mode, you need a mechanism to route\n from the public Internet to your vlans. This mechanism is known as a\n cloudpipe.\n\n At the time of creating this class, only OpenVPN is supported. Support for\n a SSH Bastion host is forthcoming.\n "
+ },
+ {
+ "updated": "2011-06-09T00:00:00+00:00",
+ "name": "Multinic",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/multinic/api/v1.1",
+ "alias": "NMN",
+ "description": "Multiple network support"
+ },
+ {
+ "updated": "2011-08-08T00:00:00+00:00",
+ "name": "Users",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/users/api/v1.1",
+ "alias": "os-users",
+ "description": "Allow admins to acces user information"
+ },
+ {
+ "updated": "2011-09-20T00:00:00+00:00",
+ "name": "AdminActions",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/admin-actions/api/v1.1",
+ "alias": "os-admin-actions",
+ "description": "Enable admin-only server actions\n\n Actions include: pause,unpause, suspend, resume, migrate,\n resetNetwork, injectNetworkInfo, lock, unlock, createBackup\n "
+ },
+ {
+ "updated": "2011-12-21T00:00:00+00:00",
+ "name": "ServerActionList",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/server-actions-list/api/v1.1",
+ "alias": "os-server-action-list",
+ "description": "Allow Admins to view pending server actions"
+ },
+ {
+ "updated": "2011-12-08T00:00:00+00:00",
+ "name": "Console_output",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/os-console-output/api/v2",
+ "alias": "os-console-output",
+ "description": "Console log output support, with tailing ability."
+ },
+ {
+ "updated": "2011-06-16T00:00:00+00:00",
+ "name": "Floating_ips",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/floating_ips/api/v1.1",
+ "alias": "os-floating-ips",
+ "description": "Floating IPs support"
+ },
+ {
+ "updated": "2012-12-21T00:00:00+00:00",
+ "name": "AvailabilityZone",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/availabilityzone/api/v1.1",
+ "alias": "os-availability-zone",
+ "description": "1. Add availability_zone to the Create Server v1.1 API.\n 2. Add availability zones describing.\n "
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/extension_list_normal.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/extension_list_normal.json b/apis/openstack-nova/src/test/resources/extension_list_normal.json
index 37fd53f..211338d 100644
--- a/apis/openstack-nova/src/test/resources/extension_list_normal.json
+++ b/apis/openstack-nova/src/test/resources/extension_list_normal.json
@@ -1,31 +1,36 @@
{
- "extensions": [{
- "updated": "2011-08-08T00:00:00+00:00",
- "name": "Keypairs",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/keypairs/api/v1.1",
- "alias": "os-keypairs",
- "description": "Keypair Support"
- }, {
- "updated": "2011-03-25T00:00:00+00:00",
- "name": "Volumes",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/volumes/api/v1.1",
- "alias": "os-volumes",
- "description": "Volumes support"
- }, {
- "updated": "2011-07-21T00:00:00+00:00",
- "name": "SecurityGroups",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/securitygroups/api/v1.1",
- "alias": "security_groups",
- "description": "Security group support"
- }, {
- "updated": "2011-06-16T00:00:00+00:00",
- "name": "Floating_ips",
- "links": [],
- "namespace": "http://docs.openstack.org/ext/floating_ips/api/v1.1",
- "alias": "os-floating-ips",
- "description": "Floating IPs support"
- }]
-}
\ No newline at end of file
+ "extensions": [
+ {
+ "updated": "2011-08-08T00:00:00+00:00",
+ "name": "Keypairs",
+ "links": [],
+ "namespace": "http://docs.openstack.org/ext/keypairs/api/v1.1",
+ "alias": "os-keypairs",
+ "description": "Keypair Support"
+ },
+ {
+ "updated": "2011-03-25T00:00:00+00:00",
+ "name": "Volumes",
+ "links": [],
+ "namespace": "http://docs.openstack.org/ext/volumes/api/v1.1",
+ "alias": "os-volumes",
+ "description": "Volumes support"
+ },
+ {
+ "updated": "2011-07-21T00:00:00+00:00",
+ "name": "SecurityGroups",
+ "links": [],
+ "namespace": "http://docs.openstack.org/ext/securitygroups/api/v1.1",
+ "alias": "security_groups",
+ "description": "Security group support"
+ },
+ {
+ "updated": "2011-06-16T00:00:00+00:00",
+ "name": "Floating_ips",
+ "links": [],
+ "namespace": "http://docs.openstack.org/ext/floating_ips/api/v1.1",
+ "alias": "os-floating-ips",
+ "description": "Floating IPs support"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/extension_list_openstack.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/extension_list_openstack.json b/apis/openstack-nova/src/test/resources/extension_list_openstack.json
index 0144af6..fad15a7 100644
--- a/apis/openstack-nova/src/test/resources/extension_list_openstack.json
+++ b/apis/openstack-nova/src/test/resources/extension_list_openstack.json
@@ -1,115 +1,140 @@
{
- "extensions": [{
- "updated": "2011-06-09T00:00:00+00:00",
- "name": "Multinic",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/multinic/api/v1.1",
- "alias": "NMN",
- "description": "Multiple network support"
- }, {
- "updated": "2011-06-29T00:00:00+00:00",
- "name": "Hosts",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/hosts/api/v1.1",
- "alias": "os-hosts",
- "description": "Host administration"
- }, {
- "updated": "2011-03-25T00:00:00+00:00",
- "name": "Volumes",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/volumes/api/v1.1",
- "alias": "os-volumes",
- "description": "Volumes support"
- }, {
- "updated": "2011-05-25 16:12:21.656723",
- "name": "Admin Controller",
- "links": [],
- "namespace": "https:TODO/",
- "alias": "ADMIN",
- "description": "The Admin API Extension"
- }, {
- "updated": "2011-08-08T00:00:00+00:00",
- "name": "Quotas",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/quotas-sets/api/v1.1",
- "alias": "os-quota-sets",
- "description": "Quotas management support"
- }, {
- "updated": "2011-08-24T00:00:00+00:00",
- "name": "VolumeTypes",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/volume_types/api/v1.1",
- "alias": "os-volume-types",
- "description": "Volume types support"
- }, {
- "updated": "2011-06-23T00:00:00+00:00",
- "name": "FlavorExtraSpecs",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/flavor_extra_specs/api/v1.1",
- "alias": "os-flavor-extra-specs",
- "description": "Instance type (flavor) extra specs"
- }, {
- "updated": "2011-09-14T00:00:00+00:00",
- "name": "FlavorExtraData",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/flavor_extra_data/api/v1.1",
- "alias": "os-flavor-extra-data",
- "description": "Provide additional data for flavors"
- }, {
- "updated": "2011-08-17T00:00:00+00:00",
- "name": "VirtualInterfaces",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/virtual_interfaces/api/v1.1",
- "alias": "virtual_interfaces",
- "description": "Virtual interface support"
- }, {
- "updated": "2011-07-19T00:00:00+00:00",
- "name": "Createserverext",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/createserverext/api/v1.1",
- "alias": "os-create-server-ext",
- "description": "Extended support to the Create Server v1.1 API"
- }, {
- "updated": "2011-08-08T00:00:00+00:00",
- "name": "Keypairs",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/keypairs/api/v1.1",
- "alias": "os-keypairs",
- "description": "Keypair Support"
- }, {
- "updated": "2011-08-25T00:00:00+00:00",
- "name": "VSAs",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/vsa/api/v1.1",
- "alias": "zadr-vsa",
- "description": "Virtual Storage Arrays support"
- }, {
- "updated": "2011-08-19T00:00:00+00:00",
- "name": "SimpleTenantUsage",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/os-simple-tenant-usage/api/v1.1",
- "alias": "os-simple-tenant-usage",
- "description": "Simple tenant usage extension"
- }, {
- "updated": "2011-08-18T00:00:00+00:00",
- "name": "Rescue",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/rescue/api/v1.1",
- "alias": "os-rescue",
- "description": "Instance rescue mode"
- }, {
- "updated": "2011-07-21T00:00:00+00:00",
- "name": "SecurityGroups",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/securitygroups/api/v1.1",
- "alias": "security_groups",
- "description": "Security group support"
- }, {
- "updated": "2011-06-16T00:00:00+00:00",
- "name": "Floating_ips",
- "links": [],
- "namespace": "https://docs.openstack.org/ext/floating_ips/api/v1.1",
- "alias": "os-floating-ips",
- "description": "Floating IPs support"
- }]
-}
\ No newline at end of file
+ "extensions": [
+ {
+ "updated": "2011-06-09T00:00:00+00:00",
+ "name": "Multinic",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/multinic/api/v1.1",
+ "alias": "NMN",
+ "description": "Multiple network support"
+ },
+ {
+ "updated": "2011-06-29T00:00:00+00:00",
+ "name": "Hosts",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/hosts/api/v1.1",
+ "alias": "os-hosts",
+ "description": "Host administration"
+ },
+ {
+ "updated": "2011-03-25T00:00:00+00:00",
+ "name": "Volumes",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/volumes/api/v1.1",
+ "alias": "os-volumes",
+ "description": "Volumes support"
+ },
+ {
+ "updated": "2011-05-25 16:12:21.656723",
+ "name": "Admin Controller",
+ "links": [],
+ "namespace": "https:TODO/",
+ "alias": "ADMIN",
+ "description": "The Admin API Extension"
+ },
+ {
+ "updated": "2011-08-08T00:00:00+00:00",
+ "name": "Quotas",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/quotas-sets/api/v1.1",
+ "alias": "os-quota-sets",
+ "description": "Quotas management support"
+ },
+ {
+ "updated": "2011-08-24T00:00:00+00:00",
+ "name": "VolumeTypes",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/volume_types/api/v1.1",
+ "alias": "os-volume-types",
+ "description": "Volume types support"
+ },
+ {
+ "updated": "2011-06-23T00:00:00+00:00",
+ "name": "FlavorExtraSpecs",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/flavor_extra_specs/api/v1.1",
+ "alias": "os-flavor-extra-specs",
+ "description": "Instance type (flavor) extra specs"
+ },
+ {
+ "updated": "2011-09-14T00:00:00+00:00",
+ "name": "FlavorExtraData",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/flavor_extra_data/api/v1.1",
+ "alias": "os-flavor-extra-data",
+ "description": "Provide additional data for flavors"
+ },
+ {
+ "updated": "2011-08-17T00:00:00+00:00",
+ "name": "VirtualInterfaces",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/virtual_interfaces/api/v1.1",
+ "alias": "virtual_interfaces",
+ "description": "Virtual interface support"
+ },
+ {
+ "updated": "2011-07-19T00:00:00+00:00",
+ "name": "Createserverext",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/createserverext/api/v1.1",
+ "alias": "os-create-server-ext",
+ "description": "Extended support to the Create Server v1.1 API"
+ },
+ {
+ "updated": "2011-08-08T00:00:00+00:00",
+ "name": "Keypairs",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/keypairs/api/v1.1",
+ "alias": "os-keypairs",
+ "description": "Keypair Support"
+ },
+ {
+ "updated": "2011-08-25T00:00:00+00:00",
+ "name": "VSAs",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/vsa/api/v1.1",
+ "alias": "zadr-vsa",
+ "description": "Virtual Storage Arrays support"
+ },
+ {
+ "updated": "2011-08-19T00:00:00+00:00",
+ "name": "SimpleTenantUsage",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/os-simple-tenant-usage/api/v1.1",
+ "alias": "os-simple-tenant-usage",
+ "description": "Simple tenant usage extension"
+ },
+ {
+ "updated": "2011-08-18T00:00:00+00:00",
+ "name": "Rescue",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/rescue/api/v1.1",
+ "alias": "os-rescue",
+ "description": "Instance rescue mode"
+ },
+ {
+ "updated": "2011-07-21T00:00:00+00:00",
+ "name": "SecurityGroups",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/securitygroups/api/v1.1",
+ "alias": "security_groups",
+ "description": "Security group support"
+ },
+ {
+ "updated": "2011-06-16T00:00:00+00:00",
+ "name": "Floating_ips",
+ "links": [],
+ "namespace": "https://docs.openstack.org/ext/floating_ips/api/v1.1",
+ "alias": "os-floating-ips",
+ "description": "Floating IPs support"
+ },
+ {
+ "updated": "2012-12-21T00:00:00+00:00",
+ "name": "AvailabilityZone",
+ "links": [],
+ "namespace": "http://docs.openstack.org/compute/ext/availabilityzone/api/v1.1",
+ "alias": "os-availability-zone",
+ "description": "1. Add availability_zone to the Create Server v1.1 API.\n 2. Add availability zones describing.\n "
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/flavor_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/flavor_details.json b/apis/openstack-nova/src/test/resources/flavor_details.json
index b2a3556..5acfd71 100644
--- a/apis/openstack-nova/src/test/resources/flavor_details.json
+++ b/apis/openstack-nova/src/test/resources/flavor_details.json
@@ -1,19 +1,19 @@
{
- "flavor" : {
- "id" : "52415800-8b69-11e0-9b19-734f1195ff37",
- "name" : "256 MB Server",
- "ram" : 256,
- "disk" : 10,
- "vcpus" : 1,
+ "flavor": {
+ "id": "52415800-8b69-11e0-9b19-734f1195ff37",
+ "name": "256 MB Server",
+ "ram": 256,
+ "disk": 10,
+ "vcpus": 1,
"links": [
{
- "rel" : "self",
- "href" : "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
+ "rel": "self",
+ "href": "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
},
{
- "rel" : "bookmark",
- "href" : "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
+ "rel": "bookmark",
+ "href": "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/flavor_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/flavor_list.json b/apis/openstack-nova/src/test/resources/flavor_list.json
index 1e4cdeb..ab50bea 100644
--- a/apis/openstack-nova/src/test/resources/flavor_list.json
+++ b/apis/openstack-nova/src/test/resources/flavor_list.json
@@ -6,7 +6,7 @@
"links": [
{
"rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
+ "href": "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
},
{
"rel": "bookmark",
@@ -20,7 +20,7 @@
"links": [
{
"rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
+ "href": "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
},
{
"rel": "bookmark",
@@ -29,4 +29,4 @@
]
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/flavor_list_detail.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/flavor_list_detail.json b/apis/openstack-nova/src/test/resources/flavor_list_detail.json
index e810b48..27cbb5b 100644
--- a/apis/openstack-nova/src/test/resources/flavor_list_detail.json
+++ b/apis/openstack-nova/src/test/resources/flavor_list_detail.json
@@ -1 +1,124 @@
-{"flavors": [{"rxtx_quota": 0, "name": "standard.xsmall", "links": [{"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/flavors/100", "rel": "self"}, {"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100", "rel": "bookmark"}], "ram": 1024, "vcpus": 1, "rxtx_cap": 0, "swap": 0, "disk": 30, "id": 100}, {"rxtx_quota": 0, "name": "standard.small", "links": [{"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/flavors/101", "rel": "self"}, {"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/101", "rel": "bookmark"}], "ram": 2048, "vcpus": 2, "rxtx_cap": 0, "swap": 0, "disk": 60, "id": 101}, {"rxtx_quota": 0, "name": "standard.2xlarge", "links": [{"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/flavors/105", "rel": "self"}, {"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/105", "rel": "bookmark"}], "ra
m": 32768, "vcpus": 8, "rxtx_cap": 0, "swap": 0, "disk": 960, "id": 105}, {"rxtx_quota": 0, "name": "standard.large", "links": [{"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/flavors/103", "rel": "self"}, {"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/103", "rel": "bookmark"}], "ram": 8192, "vcpus": 4, "rxtx_cap": 0, "swap": 0, "disk": 240, "id": 103}, {"rxtx_quota": 0, "name": "standard.medium", "links": [{"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/flavors/102", "rel": "self"}, {"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/102", "rel": "bookmark"}], "ram": 4096, "vcpus": 2, "rxtx_cap": 0, "swap": 0, "disk": 120, "id": 102}, {"rxtx_quota": 0, "name": "standard.xlarge", "links": [{"href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/flavors/104", "rel": "self"}, {"href": "https://az-2.region-a.geo-1.compute.hpclou
dsvc.com/37936628937291/flavors/104", "rel": "bookmark"}], "ram": 16384, "vcpus": 4, "rxtx_cap": 0, "swap": 0, "disk": 480, "id": 104}]}
\ No newline at end of file
+{
+ "flavors": [
+ {
+ "rxtx_quota": 0,
+ "name": "standard.xsmall",
+ "links": [
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/flavors/100",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 1024,
+ "vcpus": 1,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 30,
+ "id": 100
+ },
+ {
+ "rxtx_quota": 0,
+ "name": "standard.small",
+ "links": [
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/flavors/101",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/101",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 2048,
+ "vcpus": 2,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 60,
+ "id": 101
+ },
+ {
+ "rxtx_quota": 0,
+ "name": "standard.2xlarge",
+ "links": [
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/flavors/105",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/105",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 32768,
+ "vcpus": 8,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 960,
+ "id": 105
+ },
+ {
+ "rxtx_quota": 0,
+ "name": "standard.large",
+ "links": [
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/flavors/103",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/103",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 8192,
+ "vcpus": 4,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 240,
+ "id": 103
+ },
+ {
+ "rxtx_quota": 0,
+ "name": "standard.medium",
+ "links": [
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/flavors/102",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/102",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 4096,
+ "vcpus": 2,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 120,
+ "id": 102
+ },
+ {
+ "rxtx_quota": 0,
+ "name": "standard.xlarge",
+ "links": [
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/flavors/104",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/104",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 16384,
+ "vcpus": 4,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 480,
+ "id": 104
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/flavor_list_detail_openstack.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/flavor_list_detail_openstack.json b/apis/openstack-nova/src/test/resources/flavor_list_detail_openstack.json
index 4725d8b..4085d6b 100644
--- a/apis/openstack-nova/src/test/resources/flavor_list_detail_openstack.json
+++ b/apis/openstack-nova/src/test/resources/flavor_list_detail_openstack.json
@@ -1,83 +1,104 @@
{
- "flavors": [{
- "rxtx_quota": 0,
- "name": "m1.medium",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/flavors/3",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/flavors/3",
- "rel": "bookmark"
- }],
- "ram": 4096,
- "vcpus": 2,
- "rxtx_cap": 0,
- "swap": 0,
- "disk": 40,
- "id": 3
- }, {
- "rxtx_quota": 0,
- "name": "m1.large",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/flavors/4",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/flavors/4",
- "rel": "bookmark"
- }],
- "ram": 8192,
- "vcpus": 4,
- "rxtx_cap": 0,
- "swap": 0,
- "disk": 80,
- "id": 4
- }, {
- "rxtx_quota": 0,
- "name": "m1.tiny",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/flavors/1",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/flavors/1",
- "rel": "bookmark"
- }],
- "ram": 512,
- "vcpus": 1,
- "rxtx_cap": 0,
- "swap": 0,
- "disk": 0,
- "id": 1
- }, {
- "rxtx_quota": 0,
- "name": "m1.xlarge",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/flavors/5",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/flavors/5",
- "rel": "bookmark"
- }],
- "ram": 16384,
- "vcpus": 8,
- "rxtx_cap": 0,
- "swap": 0,
- "disk": 160,
- "id": 5
- }, {
- "rxtx_quota": 0,
- "name": "m1.small",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/flavors/2",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/flavors/2",
- "rel": "bookmark"
- }],
- "ram": 2048,
- "vcpus": 1,
- "rxtx_cap": 0,
- "swap": 0,
- "disk": 20,
- "id": 2
- }]
-}
\ No newline at end of file
+ "flavors": [
+ {
+ "rxtx_quota": 0,
+ "name": "m1.medium",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/flavors/3",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/flavors/3",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 4096,
+ "vcpus": 2,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 40,
+ "id": 3
+ },
+ {
+ "rxtx_quota": 0,
+ "name": "m1.large",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/flavors/4",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/flavors/4",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 8192,
+ "vcpus": 4,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 80,
+ "id": 4
+ },
+ {
+ "rxtx_quota": 0,
+ "name": "m1.tiny",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/flavors/1",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/flavors/1",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 512,
+ "vcpus": 1,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 0,
+ "id": 1
+ },
+ {
+ "rxtx_quota": 0,
+ "name": "m1.xlarge",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/flavors/5",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/flavors/5",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 16384,
+ "vcpus": 8,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 160,
+ "id": 5
+ },
+ {
+ "rxtx_quota": 0,
+ "name": "m1.small",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/flavors/2",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/flavors/2",
+ "rel": "bookmark"
+ }
+ ],
+ "ram": 2048,
+ "vcpus": 1,
+ "rxtx_cap": 0,
+ "swap": 0,
+ "disk": 20,
+ "id": 2
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/flavor_new.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/flavor_new.json b/apis/openstack-nova/src/test/resources/flavor_new.json
index 5356f8c..8208993 100644
--- a/apis/openstack-nova/src/test/resources/flavor_new.json
+++ b/apis/openstack-nova/src/test/resources/flavor_new.json
@@ -1,10 +1,10 @@
{
- "flavor" : {
- "id" : "1cb47a44-9b84-4da4-bf81-c1976e8414ab",
- "name" : "128 MB Server",
- "ram" : 128,
- "disk" : 10,
- "vcpus" : 1,
- "links" : []
+ "flavor": {
+ "id": "1cb47a44-9b84-4da4-bf81-c1976e8414ab",
+ "name": "128 MB Server",
+ "ram": 128,
+ "disk": 10,
+ "vcpus": 1,
+ "links": []
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/floatingip_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/floatingip_list.json b/apis/openstack-nova/src/test/resources/floatingip_list.json
index 73f22fb..fd91e25 100644
--- a/apis/openstack-nova/src/test/resources/floatingip_list.json
+++ b/apis/openstack-nova/src/test/resources/floatingip_list.json
@@ -1,8 +1,8 @@
{
- "floating_ips" : [
+ "floating_ips": [
{
"instance_id": 12,
- "ip" : "10.0.0.3",
+ "ip": "10.0.0.3",
"fixed_ip": "11.0.0.1",
"id" : 1,
"pool": "nova"
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/host.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/host.json b/apis/openstack-nova/src/test/resources/host.json
index ad2e217..bf85321 100644
--- a/apis/openstack-nova/src/test/resources/host.json
+++ b/apis/openstack-nova/src/test/resources/host.json
@@ -1 +1,40 @@
-{"host": [{"resource": {"project": "(total)", "memory_mb": 16083, "host": "ubuntu", "cpu": 4, "disk_gb": 181}}, {"resource": {"project": "(used_now)", "memory_mb": 3396, "host": "ubuntu", "cpu": 3, "disk_gb": 5}}, {"resource": {"project": "(used_max)", "memory_mb": 6144, "host": "ubuntu", "cpu": 3, "disk_gb": 80}}, {"resource": {"project": "f8535069c3fb404cb61c873b1a0b4921", "memory_mb": 6144, "host": "ubuntu", "cpu": 3, "disk_gb": 80}}]}
\ No newline at end of file
+{
+ "host": [
+ {
+ "resource": {
+ "project": "(total)",
+ "memory_mb": 16083,
+ "host": "ubuntu",
+ "cpu": 4,
+ "disk_gb": 181
+ }
+ },
+ {
+ "resource": {
+ "project": "(used_now)",
+ "memory_mb": 3396,
+ "host": "ubuntu",
+ "cpu": 3,
+ "disk_gb": 5
+ }
+ },
+ {
+ "resource": {
+ "project": "(used_max)",
+ "memory_mb": 6144,
+ "host": "ubuntu",
+ "cpu": 3,
+ "disk_gb": 80
+ }
+ },
+ {
+ "resource": {
+ "project": "f8535069c3fb404cb61c873b1a0b4921",
+ "memory_mb": 6144,
+ "host": "ubuntu",
+ "cpu": 3,
+ "disk_gb": 80
+ }
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/host_aggregate_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/host_aggregate_details.json b/apis/openstack-nova/src/test/resources/host_aggregate_details.json
index 5e939dd..7ea6e8e 100644
--- a/apis/openstack-nova/src/test/resources/host_aggregate_details.json
+++ b/apis/openstack-nova/src/test/resources/host_aggregate_details.json
@@ -1 +1,17 @@
-{"aggregate": {"name": "jclouds-test-a", "availability_zone": "nova", "deleted": false, "created_at": "2012-05-11 11:40:17", "updated_at": "2012-05-11 11:46:44", "operational_state": "created", "hosts": [], "deleted_at": null, "id": 1, "metadata": {"somekey": "somevalue", "anotherkey": "another val"}}
\ No newline at end of file
+{
+ "aggregate": {
+ "name": "jclouds-test-a",
+ "availability_zone": "nova",
+ "deleted": false,
+ "created_at": "2012-05-11 11:40:17",
+ "updated_at": "2012-05-11 11:46:44",
+ "operational_state": "created",
+ "hosts": [],
+ "deleted_at": null,
+ "id": 1,
+ "metadata": {
+ "somekey": "somevalue",
+ "anotherkey": "another val"
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/host_aggregate_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/host_aggregate_list.json b/apis/openstack-nova/src/test/resources/host_aggregate_list.json
index 92dfd38..c541306 100644
--- a/apis/openstack-nova/src/test/resources/host_aggregate_list.json
+++ b/apis/openstack-nova/src/test/resources/host_aggregate_list.json
@@ -1 +1,19 @@
-{"aggregates": [{"name": "jclouds-test-a", "availability_zone": "nova", "deleted": false, "created_at": "2012-05-11 11:40:17", "updated_at": "2012-05-11 11:46:44", "operational_state": "created", "hosts": [], "deleted_at": null, "id": 1, "metadata": {"somekey": "somevalue", "anotherkey": "another val"}}]}
\ No newline at end of file
+{
+ "aggregates": [
+ {
+ "name": "jclouds-test-a",
+ "availability_zone": "nova",
+ "deleted": false,
+ "created_at": "2012-05-11 11:40:17",
+ "updated_at": "2012-05-11 11:46:44",
+ "operational_state": "created",
+ "hosts": [],
+ "deleted_at": null,
+ "id": 1,
+ "metadata": {
+ "somekey": "somevalue",
+ "anotherkey": "another val"
+ }
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/host_aggregate_with_host_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/host_aggregate_with_host_details.json b/apis/openstack-nova/src/test/resources/host_aggregate_with_host_details.json
index 2d132f4..c54aa79 100644
--- a/apis/openstack-nova/src/test/resources/host_aggregate_with_host_details.json
+++ b/apis/openstack-nova/src/test/resources/host_aggregate_with_host_details.json
@@ -1 +1,19 @@
-{"aggregate": {"name": "jclouds-test-a", "availability_zone": "nova", "deleted": false, "created_at": "2012-05-11 11:40:17", "updated_at": "2012-05-11 11:46:44", "operational_state": "created", "hosts": ["ubuntu"], "deleted_at": null, "id": 1, "metadata": {"somekey": "somevalue", "anotherkey": "another val"}}
\ No newline at end of file
+{
+ "aggregate": {
+ "name": "jclouds-test-a",
+ "availability_zone": "nova",
+ "deleted": false,
+ "created_at": "2012-05-11 11:40:17",
+ "updated_at": "2012-05-11 11:46:44",
+ "operational_state": "created",
+ "hosts": [
+ "ubuntu"
+ ],
+ "deleted_at": null,
+ "id": 1,
+ "metadata": {
+ "somekey": "somevalue",
+ "anotherkey": "another val"
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/hosts_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/hosts_list.json b/apis/openstack-nova/src/test/resources/hosts_list.json
index 30d3770..6eb1361 100644
--- a/apis/openstack-nova/src/test/resources/hosts_list.json
+++ b/apis/openstack-nova/src/test/resources/hosts_list.json
@@ -1 +1,8 @@
-{"hosts": [{"host_name": "ubuntu", "service": "compute"}]}
\ No newline at end of file
+{
+ "hosts": [
+ {
+ "host_name": "ubuntu",
+ "service": "compute"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/image_active.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/image_active.json b/apis/openstack-nova/src/test/resources/image_active.json
index 4b778e4..2cfce7b 100644
--- a/apis/openstack-nova/src/test/resources/image_active.json
+++ b/apis/openstack-nova/src/test/resources/image_active.json
@@ -1,25 +1,25 @@
{
- "image" : {
- "id" : "52415800-8b69-11e0-9b19-734f5736d2a2",
- "name" : "My Server Backup",
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2010-08-10T12:00:00Z",
- "tenant_id" : "12345",
- "user_id" : "joe",
- "status" : "ACTIVE",
- "progress" : 80,
- "minDisk" : 5,
- "minRam" : 256,
- "metadata" : {
- "ImageType" : "Gold",
- "ImageVersion" : "1.5"
+ "image": {
+ "id": "52415800-8b69-11e0-9b19-734f5736d2a2",
+ "name": "My Server Backup",
+ "updated": "2010-10-10T12:00:00Z",
+ "created": "2010-08-10T12:00:00Z",
+ "tenant_id": "12345",
+ "user_id": "joe",
+ "status": "ACTIVE",
+ "progress": 80,
+ "minDisk": 5,
+ "minRam": 256,
+ "metadata": {
+ "ImageType": "Gold",
+ "ImageVersion": "1.5"
},
- "server" : {
+ "server": {
"id": "52415800-8b69-11e0-9b19-734f335aa7b3",
"links": [
{
"rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
+ "href": "http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
},
{
"rel": "bookmark",
@@ -29,13 +29,13 @@
},
"links": [
{
- "rel" : "self",
- "href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+ "rel": "self",
+ "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
},
{
- "rel" : "bookmark",
- "href" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+ "rel": "bookmark",
+ "href": "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/image_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/image_details.json b/apis/openstack-nova/src/test/resources/image_details.json
index b75d94c..7f84ada 100644
--- a/apis/openstack-nova/src/test/resources/image_details.json
+++ b/apis/openstack-nova/src/test/resources/image_details.json
@@ -1,25 +1,25 @@
{
- "image" : {
- "id" : "52415800-8b69-11e0-9b19-734f5736d2a2",
- "name" : "My Server Backup",
- "updated" : "2010-10-10T12:00:00Z",
- "created" : "2010-08-10T12:00:00Z",
- "tenant_id" : "12345",
- "user_id" : "joe",
- "status" : "SAVING",
- "progress" : 80,
- "minDisk" : 5,
- "minRam" : 256,
- "metadata" : {
- "ImageType" : "Gold",
- "ImageVersion" : "1.5"
+ "image": {
+ "id": "52415800-8b69-11e0-9b19-734f5736d2a2",
+ "name": "My Server Backup",
+ "updated": "2010-10-10T12:00:00Z",
+ "created": "2010-08-10T12:00:00Z",
+ "tenant_id": "12345",
+ "user_id": "joe",
+ "status": "SAVING",
+ "progress": 80,
+ "minDisk": 5,
+ "minRam": 256,
+ "metadata": {
+ "ImageType": "Gold",
+ "ImageVersion": "1.5"
},
- "server" : {
+ "server": {
"id": "52415800-8b69-11e0-9b19-734f335aa7b3",
"links": [
{
"rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
+ "href": "http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
},
{
"rel": "bookmark",
@@ -29,13 +29,13 @@
},
"links": [
{
- "rel" : "self",
- "href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+ "rel": "self",
+ "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
},
{
- "rel" : "bookmark",
- "href" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+ "rel": "bookmark",
+ "href": "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/image_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/image_list.json b/apis/openstack-nova/src/test/resources/image_list.json
index afecf34..c891454 100644
--- a/apis/openstack-nova/src/test/resources/image_list.json
+++ b/apis/openstack-nova/src/test/resources/image_list.json
@@ -6,7 +6,7 @@
"links": [
{
"rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
+ "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
},
{
"rel": "bookmark",
@@ -15,18 +15,18 @@
]
},
{
- "id" : "52415800-8b69-11e0-9b19-734f5736d2a2",
- "name" : "My Server Backup",
+ "id": "52415800-8b69-11e0-9b19-734f5736d2a2",
+ "name": "My Server Backup",
"links": [
{
- "rel" : "self",
- "href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+ "rel": "self",
+ "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
},
{
- "rel" : "bookmark",
- "href" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+ "rel": "bookmark",
+ "href": "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
}
]
- }
- ]
-}
\ No newline at end of file
+ }
+ ]
+}
[2/6] JCLOUDS-554: Update Nova default API to v2
Posted by jd...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/image_list_detail.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/image_list_detail.json b/apis/openstack-nova/src/test/resources/image_list_detail.json
index 0b4dcc0..0aa48bc 100644
--- a/apis/openstack-nova/src/test/resources/image_list_detail.json
+++ b/apis/openstack-nova/src/test/resources/image_list_detail.json
@@ -1 +1,503 @@
-{"images": [{"status": "ACTIVE", "updated": "2012-03-12T07:52:30Z", "name": "Debian Squeeze 6.0.3 Server 64-bit 20120123", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1361", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1361", "rel": "bookmark"}], "created": "2012-02-21T14:13:55Z", "progress": 100, "id": "1361", "metadata": {"hp_image_type": "machine", "image_location": "local", "image_state": "available", "project_id": "None", "hp_md_version": "1", "kernel_id": "1359", "min_ram": 0, "ramdisk_id": "1360", "hp_image_id": "c89dee3bca7a62103f7d88d2a02f4dc8", "owner": null, "hp_image_builddate": "20120123", "architecture": "amd64", "min_disk": 0, "hp_image_version": "1hp1.1"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:52:17Z", "name": "Debian Squeeze 6.0.3 Server 64-bit 20120123 (Ramdisk)", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3793662893
7291/images/1360", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1360", "rel": "bookmark"}], "created": "2012-02-21T14:13:53Z", "progress": 100, "id": "1360", "metadata": {"hp_image_type": "ramdisk", "image_location": "local", "image_state": "available", "project_id": "None", "hp_md_version": "1", "min_ram": 0, "hp_image_id": "c89dee3bca7a62103f7d88d2a02f4dc8", "owner": null, "hp_image_builddate": "20120123", "architecture": "amd64", "min_disk": 0, "hp_image_version": "1hp1.1"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:52:09Z", "name": "Debian Squeeze 6.0.3 Server 64-bit 20120123 (Kernel)", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1359", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1359", "rel": "bookmark"}], "created": "2012-02-21T14:13:52Z", "progress": 100, "id": "1359", "metadata": {"hp_image_type": "kernel", "
image_location": "local", "image_state": "available", "project_id": "None", "hp_md_version": "1", "min_ram": 0, "hp_image_id": "c89dee3bca7a62103f7d88d2a02f4dc8", "owner": null, "hp_image_builddate": "20120123", "architecture": "amd64", "min_disk": 0, "hp_image_version": "1hp1.1"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:51:52Z", "name": "CentOS 6.2 Server 64-bit 20120125", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1358", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1358", "rel": "bookmark"}], "created": "2012-02-21T13:58:51Z", "progress": 100, "id": "1358", "metadata": {"hp_image_type": "machine", "image_location": "local", "image_state": "available", "project_id": "None", "hp_md_version": "1", "kernel_id": "1356", "min_ram": 0, "ramdisk_id": "1357", "hp_image_id": "f2fbb1bf37a13e7c5da897c7082684df", "owner": null, "hp_image_builddate": "20120125", "architecture": "
x86_64", "min_disk": 0, "hp_image_version": "1hp1"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:51:37Z", "name": "CentOS 6.2 Server 64-bit 20120125 (Ramdisk)", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1357", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1357", "rel": "bookmark"}], "created": "2012-02-21T13:58:49Z", "progress": 100, "id": "1357", "metadata": {"hp_image_type": "ramdisk", "image_location": "local", "image_state": "available", "project_id": "None", "hp_md_version": "1", "min_ram": 0, "hp_image_id": "f2fbb1bf37a13e7c5da897c7082684df", "owner": null, "hp_image_builddate": "20120125", "architecture": "x86_64", "min_disk": 0, "hp_image_version": "1hp1"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:51:28Z", "name": "CentOS 6.2 Server 64-bit 20120125 (Kernel)", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1
356", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1356", "rel": "bookmark"}], "created": "2012-02-21T13:58:47Z", "progress": 100, "id": "1356", "metadata": {"hp_image_type": "kernel", "image_location": "local", "image_state": "available", "project_id": "None", "hp_md_version": "1", "min_ram": 0, "hp_image_id": "f2fbb1bf37a13e7c5da897c7082684df", "owner": null, "hp_image_builddate": "20120125", "architecture": "x86_64", "min_disk": 0, "hp_image_version": "1hp1"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:51:04Z", "name": "Ubuntu Oneiric 11.10 Server 64-bit 20111212", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1242", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1242", "rel": "bookmark"}], "created": "2011-12-21T11:57:15Z", "progress": 100, "id": "1242", "metadata": {"image_location": "local", "image_state": "available
", "kernel_id": "1241", "min_ram": 0, "min_disk": 0, "architecture": "amd64", "owner": null, "project_id": "None"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:50:58Z", "name": "Ubuntu Oneiric 11.10 Server 64-bit 20111212 (Kernel)", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1241", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1241", "rel": "bookmark"}], "created": "2011-12-21T11:57:07Z", "progress": 100, "id": "1241", "metadata": {"image_location": "local", "image_state": "available", "min_ram": 0, "min_disk": 0, "architecture": "amd64", "owner": null, "project_id": "None"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:50:52Z", "name": "Ubuntu Natty 11.04 Server 64-bit 20111212", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1240", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/3793662893
7291/images/1240", "rel": "bookmark"}], "created": "2011-12-21T11:55:03Z", "progress": 100, "id": "1240", "metadata": {"image_location": "local", "image_state": "available", "kernel_id": "1239", "min_ram": 0, "min_disk": 0, "architecture": "amd64", "owner": null, "project_id": "None"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:50:45Z", "name": "Ubuntu Natty 11.04 Server 64-bit 20111212 (Kernel)", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1239", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1239", "rel": "bookmark"}], "created": "2011-12-21T11:55:02Z", "progress": 100, "id": "1239", "metadata": {"image_location": "local", "image_state": "available", "min_ram": 0, "min_disk": 0, "architecture": "amd64", "owner": null, "project_id": "None"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:50:32Z", "name": "Ubuntu Maverick 10.10 Server 64-bit 20111212", "links": [{"href": "
https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1238", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1238", "rel": "bookmark"}], "created": "2011-12-21T11:52:34Z", "progress": 100, "id": "1238", "metadata": {"image_location": "local", "image_state": "available", "kernel_id": "1237", "min_ram": 0, "min_disk": 0, "architecture": "amd64", "owner": null, "project_id": "None"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:50:24Z", "name": "Ubuntu Maverick 10.10 Server 64-bit 20111212 (Kernel)", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1237", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1237", "rel": "bookmark"}], "created": "2011-12-21T11:52:27Z", "progress": 100, "id": "1237", "metadata": {"image_location": "local", "image_state": "available", "min_ram": 0, "min_disk": 0, "architecture": "amd6
4", "owner": null, "project_id": "None"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:49:30Z", "name": "Ubuntu Lucid 10.04 LTS Server 64-bit 20111212", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1236", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1236", "rel": "bookmark"}], "created": "2011-12-21T11:40:17Z", "progress": 100, "id": "1236", "metadata": {"image_location": "local", "image_state": "available", "kernel_id": "1235", "min_ram": 0, "min_disk": 0, "architecture": "amd64", "owner": null, "project_id": "None"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:49:23Z", "name": "Ubuntu Lucid 10.04 LTS Server 64-bit 20111212 (Kernel)", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1235", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1235", "rel": "bookmark"}], "create
d": "2011-12-21T11:39:58Z", "progress": 100, "id": "1235", "metadata": {"image_location": "local", "image_state": "available", "min_ram": 0, "min_disk": 0, "architecture": "amd64", "owner": null, "project_id": "None"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:49:05Z", "name": "CentOS 5.6 Server 64-bit 20111207", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1234", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1234", "rel": "bookmark"}], "created": "2011-12-21T11:07:09Z", "progress": 100, "id": "1234", "metadata": {"image_location": "local", "image_state": "available", "kernel_id": "1232", "min_ram": 0, "ramdisk_id": "1233", "min_disk": 0, "architecture": "x86_64", "owner": null, "project_id": "None"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:48:59Z", "name": "CentOS 5.6 Server 64-bit 20111207 (Ramdisk)", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpclou
dsvc.com/v1.1/37936628937291/images/1233", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1233", "rel": "bookmark"}], "created": "2011-12-21T11:07:08Z", "progress": 100, "id": "1233", "metadata": {"image_location": "local", "image_state": "available", "min_ram": 0, "min_disk": 0, "architecture": "x86_64", "owner": null, "project_id": "None"}}, {"status": "ACTIVE", "updated": "2012-03-12T07:48:39Z", "name": "CentOS 5.6 Server 64-bit 20111207 (Kernel)", "links": [{"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/images/1232", "rel": "self"}, {"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1232", "rel": "bookmark"}], "created": "2011-12-21T11:07:07Z", "progress": 100, "id": "1232", "metadata": {"image_location": "local", "image_state": "available", "min_ram": 0, "min_disk": 0, "architecture": "x86_64", "owner": null, "project_id": "None"}}]}
\ No newline at end of file
+{
+ "images": [
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:52:30Z",
+ "name": "Debian Squeeze 6.0.3 Server 64-bit 20120123",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1361",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1361",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-21T14:13:55Z",
+ "progress": 100,
+ "id": "1361",
+ "metadata": {
+ "hp_image_type": "machine",
+ "image_location": "local",
+ "image_state": "available",
+ "project_id": "None",
+ "hp_md_version": "1",
+ "kernel_id": "1359",
+ "min_ram": 0,
+ "ramdisk_id": "1360",
+ "hp_image_id": "c89dee3bca7a62103f7d88d2a02f4dc8",
+ "owner": null,
+ "hp_image_builddate": "20120123",
+ "architecture": "amd64",
+ "min_disk": 0,
+ "hp_image_version": "1hp1.1"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:52:17Z",
+ "name": "Debian Squeeze 6.0.3 Server 64-bit 20120123 (Ramdisk)",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1360",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1360",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-21T14:13:53Z",
+ "progress": 100,
+ "id": "1360",
+ "metadata": {
+ "hp_image_type": "ramdisk",
+ "image_location": "local",
+ "image_state": "available",
+ "project_id": "None",
+ "hp_md_version": "1",
+ "min_ram": 0,
+ "hp_image_id": "c89dee3bca7a62103f7d88d2a02f4dc8",
+ "owner": null,
+ "hp_image_builddate": "20120123",
+ "architecture": "amd64",
+ "min_disk": 0,
+ "hp_image_version": "1hp1.1"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:52:09Z",
+ "name": "Debian Squeeze 6.0.3 Server 64-bit 20120123 (Kernel)",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1359",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1359",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-21T14:13:52Z",
+ "progress": 100,
+ "id": "1359",
+ "metadata": {
+ "hp_image_type": "kernel",
+ "image_location": "local",
+ "image_state": "available",
+ "project_id": "None",
+ "hp_md_version": "1",
+ "min_ram": 0,
+ "hp_image_id": "c89dee3bca7a62103f7d88d2a02f4dc8",
+ "owner": null,
+ "hp_image_builddate": "20120123",
+ "architecture": "amd64",
+ "min_disk": 0,
+ "hp_image_version": "1hp1.1"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:51:52Z",
+ "name": "CentOS 6.2 Server 64-bit 20120125",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1358",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1358",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-21T13:58:51Z",
+ "progress": 100,
+ "id": "1358",
+ "metadata": {
+ "hp_image_type": "machine",
+ "image_location": "local",
+ "image_state": "available",
+ "project_id": "None",
+ "hp_md_version": "1",
+ "kernel_id": "1356",
+ "min_ram": 0,
+ "ramdisk_id": "1357",
+ "hp_image_id": "f2fbb1bf37a13e7c5da897c7082684df",
+ "owner": null,
+ "hp_image_builddate": "20120125",
+ "architecture": "x86_64",
+ "min_disk": 0,
+ "hp_image_version": "1hp1"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:51:37Z",
+ "name": "CentOS 6.2 Server 64-bit 20120125 (Ramdisk)",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1357",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1357",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-21T13:58:49Z",
+ "progress": 100,
+ "id": "1357",
+ "metadata": {
+ "hp_image_type": "ramdisk",
+ "image_location": "local",
+ "image_state": "available",
+ "project_id": "None",
+ "hp_md_version": "1",
+ "min_ram": 0,
+ "hp_image_id": "f2fbb1bf37a13e7c5da897c7082684df",
+ "owner": null,
+ "hp_image_builddate": "20120125",
+ "architecture": "x86_64",
+ "min_disk": 0,
+ "hp_image_version": "1hp1"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:51:28Z",
+ "name": "CentOS 6.2 Server 64-bit 20120125 (Kernel)",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1356",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1356",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-21T13:58:47Z",
+ "progress": 100,
+ "id": "1356",
+ "metadata": {
+ "hp_image_type": "kernel",
+ "image_location": "local",
+ "image_state": "available",
+ "project_id": "None",
+ "hp_md_version": "1",
+ "min_ram": 0,
+ "hp_image_id": "f2fbb1bf37a13e7c5da897c7082684df",
+ "owner": null,
+ "hp_image_builddate": "20120125",
+ "architecture": "x86_64",
+ "min_disk": 0,
+ "hp_image_version": "1hp1"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:51:04Z",
+ "name": "Ubuntu Oneiric 11.10 Server 64-bit 20111212",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1242",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1242",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:57:15Z",
+ "progress": 100,
+ "id": "1242",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "kernel_id": "1241",
+ "min_ram": 0,
+ "min_disk": 0,
+ "architecture": "amd64",
+ "owner": null,
+ "project_id": "None"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:50:58Z",
+ "name": "Ubuntu Oneiric 11.10 Server 64-bit 20111212 (Kernel)",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1241",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1241",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:57:07Z",
+ "progress": 100,
+ "id": "1241",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "min_ram": 0,
+ "min_disk": 0,
+ "architecture": "amd64",
+ "owner": null,
+ "project_id": "None"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:50:52Z",
+ "name": "Ubuntu Natty 11.04 Server 64-bit 20111212",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1240",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1240",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:55:03Z",
+ "progress": 100,
+ "id": "1240",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "kernel_id": "1239",
+ "min_ram": 0,
+ "min_disk": 0,
+ "architecture": "amd64",
+ "owner": null,
+ "project_id": "None"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:50:45Z",
+ "name": "Ubuntu Natty 11.04 Server 64-bit 20111212 (Kernel)",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1239",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1239",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:55:02Z",
+ "progress": 100,
+ "id": "1239",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "min_ram": 0,
+ "min_disk": 0,
+ "architecture": "amd64",
+ "owner": null,
+ "project_id": "None"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:50:32Z",
+ "name": "Ubuntu Maverick 10.10 Server 64-bit 20111212",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1238",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1238",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:52:34Z",
+ "progress": 100,
+ "id": "1238",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "kernel_id": "1237",
+ "min_ram": 0,
+ "min_disk": 0,
+ "architecture": "amd64",
+ "owner": null,
+ "project_id": "None"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:50:24Z",
+ "name": "Ubuntu Maverick 10.10 Server 64-bit 20111212 (Kernel)",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1237",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1237",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:52:27Z",
+ "progress": 100,
+ "id": "1237",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "min_ram": 0,
+ "min_disk": 0,
+ "architecture": "amd64",
+ "owner": null,
+ "project_id": "None"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:49:30Z",
+ "name": "Ubuntu Lucid 10.04 LTS Server 64-bit 20111212",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1236",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1236",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:40:17Z",
+ "progress": 100,
+ "id": "1236",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "kernel_id": "1235",
+ "min_ram": 0,
+ "min_disk": 0,
+ "architecture": "amd64",
+ "owner": null,
+ "project_id": "None"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:49:23Z",
+ "name": "Ubuntu Lucid 10.04 LTS Server 64-bit 20111212 (Kernel)",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1235",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1235",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:39:58Z",
+ "progress": 100,
+ "id": "1235",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "min_ram": 0,
+ "min_disk": 0,
+ "architecture": "amd64",
+ "owner": null,
+ "project_id": "None"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:49:05Z",
+ "name": "CentOS 5.6 Server 64-bit 20111207",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1234",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1234",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:07:09Z",
+ "progress": 100,
+ "id": "1234",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "kernel_id": "1232",
+ "min_ram": 0,
+ "ramdisk_id": "1233",
+ "min_disk": 0,
+ "architecture": "x86_64",
+ "owner": null,
+ "project_id": "None"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:48:59Z",
+ "name": "CentOS 5.6 Server 64-bit 20111207 (Ramdisk)",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1233",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1233",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:07:08Z",
+ "progress": 100,
+ "id": "1233",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "min_ram": 0,
+ "min_disk": 0,
+ "architecture": "x86_64",
+ "owner": null,
+ "project_id": "None"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-03-12T07:48:39Z",
+ "name": "CentOS 5.6 Server 64-bit 20111207 (Kernel)",
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/images/1232",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1232",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2011-12-21T11:07:07Z",
+ "progress": 100,
+ "id": "1232",
+ "metadata": {
+ "image_location": "local",
+ "image_state": "available",
+ "min_ram": 0,
+ "min_disk": 0,
+ "architecture": "x86_64",
+ "owner": null,
+ "project_id": "None"
+ }
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/image_list_detail_imageextension.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/image_list_detail_imageextension.json b/apis/openstack-nova/src/test/resources/image_list_detail_imageextension.json
index 396d1f4..a26d5b6 100644
--- a/apis/openstack-nova/src/test/resources/image_list_detail_imageextension.json
+++ b/apis/openstack-nova/src/test/resources/image_list_detail_imageextension.json
@@ -1,121 +1,146 @@
{
- "images": [{
- "status": "UNRECOGNIZED",
- "updated": "2012-02-02T19:11:00Z",
- "name": "oneiric-server-cloudimg-amd64",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/images/15",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/images/15",
- "rel": "bookmark"
- }],
- "created": "2012-02-02T19:10:52Z",
- "progress": 100,
- "id": "15",
- "metadata": {
- "kernel_id": "14",
- "min_disk": 0,
- "min_ram": 0,
- "owner": "1"
+ "images": [
+ {
+ "status": "UNRECOGNIZED",
+ "updated": "2012-02-02T19:11:00Z",
+ "name": "oneiric-server-cloudimg-amd64",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/images/15",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/15",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-02T19:10:52Z",
+ "progress": 100,
+ "id": "15",
+ "metadata": {
+ "kernel_id": "14",
+ "min_disk": 0,
+ "min_ram": 0,
+ "owner": "1"
+ }
+ },
+ {
+ "status": "UNKNOWN",
+ "updated": "2012-02-02T19:10:51Z",
+ "name": "oneiric-server-cloudimg-amd64-kernel",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/images/14",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/14",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-02T19:10:50Z",
+ "progress": 100,
+ "id": "14",
+ "metadata": {
+ "min_disk": 0,
+ "owner": "1",
+ "min_ram": 0
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-02-02T19:10:41Z",
+ "name": "natty-server-cloudimg-amd64",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/images/13",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/13",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-02T19:10:33Z",
+ "progress": 100,
+ "id": "13",
+ "metadata": {
+ "kernel_id": "12",
+ "min_disk": 0,
+ "min_ram": 0,
+ "owner": "1"
+ }
+ },
+ {
+ "status": "SAVING",
+ "updated": "2012-02-02T19:10:33Z",
+ "name": "natty-server-cloudimg-amd64-kernel",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/images/12",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/12",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-02T19:10:32Z",
+ "progress": 100,
+ "id": "12",
+ "metadata": {
+ "min_disk": 0,
+ "owner": "1",
+ "min_ram": 0
+ }
+ },
+ {
+ "status": "ERROR",
+ "updated": "2012-02-02T19:10:41Z",
+ "name": "natty-server-cloudimg-amd64",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/images/11",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/11",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-02T19:10:33Z",
+ "progress": 100,
+ "id": "11",
+ "metadata": {
+ "kernel_id": "12",
+ "min_disk": 0,
+ "min_ram": 0,
+ "owner": "1"
+ }
+ },
+ {
+ "status": "ERROR",
+ "updated": "2012-02-02T19:10:41Z",
+ "name": "natty-server-cloudimg-amd64",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/images/10",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/10",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-02T19:10:33Z",
+ "progress": 100,
+ "id": "10",
+ "metadata": {
+ "kernel_id": "12",
+ "min_disk": 0,
+ "min_ram": 0,
+ "owner": "1"
+ }
}
- }, {
- "status": "UNKNOWN",
- "updated": "2012-02-02T19:10:51Z",
- "name": "oneiric-server-cloudimg-amd64-kernel",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/images/14",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/images/14",
- "rel": "bookmark"
- }],
- "created": "2012-02-02T19:10:50Z",
- "progress": 100,
- "id": "14",
- "metadata": {
- "min_disk": 0,
- "owner": "1",
- "min_ram": 0
- }
- }, {
- "status": "ACTIVE",
- "updated": "2012-02-02T19:10:41Z",
- "name": "natty-server-cloudimg-amd64",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/images/13",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/images/13",
- "rel": "bookmark"
- }],
- "created": "2012-02-02T19:10:33Z",
- "progress": 100,
- "id": "13",
- "metadata": {
- "kernel_id": "12",
- "min_disk": 0,
- "min_ram": 0,
- "owner": "1"
- }
- }, {
- "status": "SAVING",
- "updated": "2012-02-02T19:10:33Z",
- "name": "natty-server-cloudimg-amd64-kernel",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/images/12",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/images/12",
- "rel": "bookmark"
- }],
- "created": "2012-02-02T19:10:32Z",
- "progress": 100,
- "id": "12",
- "metadata": {
- "min_disk": 0,
- "owner": "1",
- "min_ram": 0
- }
- }, {
- "status": "ERROR",
- "updated": "2012-02-02T19:10:41Z",
- "name": "natty-server-cloudimg-amd64",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/images/11",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/images/11",
- "rel": "bookmark"
- }],
- "created": "2012-02-02T19:10:33Z",
- "progress": 100,
- "id": "11",
- "metadata": {
- "kernel_id": "12",
- "min_disk": 0,
- "min_ram": 0,
- "owner": "1"
- }
- }, {
- "status": "ERROR",
- "updated": "2012-02-02T19:10:41Z",
- "name": "natty-server-cloudimg-amd64",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/images/10",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/images/10",
- "rel": "bookmark"
- }],
- "created": "2012-02-02T19:10:33Z",
- "progress": 100,
- "id": "10",
- "metadata": {
- "kernel_id": "12",
- "min_disk": 0,
- "min_ram": 0,
- "owner": "1"
- }
- }]
-}
\ No newline at end of file
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/image_list_detail_openstack.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/image_list_detail_openstack.json b/apis/openstack-nova/src/test/resources/image_list_detail_openstack.json
index f0575db..467522f 100644
--- a/apis/openstack-nova/src/test/resources/image_list_detail_openstack.json
+++ b/apis/openstack-nova/src/test/resources/image_list_detail_openstack.json
@@ -1,81 +1,98 @@
{
- "images": [{
- "status": "ACTIVE",
- "updated": "2012-02-02T19:11:00Z",
- "name": "oneiric-server-cloudimg-amd64",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/images/15",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/images/15",
- "rel": "bookmark"
- }],
- "created": "2012-02-02T19:10:52Z",
- "progress": 100,
- "id": "15",
- "metadata": {
- "kernel_id": "14",
- "min_disk": 0,
- "min_ram": 0,
- "owner": "1"
+ "images": [
+ {
+ "status": "ACTIVE",
+ "updated": "2012-02-02T19:11:00Z",
+ "name": "oneiric-server-cloudimg-amd64",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/images/15",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/15",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-02T19:10:52Z",
+ "progress": 100,
+ "id": "15",
+ "metadata": {
+ "kernel_id": "14",
+ "min_disk": 0,
+ "min_ram": 0,
+ "owner": "1"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-02-02T19:10:51Z",
+ "name": "oneiric-server-cloudimg-amd64-kernel",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/images/14",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/14",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-02T19:10:50Z",
+ "progress": 100,
+ "id": "14",
+ "metadata": {
+ "min_disk": 0,
+ "owner": "1",
+ "min_ram": 0
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-02-02T19:10:41Z",
+ "name": "natty-server-cloudimg-amd64",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/images/13",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/13",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-02T19:10:33Z",
+ "progress": 100,
+ "id": "13",
+ "metadata": {
+ "kernel_id": "12",
+ "min_disk": 0,
+ "min_ram": 0,
+ "owner": "1"
+ }
+ },
+ {
+ "status": "ACTIVE",
+ "updated": "2012-02-02T19:10:33Z",
+ "name": "natty-server-cloudimg-amd64-kernel",
+ "links": [
+ {
+ "href": "https://nova-api.openstack.org:9774/v2/37/images/12",
+ "rel": "self"
+ },
+ {
+ "href": "https://nova-api.openstack.org:9774/37/images/12",
+ "rel": "bookmark"
+ }
+ ],
+ "created": "2012-02-02T19:10:32Z",
+ "progress": 100,
+ "id": "12",
+ "metadata": {
+ "min_disk": 0,
+ "owner": "1",
+ "min_ram": 0
+ }
}
- }, {
- "status": "ACTIVE",
- "updated": "2012-02-02T19:10:51Z",
- "name": "oneiric-server-cloudimg-amd64-kernel",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/images/14",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/images/14",
- "rel": "bookmark"
- }],
- "created": "2012-02-02T19:10:50Z",
- "progress": 100,
- "id": "14",
- "metadata": {
- "min_disk": 0,
- "owner": "1",
- "min_ram": 0
- }
- }, {
- "status": "ACTIVE",
- "updated": "2012-02-02T19:10:41Z",
- "name": "natty-server-cloudimg-amd64",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/images/13",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/images/13",
- "rel": "bookmark"
- }],
- "created": "2012-02-02T19:10:33Z",
- "progress": 100,
- "id": "13",
- "metadata": {
- "kernel_id": "12",
- "min_disk": 0,
- "min_ram": 0,
- "owner": "1"
- }
- }, {
- "status": "ACTIVE",
- "updated": "2012-02-02T19:10:33Z",
- "name": "natty-server-cloudimg-amd64-kernel",
- "links": [{
- "href": "https://nova-api.openstack.org:9774/v1.1/37/images/12",
- "rel": "self"
- }, {
- "href": "https://nova-api.openstack.org:9774/37/images/12",
- "rel": "bookmark"
- }],
- "created": "2012-02-02T19:10:32Z",
- "progress": 100,
- "id": "12",
- "metadata": {
- "min_disk": 0,
- "owner": "1",
- "min_ram": 0
- }
- }]
-}
\ No newline at end of file
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/keypair_created_computeservice.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/keypair_created_computeservice.json b/apis/openstack-nova/src/test/resources/keypair_created_computeservice.json
index 7a3cef0..860ade5 100644
--- a/apis/openstack-nova/src/test/resources/keypair_created_computeservice.json
+++ b/apis/openstack-nova/src/test/resources/keypair_created_computeservice.json
@@ -6,4 +6,4 @@
"name": "jclouds-test-0",
"fingerprint": "d2:1f:c9:2b:d8:90:77:5f:15:64:27:e3:9f:77:1d:e4"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/keypair_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/keypair_details.json b/apis/openstack-nova/src/test/resources/keypair_details.json
index 188f929..a3fe167 100644
--- a/apis/openstack-nova/src/test/resources/keypair_details.json
+++ b/apis/openstack-nova/src/test/resources/keypair_details.json
@@ -6,4 +6,4 @@
"name": "testkeypair",
"fingerprint": "d2:1f:c9:2b:d8:90:77:5f:15:64:27:e3:9f:77:1d:e4"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/keypair_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/keypair_list.json b/apis/openstack-nova/src/test/resources/keypair_list.json
index 28040ab..b91ceb3 100644
--- a/apis/openstack-nova/src/test/resources/keypair_list.json
+++ b/apis/openstack-nova/src/test/resources/keypair_list.json
@@ -15,4 +15,4 @@
}
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/metadata_item.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/metadata_item.json b/apis/openstack-nova/src/test/resources/metadata_item.json
index f853109..62c4db5 100644
--- a/apis/openstack-nova/src/test/resources/metadata_item.json
+++ b/apis/openstack-nova/src/test/resources/metadata_item.json
@@ -1,5 +1,5 @@
-{
+{
"metadata": {
"Server Label": "Web Head 1"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/metadata_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/metadata_list.json b/apis/openstack-nova/src/test/resources/metadata_list.json
index 174d7d6..c67c1fb 100644
--- a/apis/openstack-nova/src/test/resources/metadata_list.json
+++ b/apis/openstack-nova/src/test/resources/metadata_list.json
@@ -1,6 +1,6 @@
-{
+{
"metadata": {
"Server Label": "Web Head 1",
"Image Version": "2.1"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/metadata_updated.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/metadata_updated.json b/apis/openstack-nova/src/test/resources/metadata_updated.json
index 82d9fd3..90f8940 100644
--- a/apis/openstack-nova/src/test/resources/metadata_updated.json
+++ b/apis/openstack-nova/src/test/resources/metadata_updated.json
@@ -1,7 +1,7 @@
-{
+{
"metadata": {
"Server Label": "Web Head 2",
"Image Version": "2.1",
"Server Description": "Simple Server"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/new_server.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/new_server.json b/apis/openstack-nova/src/test/resources/new_server.json
index 71fb1f2..af41c0b 100644
--- a/apis/openstack-nova/src/test/resources/new_server.json
+++ b/apis/openstack-nova/src/test/resources/new_server.json
@@ -5,21 +5,26 @@
"hostId": "",
"user_id": "54297837463082",
"name": "test-e92",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752",
- "rel": "self"
- }, {
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752",
- "rel": "bookmark"
- }],
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752",
+ "rel": "bookmark"
+ }
+ ],
"addresses": {},
"tenant_id": "37936628937291",
"image": {
"id": "1241",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1241",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1241",
+ "rel": "bookmark"
+ }
+ ]
},
"created": "2012-03-19T06:21:13Z",
"uuid": "47491020-6a78-4f63-9475-23195ac4515c",
@@ -29,13 +34,15 @@
"adminPass": "ZWuHcmTMQ7eXoHeM",
"flavor": {
"id": "100",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
+ "rel": "bookmark"
+ }
+ ]
},
"config_drive": "",
"id": 71752,
"metadata": {}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/new_server_disk_config_auto.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/new_server_disk_config_auto.json b/apis/openstack-nova/src/test/resources/new_server_disk_config_auto.json
index 7238333..ec2c2ee 100644
--- a/apis/openstack-nova/src/test/resources/new_server_disk_config_auto.json
+++ b/apis/openstack-nova/src/test/resources/new_server_disk_config_auto.json
@@ -5,21 +5,26 @@
"hostId": "",
"user_id": "54297837463082",
"name": "test-e92",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752",
- "rel": "self"
- }, {
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752",
- "rel": "bookmark"
- }],
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752",
+ "rel": "bookmark"
+ }
+ ],
"addresses": {},
"tenant_id": "37936628937291",
"image": {
"id": "1241",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1241",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1241",
+ "rel": "bookmark"
+ }
+ ]
},
"created": "2012-03-19T06:21:13Z",
"uuid": "47491020-6a78-4f63-9475-23195ac4515c",
@@ -29,14 +34,16 @@
"adminPass": "ZWuHcmTMQ7eXoHeM",
"flavor": {
"id": "100",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
+ "rel": "bookmark"
+ }
+ ]
},
"config_drive": "",
"id": 71752,
"metadata": {},
"OS-DCF:diskConfig": "AUTO"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/new_server_disk_config_manual.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/new_server_disk_config_manual.json b/apis/openstack-nova/src/test/resources/new_server_disk_config_manual.json
index 2cfba41..05f8d26 100644
--- a/apis/openstack-nova/src/test/resources/new_server_disk_config_manual.json
+++ b/apis/openstack-nova/src/test/resources/new_server_disk_config_manual.json
@@ -5,21 +5,26 @@
"hostId": "",
"user_id": "54297837463082",
"name": "test-e92",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752",
- "rel": "self"
- }, {
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752",
- "rel": "bookmark"
- }],
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752",
+ "rel": "bookmark"
+ }
+ ],
"addresses": {},
"tenant_id": "37936628937291",
"image": {
"id": "1241",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1241",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1241",
+ "rel": "bookmark"
+ }
+ ]
},
"created": "2012-03-19T06:21:13Z",
"uuid": "47491020-6a78-4f63-9475-23195ac4515c",
@@ -29,14 +34,16 @@
"adminPass": "ZWuHcmTMQ7eXoHeM",
"flavor": {
"id": "100",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
+ "rel": "bookmark"
+ }
+ ]
},
"config_drive": "",
"id": 71752,
"metadata": {},
"OS-DCF:diskConfig": "MANUAL"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/new_server_in_zone.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/new_server_in_zone.json b/apis/openstack-nova/src/test/resources/new_server_in_zone.json
index 71fb1f2..af41c0b 100644
--- a/apis/openstack-nova/src/test/resources/new_server_in_zone.json
+++ b/apis/openstack-nova/src/test/resources/new_server_in_zone.json
@@ -5,21 +5,26 @@
"hostId": "",
"user_id": "54297837463082",
"name": "test-e92",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752",
- "rel": "self"
- }, {
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752",
- "rel": "bookmark"
- }],
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752",
+ "rel": "self"
+ },
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752",
+ "rel": "bookmark"
+ }
+ ],
"addresses": {},
"tenant_id": "37936628937291",
"image": {
"id": "1241",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1241",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/images/1241",
+ "rel": "bookmark"
+ }
+ ]
},
"created": "2012-03-19T06:21:13Z",
"uuid": "47491020-6a78-4f63-9475-23195ac4515c",
@@ -29,13 +34,15 @@
"adminPass": "ZWuHcmTMQ7eXoHeM",
"flavor": {
"id": "100",
- "links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
- "rel": "bookmark"
- }]
+ "links": [
+ {
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100",
+ "rel": "bookmark"
+ }
+ ]
},
"config_drive": "",
"id": 71752,
"metadata": {}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/new_server_networks_response.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/new_server_networks_response.json b/apis/openstack-nova/src/test/resources/new_server_networks_response.json
index 7238333..1e0568a 100644
--- a/apis/openstack-nova/src/test/resources/new_server_networks_response.json
+++ b/apis/openstack-nova/src/test/resources/new_server_networks_response.json
@@ -6,7 +6,7 @@
"user_id": "54297837463082",
"name": "test-e92",
"links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752",
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752",
"rel": "self"
}, {
"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752",
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/new_server_no_adminpass.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/new_server_no_adminpass.json b/apis/openstack-nova/src/test/resources/new_server_no_adminpass.json
index a89e48f..5a97cab 100644
--- a/apis/openstack-nova/src/test/resources/new_server_no_adminpass.json
+++ b/apis/openstack-nova/src/test/resources/new_server_no_adminpass.json
@@ -6,7 +6,7 @@
"user_id": "54297837463082",
"name": "test-e92",
"links": [{
- "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752",
+ "href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752",
"rel": "self"
}, {
"href": "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752",
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/quotas.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/quotas.json b/apis/openstack-nova/src/test/resources/quotas.json
index dcf2869..c7fa803 100644
--- a/apis/openstack-nova/src/test/resources/quotas.json
+++ b/apis/openstack-nova/src/test/resources/quotas.json
@@ -1,15 +1,17 @@
-{"quota_set": {
- "metadata_items": 128,
- "injected_file_content_bytes": 10240,
- "injected_files": 5,
- "gigabytes": 1000,
- "ram": 51200,
- "floating_ips": 10,
- "security_group_rules": 20,
- "instances": 10,
- "key_pairs": 100,
- "volumes": 10,
- "cores": 20,
- "id": "demo",
- "security_groups": 10
-}}
\ No newline at end of file
+{
+ "quota_set": {
+ "metadata_items": 128,
+ "injected_file_content_bytes": 10240,
+ "injected_files": 5,
+ "gigabytes": 1000,
+ "ram": 51200,
+ "floating_ips": 10,
+ "security_group_rules": 20,
+ "instances": 10,
+ "key_pairs": 100,
+ "volumes": 10,
+ "cores": 20,
+ "id": "demo",
+ "security_groups": 10
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygroup_created.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygroup_created.json b/apis/openstack-nova/src/test/resources/securitygroup_created.json
index fee9b4d..8cdc34a 100644
--- a/apis/openstack-nova/src/test/resources/securitygroup_created.json
+++ b/apis/openstack-nova/src/test/resources/securitygroup_created.json
@@ -1,9 +1,9 @@
{
"security_group": {
- "rules": [ ],
+ "rules": [],
"tenant_id": "dev_16767499955063",
"id": 160,
"name": "jclouds-test",
"description": "jclouds-test"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygroup_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygroup_details.json b/apis/openstack-nova/src/test/resources/securitygroup_details.json
index 840de6c..8c31735 100644
--- a/apis/openstack-nova/src/test/resources/securitygroup_details.json
+++ b/apis/openstack-nova/src/test/resources/securitygroup_details.json
@@ -1,8 +1,7 @@
{
- "security_group":
- {
- "rules": [
- {
+ "security_group": {
+ "rules": [
+ {
"from_port": 22,
"group": {},
"ip_protocol": "tcp",
@@ -10,25 +9,25 @@
"parent_group_id": 28,
"ip_range": {
"cidr": "10.2.6.0/24"
- },
- "id": 108
- },
- {
- "from_port": 22,
- "group": {
- "tenant_id": "admin",
- "name": "11111"
- },
- "ip_protocol": "tcp",
- "to_port": 22,
- "parent_group_id": 28,
- "ip_range": {},
- "id": 109
- }
- ],
- "tenant_id": "tenant0",
- "id": 0,
- "name": "name0",
- "description": "description0"
- }
-}
\ No newline at end of file
+ },
+ "id": 108
+ },
+ {
+ "from_port": 22,
+ "group": {
+ "tenant_id": "admin",
+ "name": "11111"
+ },
+ "ip_protocol": "tcp",
+ "to_port": 22,
+ "parent_group_id": 28,
+ "ip_range": {},
+ "id": 109
+ }
+ ],
+ "tenant_id": "tenant0",
+ "id": 0,
+ "name": "name0",
+ "description": "description0"
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygroup_details_computeservice_typical.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygroup_details_computeservice_typical.json b/apis/openstack-nova/src/test/resources/securitygroup_details_computeservice_typical.json
index 0da1902..248bc5c 100644
--- a/apis/openstack-nova/src/test/resources/securitygroup_details_computeservice_typical.json
+++ b/apis/openstack-nova/src/test/resources/securitygroup_details_computeservice_typical.json
@@ -1,51 +1,56 @@
{
"security_group": {
- "rules": [{
- "from_port": 22,
- "group": {},
- "ip_protocol": "tcp",
- "to_port": 22,
- "parent_group_id": 2769,
- "ip_range": {
- "cidr": "0.0.0.0/0"
+ "rules": [
+ {
+ "from_port": 22,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 22,
+ "parent_group_id": 2769,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 10331
},
- "id": 10331
- }, {
- "from_port": 22,
- "group": {
- "tenant_id": "37936628937291",
- "name": "jclouds_mygroup"
+ {
+ "from_port": 22,
+ "group": {
+ "tenant_id": "37936628937291",
+ "name": "jclouds_mygroup"
+ },
+ "ip_protocol": "tcp",
+ "to_port": 22,
+ "parent_group_id": 2769,
+ "ip_range": {},
+ "id": 10332
},
- "ip_protocol": "tcp",
- "to_port": 22,
- "parent_group_id": 2769,
- "ip_range": {},
- "id": 10332
- }, {
- "from_port": 8080,
- "group": {},
- "ip_protocol": "tcp",
- "to_port": 8080,
- "parent_group_id": 2769,
- "ip_range": {
- "cidr": "0.0.0.0/0"
+ {
+ "from_port": 8080,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 8080,
+ "parent_group_id": 2769,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 10333
},
- "id": 10333
- }, {
- "from_port": 8080,
- "group": {
- "tenant_id": "37936628937291",
- "name": "jclouds_mygroup"
- },
- "ip_protocol": "tcp",
- "to_port": 8080,
- "parent_group_id": 2769,
- "ip_range": {},
- "id": 10334
- }],
+ {
+ "from_port": 8080,
+ "group": {
+ "tenant_id": "37936628937291",
+ "name": "jclouds_mygroup"
+ },
+ "ip_protocol": "tcp",
+ "to_port": 8080,
+ "parent_group_id": 2769,
+ "ip_range": {},
+ "id": 10334
+ }
+ ],
"tenant_id": "37936628937291",
"id": 2769,
"name": "jclouds_mygroup",
"description": "jclouds_mygroup"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygroup_details_extension.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygroup_details_extension.json b/apis/openstack-nova/src/test/resources/securitygroup_details_extension.json
index 0c5b316..73156c8 100644
--- a/apis/openstack-nova/src/test/resources/securitygroup_details_extension.json
+++ b/apis/openstack-nova/src/test/resources/securitygroup_details_extension.json
@@ -1,8 +1,7 @@
{
- "security_group":
- {
- "rules": [
- {
+ "security_group": {
+ "rules": [
+ {
"from_port": 22,
"group": {},
"ip_protocol": "tcp",
@@ -10,25 +9,25 @@
"parent_group_id": 160,
"ip_range": {
"cidr": "10.2.6.0/24"
- },
- "id": 108
- },
- {
- "from_port": 22,
- "group": {
- "tenant_id": "tenant0",
- "name": "name0"
- },
- "ip_protocol": "tcp",
- "to_port": 22,
- "parent_group_id": 160,
- "ip_range": {},
- "id": 109
- }
- ],
- "tenant_id": "tenant0",
- "id": 160,
- "name": "name0",
- "description": "description0"
- }
-}
\ No newline at end of file
+ },
+ "id": 108
+ },
+ {
+ "from_port": 22,
+ "group": {
+ "tenant_id": "tenant0",
+ "name": "name0"
+ },
+ "ip_protocol": "tcp",
+ "to_port": 22,
+ "parent_group_id": 160,
+ "ip_range": {},
+ "id": 109
+ }
+ ],
+ "tenant_id": "tenant0",
+ "id": 160,
+ "name": "name0",
+ "description": "description0"
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygroup_details_extension_norules.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygroup_details_extension_norules.json b/apis/openstack-nova/src/test/resources/securitygroup_details_extension_norules.json
index 27aca88..22e2508 100644
--- a/apis/openstack-nova/src/test/resources/securitygroup_details_extension_norules.json
+++ b/apis/openstack-nova/src/test/resources/securitygroup_details_extension_norules.json
@@ -1,10 +1,9 @@
{
- "security_group":
- {
- "rules": [],
- "tenant_id": "tenant0",
- "id": 160,
- "name": "name0",
- "description": "description0"
- }
-}
\ No newline at end of file
+ "security_group": {
+ "rules": [],
+ "tenant_id": "tenant0",
+ "id": 160,
+ "name": "name0",
+ "description": "description0"
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygroup_details_port22.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygroup_details_port22.json b/apis/openstack-nova/src/test/resources/securitygroup_details_port22.json
index 5ee82bc..75ee674 100644
--- a/apis/openstack-nova/src/test/resources/securitygroup_details_port22.json
+++ b/apis/openstack-nova/src/test/resources/securitygroup_details_port22.json
@@ -1,19 +1,21 @@
{
"security_group": {
- "rules": [{
- "from_port": 22,
- "group": {},
- "ip_protocol": "tcp",
- "to_port": 22,
- "parent_group_id": 2769,
- "ip_range": {
- "cidr": "0.0.0.0/0"
- },
- "id": 10331
- }],
+ "rules": [
+ {
+ "from_port": 22,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 22,
+ "parent_group_id": 2769,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 10331
+ }
+ ],
"tenant_id": "37936628937291",
"id": 2769,
"name": "jclouds-test",
"description": "jclouds-test"
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygroup_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygroup_list.json b/apis/openstack-nova/src/test/resources/securitygroup_list.json
index b5a1ed1..99de86c 100644
--- a/apis/openstack-nova/src/test/resources/securitygroup_list.json
+++ b/apis/openstack-nova/src/test/resources/securitygroup_list.json
@@ -1,51 +1,45 @@
{
- "security_groups":[
- {
- "rules":[
+ "security_groups": [
{
- "from_port":22,
- "group":{
-
- },
- "ip_protocol":"tcp",
- "to_port":22,
- "parent_group_id":3,
- "ip_range":{
- "cidr":"0.0.0.0/0"
- },
- "id":107
- },
- {
- "from_port":7600,
- "group":{
-
- },
- "ip_protocol":"tcp",
- "to_port":7600,
- "parent_group_id":3,
- "ip_range":{
- "cidr":"0.0.0.0/0"
- },
- "id":118
- },
- {
- "from_port":8084,
- "group":{
-
- },
- "ip_protocol":"tcp",
- "to_port":8084,
- "parent_group_id":3,
- "ip_range":{
- "cidr":"0.0.0.0/0"
- },
- "id":119
+ "rules": [
+ {
+ "from_port": 22,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 22,
+ "parent_group_id": 3,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 107
+ },
+ {
+ "from_port": 7600,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 7600,
+ "parent_group_id": 3,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 118
+ },
+ {
+ "from_port": 8084,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 8084,
+ "parent_group_id": 3,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 119
+ }
+ ],
+ "tenant_id": "tenant1",
+ "id": 1,
+ "name": "name1",
+ "description": "description1"
}
- ],
- "tenant_id":"tenant1",
- "id":1,
- "name":"name1",
- "description":"description1"
- }
- ]
-}
\ No newline at end of file
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygroup_list_details_computeservice_typical.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygroup_list_details_computeservice_typical.json b/apis/openstack-nova/src/test/resources/securitygroup_list_details_computeservice_typical.json
index 7e58c51..2e76223 100644
--- a/apis/openstack-nova/src/test/resources/securitygroup_list_details_computeservice_typical.json
+++ b/apis/openstack-nova/src/test/resources/securitygroup_list_details_computeservice_typical.json
@@ -1,53 +1,58 @@
{
- "security_groups":[
- {
- "rules": [{
- "from_port": 22,
- "group": {},
- "ip_protocol": "tcp",
- "to_port": 22,
- "parent_group_id": 2769,
- "ip_range": {
- "cidr": "0.0.0.0/0"
- },
- "id": 10331
- }, {
- "from_port": 22,
- "group": {
- "tenant_id": "37936628937291",
- "name": "jclouds_mygroup"
- },
- "ip_protocol": "tcp",
- "to_port": 22,
- "parent_group_id": 2769,
- "ip_range": {},
- "id": 10332
- }, {
- "from_port": 8080,
- "group": {},
- "ip_protocol": "tcp",
- "to_port": 8080,
- "parent_group_id": 2769,
- "ip_range": {
- "cidr": "0.0.0.0/0"
- },
- "id": 10333
- }, {
- "from_port": 8080,
- "group": {
- "tenant_id": "37936628937291",
- "name": "jclouds_mygroup"
- },
- "ip_protocol": "tcp",
- "to_port": 8080,
- "parent_group_id": 2769,
- "ip_range": {},
- "id": 10334
- }],
- "tenant_id": "37936628937291",
- "id": 2769,
- "name": "jclouds_mygroup",
- "description": "jclouds_mygroup"
- }
- ]
-}
\ No newline at end of file
+ "security_groups": [
+ {
+ "rules": [
+ {
+ "from_port": 22,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 22,
+ "parent_group_id": 2769,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 10331
+ },
+ {
+ "from_port": 22,
+ "group": {
+ "tenant_id": "37936628937291",
+ "name": "jclouds_mygroup"
+ },
+ "ip_protocol": "tcp",
+ "to_port": 22,
+ "parent_group_id": 2769,
+ "ip_range": {},
+ "id": 10332
+ },
+ {
+ "from_port": 8080,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 8080,
+ "parent_group_id": 2769,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 10333
+ },
+ {
+ "from_port": 8080,
+ "group": {
+ "tenant_id": "37936628937291",
+ "name": "jclouds_mygroup"
+ },
+ "ip_protocol": "tcp",
+ "to_port": 8080,
+ "parent_group_id": 2769,
+ "ip_range": {},
+ "id": 10334
+ }
+ ],
+ "tenant_id": "37936628937291",
+ "id": 2769,
+ "name": "jclouds_mygroup",
+ "description": "jclouds_mygroup"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygroup_list_extension.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygroup_list_extension.json b/apis/openstack-nova/src/test/resources/securitygroup_list_extension.json
index 4a19a36..e90f5b5 100644
--- a/apis/openstack-nova/src/test/resources/securitygroup_list_extension.json
+++ b/apis/openstack-nova/src/test/resources/securitygroup_list_extension.json
@@ -1,51 +1,45 @@
{
- "security_groups":[
- {
- "rules":[
+ "security_groups": [
{
- "from_port":22,
- "group":{
-
- },
- "ip_protocol":"tcp",
- "to_port":22,
- "parent_group_id":3,
- "ip_range":{
- "cidr":"0.0.0.0/0"
- },
- "id":107
- },
- {
- "from_port":7600,
- "group":{
-
- },
- "ip_protocol":"tcp",
- "to_port":7600,
- "parent_group_id":3,
- "ip_range":{
- "cidr":"0.0.0.0/0"
- },
- "id":118
- },
- {
- "from_port":8084,
- "group":{
-
- },
- "ip_protocol":"tcp",
- "to_port":8084,
- "parent_group_id":3,
- "ip_range":{
- "cidr":"0.0.0.0/0"
- },
- "id":119
+ "rules": [
+ {
+ "from_port": 22,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 22,
+ "parent_group_id": 3,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 107
+ },
+ {
+ "from_port": 7600,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 7600,
+ "parent_group_id": 3,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 118
+ },
+ {
+ "from_port": 8084,
+ "group": {},
+ "ip_protocol": "tcp",
+ "to_port": 8084,
+ "parent_group_id": 3,
+ "ip_range": {
+ "cidr": "0.0.0.0/0"
+ },
+ "id": 119
+ }
+ ],
+ "tenant_id": "tenant0",
+ "id": 160,
+ "name": "name0",
+ "description": "description0"
}
- ],
- "tenant_id": "tenant0",
- "id": 160,
- "name": "name0",
- "description": "description0"
- }
- ]
-}
\ No newline at end of file
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygrouprule_created.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygrouprule_created.json b/apis/openstack-nova/src/test/resources/securitygrouprule_created.json
index 1e8b9fd..d32bdeb 100644
--- a/apis/openstack-nova/src/test/resources/securitygrouprule_created.json
+++ b/apis/openstack-nova/src/test/resources/securitygrouprule_created.json
@@ -8,5 +8,6 @@
"ip_range": {
"cidr": "0.0.0.0/0"
},
- "id": 218 }
-}
\ No newline at end of file
+ "id": 218
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygrouprule_created_cidr.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygrouprule_created_cidr.json b/apis/openstack-nova/src/test/resources/securitygrouprule_created_cidr.json
index cc91ac7..68fc9ac 100644
--- a/apis/openstack-nova/src/test/resources/securitygrouprule_created_cidr.json
+++ b/apis/openstack-nova/src/test/resources/securitygrouprule_created_cidr.json
@@ -10,4 +10,4 @@
},
"id": 108
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/securitygrouprule_created_group.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/securitygrouprule_created_group.json b/apis/openstack-nova/src/test/resources/securitygrouprule_created_group.json
index ff17bcd..0dfbb34 100644
--- a/apis/openstack-nova/src/test/resources/securitygrouprule_created_group.json
+++ b/apis/openstack-nova/src/test/resources/securitygrouprule_created_group.json
@@ -11,4 +11,4 @@
"ip_range": {},
"id": 109
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/server_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/server_details.json b/apis/openstack-nova/src/test/resources/server_details.json
index 158d779..8217b86 100644
--- a/apis/openstack-nova/src/test/resources/server_details.json
+++ b/apis/openstack-nova/src/test/resources/server_details.json
@@ -7,17 +7,17 @@
"updated": "2010-10-10T12:00:00Z",
"created": "2010-08-10T12:00:00Z",
"hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
- "accessIPv4" : "67.23.10.132",
- "accessIPv6" : "::babe:67.23.10.132",
+ "accessIPv4": "67.23.10.132",
+ "accessIPv6": "::babe:67.23.10.132",
"status": "BUILD(scheduling)",
"progress": 60,
"OS-DCF:diskConfig": "AUTO",
- "image" : {
+ "image": {
"id": "52415800-8b69-11e0-9b19-734f6f006e54",
"links": [
{
"rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
+ "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
},
{
"rel": "bookmark",
@@ -25,12 +25,12 @@
}
]
},
- "flavor" : {
+ "flavor": {
"id": "52415800-8b69-11e0-9b19-734f216543fd",
"links": [
{
"rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
+ "href": "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
},
{
"rel": "bookmark",
@@ -38,8 +38,8 @@
}
]
},
- "addresses": {
- "public" : [
+ "addresses": {
+ "public": [
{
"version": 4,
"addr": "67.23.10.132"
@@ -57,7 +57,7 @@
"addr": "::babe:4317:0A83"
}
],
- "private" : [
+ "private": [
{
"version": 4,
"addr": "10.176.42.16"
@@ -73,14 +73,14 @@
"Image Version": "2.1"
},
"links": [
- {
- "rel": "self",
- "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6f006e54"
- },
- {
- "rel": "bookmark",
- "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6f006e54"
- }
- ]
+ {
+ "rel": "self",
+ "href": "http://servers.api.openstack.org/v2/1234/servers/71752"
+ },
+ {
+ "rel": "bookmark",
+ "href": "http://servers.api.openstack.org/1234/servers/71752"
+ }
+ ]
}
-}
\ No newline at end of file
+}
[5/6] JCLOUDS-554: Update Nova default API to v2
Posted by jd...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java
index f09000b..eb1009a 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApiExpectTest.java
@@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableMap;
public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest {
public void testGetAllExtraSpecs() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/9/os-extra_specs");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/9/os-extra_specs");
FlavorExtraSpecsApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -50,7 +50,7 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetAllExtraSpecsFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/9/os-extra_specs");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/9/os-extra_specs");
FlavorExtraSpecsApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -62,7 +62,7 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testSetAllExtraSpecs() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/9/os-extra_specs");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/9/os-extra_specs");
FlavorExtraSpecsApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -76,7 +76,7 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testSetExtraSpec() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/5/os-extra_specs/test1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/5/os-extra_specs/test1");
FlavorExtraSpecsApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -90,7 +90,7 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetExtraSpec() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/5/os-extra_specs/test1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/5/os-extra_specs/test1");
FlavorExtraSpecsApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -102,7 +102,7 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetExtraSpecFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/5/os-extra_specs/test1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/5/os-extra_specs/test1");
FlavorExtraSpecsApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -114,7 +114,7 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteExtraSpec() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/5/os-extra_specs/test1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/5/os-extra_specs/test1");
FlavorExtraSpecsApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -126,7 +126,7 @@ public class FlavorExtraSpecsApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteExtraSpecFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/5/os-extra_specs/test1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/5/os-extra_specs/test1");
FlavorExtraSpecsApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApiExpectTest.java
index 851abcd..4647c41 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApiExpectTest.java
@@ -62,7 +62,7 @@ public class FloatingIPApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest list = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -82,7 +82,7 @@ public class FloatingIPApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest list = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -98,7 +98,7 @@ public class FloatingIPApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest get = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips/1")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips/1")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -116,7 +116,7 @@ public class FloatingIPApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest get = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips/1")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips/1")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -132,7 +132,7 @@ public class FloatingIPApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest createFloatingIP = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType("{}", "application/json")).build();
@@ -153,7 +153,7 @@ public class FloatingIPApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest createFloatingIP = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType("{}", "application/json")).build();
@@ -171,7 +171,7 @@ public class FloatingIPApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest createFloatingIP = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType("{\"pool\":\"myPool\"}", "application/json")).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java
index b7cecf2..3b3f01f 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java
@@ -44,7 +44,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
public void testList() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts");
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("GET")
@@ -64,7 +64,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGet() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/xyz");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/xyz");
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("GET")
@@ -84,7 +84,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
}
public void testEnableHost() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu");
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("PUT")
@@ -100,7 +100,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = ResourceNotFoundException.class)
public void testEnableHostFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu");
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("PUT")
@@ -114,7 +114,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
}
public void testEnableHostFailNotEnabled() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu");
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("PUT")
@@ -129,7 +129,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDisableHost() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu");
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("PUT")
@@ -144,7 +144,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
}
public void testStartMaintenance() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu");
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("PUT")
@@ -159,7 +159,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
}
public void testStopMaintenance() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu");
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("PUT")
@@ -177,7 +177,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu/startup")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu/startup")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build(),
HttpResponse.builder().statusCode(200)
@@ -191,7 +191,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu/startup")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu/startup")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build(),
HttpResponse.builder().statusCode(404).build()).getHostAdministrationExtensionForZone("az-1.region-a.geo-1").get();
@@ -202,7 +202,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu/startup")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu/startup")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build(),
HttpResponse.builder().statusCode(200)
@@ -215,7 +215,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu/shutdown")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu/shutdown")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build(),
HttpResponse.builder().statusCode(200)
@@ -228,7 +228,7 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest {
HostAdministrationApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-hosts/ubuntu/reboot")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-hosts/ubuntu/reboot")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build(),
HttpResponse.builder().statusCode(200)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java
index 638ae3a..8e192c1 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java
@@ -43,7 +43,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
private DateService dateService = new SimpleDateFormatDateService();
public void testList() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
@@ -55,7 +55,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGet() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
@@ -66,7 +66,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
@@ -76,7 +76,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
}
public void testCreateAggregate() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
@@ -89,7 +89,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteAggregate() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
@@ -99,7 +99,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteAggregateFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
@@ -109,7 +109,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
}
public void testUpdateName() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
@@ -120,7 +120,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
}
public void testUpdateAvailabilityZone() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
@@ -131,7 +131,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
}
public void testAddHost() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1/action");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
@@ -142,7 +142,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
}
public void testRemoveHost() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1/action");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
@@ -154,7 +154,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
public void testSetMetadata() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-aggregates/1/action");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-aggregates/1/action");
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java
index 5a5a007..ea04fbe 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java
@@ -40,7 +40,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest list = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-keypairs")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-keypairs")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -61,7 +61,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest list = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-keypairs")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-keypairs")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -78,7 +78,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest create = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-keypairs")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-keypairs")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType("{\"keypair\":{\"name\":\"testkeypair\"}}", "application/json"))
@@ -99,7 +99,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest create = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-keypairs")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-keypairs")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -127,7 +127,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest delete = HttpRequest
.builder()
.method("DELETE")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-keypairs/testkeypair")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-keypairs/testkeypair")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -143,7 +143,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest get = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-keypairs/testkeypair")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-keypairs/testkeypair")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -161,7 +161,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest get = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-keypairs/testkeypair")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-keypairs/testkeypair")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java
index 9c35378..fe876aa 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java
@@ -38,7 +38,7 @@ import org.testng.annotations.Test;
public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
public void testGetQuotas() throws Exception {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-quota-sets/demo");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo");
QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
@@ -48,7 +48,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetQuotasFailsTenantNotFound() throws Exception {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-quota-sets/demo");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo");
QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
@@ -57,7 +57,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetDefaultQuotas() throws Exception {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-quota-sets/demo/defaults");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo/defaults");
QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
@@ -67,7 +67,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetDefaultQuotasFailsTenantNotFound() throws Exception {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-quota-sets/demo/defaults");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo/defaults");
QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
@@ -77,7 +77,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
public void testUpdateQuotas() throws Exception {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-quota-sets/demo");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo");
QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().endpoint(endpoint).method("PUT")
@@ -92,7 +92,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = ResourceNotFoundException.class)
public void testUpdateQuotasFailsNotFound() throws Exception {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-quota-sets/demo");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-quota-sets/demo");
QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().endpoint(endpoint).method("PUT")
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java
index b3ceb6d..fe692ba 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java
@@ -44,7 +44,7 @@ import com.google.common.collect.ImmutableSet;
public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
public void testListSecurityGroupsWhenResponseIs2xx() throws Exception {
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -63,7 +63,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
public void testListSecurityGroupsWhenReponseIs404IsEmpty() throws Exception {
HttpRequest listListSecurityGroups = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -80,7 +80,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
public void testGetSecurityGroupWhenResponseIs2xx() throws Exception {
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/0")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/0")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -97,7 +97,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
public void testGetSecurityGroupWhenResponseIs404() throws Exception {
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/0")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/0")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -114,7 +114,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
public void testCreateSecurityGroupWhenResponseIs2xx() throws Exception {
HttpRequest create = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build())
.payload(
@@ -136,7 +136,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
public void testDeleteSecurityGroupWhenResponseIs2xx() throws Exception {
HttpRequest delete = HttpRequest.builder().method("DELETE").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/160"))
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160"))
.headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json")
.put("X-Auth-Token", authToken).build()).build();
@@ -156,7 +156,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest createRule = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -181,7 +181,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest createRule = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(
@@ -204,7 +204,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
public void testDeleteSecurityGroupRuleWhenResponseIs2xx() throws Exception {
HttpRequest deleteRule = HttpRequest.builder().method("DELETE").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules/161"))
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules/161"))
.headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json")
.put("X-Auth-Token", authToken).build()).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java
index 6c67d2f..d770a05 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java
@@ -35,7 +35,7 @@ import com.google.common.collect.ImmutableSet;
public class ServerWithSecurityGroupsApiExpectTest extends BaseNovaApiExpectTest {
public void testGetServerWithSecurityGroups() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-create-server-ext/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-create-server-ext/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb");
ServerWithSecurityGroupsApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -49,7 +49,7 @@ public class ServerWithSecurityGroupsApiExpectTest extends BaseNovaApiExpectTest
}
public void testGetServerWithSecurityGroupsFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-create-server-ext/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-create-server-ext/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb");
ServerWithSecurityGroupsApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java
index 8a4b5c6..d04dd8e 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java
@@ -43,7 +43,7 @@ public class SimpleTenantUsageApiExpectTest extends BaseNovaApiExpectTest {
private DateService dateService = new SimpleDateFormatDateService();
public void testList() throws Exception {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-simple-tenant-usage");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-simple-tenant-usage");
SimpleTenantUsageApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("GET")
@@ -69,7 +69,7 @@ public class SimpleTenantUsageApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGet() throws Exception {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-simple-tenant-usage/test-1234");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-simple-tenant-usage/test-1234");
SimpleTenantUsageApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
HttpRequest.builder().method("GET")
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java
index 28a9bb9..1e68dba 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java
@@ -35,7 +35,7 @@ import com.google.common.collect.Iterables;
public class VirtualInterfaceApiExpectTest extends BaseNovaApiExpectTest {
public void testListVirtualInterfaces() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/os-virtual-interfaces");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/os-virtual-interfaces");
VirtualInterfaceApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -49,7 +49,7 @@ public class VirtualInterfaceApiExpectTest extends BaseNovaApiExpectTest {
}
public void testListVirtualInterfacesFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/1/os-virtual-interfaces");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/1/os-virtual-interfaces");
VirtualInterfaceApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
index 403f722..e2ba73d 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
@@ -50,7 +50,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
private DateService dateService = new SimpleDateFormatDateService();
public void testListVolumes() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volumes");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -63,7 +63,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testListVolumesFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volumes");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -76,7 +76,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testListVolumesInDetail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volumes/detail");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/detail");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -89,7 +89,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testListVolumesInDetailFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volumes/detail");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/detail");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -102,7 +102,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testCreateVolume() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volumes");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -119,7 +119,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = ResourceNotFoundException.class)
public void testCreateVolumeFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volumes");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -135,7 +135,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetVolume() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volumes/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -155,7 +155,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetVolumeFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volumes/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -167,7 +167,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteVolume() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volumes/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -179,7 +179,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteVolumeFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volumes/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -191,7 +191,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testListAttachments() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -211,7 +211,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = AuthorizationException.class)
public void testListAttachmentsFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-2/os-volume_attachments");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-2/os-volume_attachments");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -223,7 +223,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetAttachment() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -236,7 +236,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetAttachmentFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -248,7 +248,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testAttachVolume() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -263,7 +263,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = ResourceNotFoundException.class)
public void testAttachVolumeFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -276,7 +276,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDetachVolume() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -288,7 +288,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDetachVolumeFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -300,7 +300,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testListSnapshots() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-snapshots");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -313,7 +313,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testListSnapshotsFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-snapshots");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -326,7 +326,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetSnapshot() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-snapshots/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -339,7 +339,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetSnapshotFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-snapshots/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -351,7 +351,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testListSnapshotsInDetail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-snapshots/detail");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/detail");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -373,7 +373,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testListSnapshotsInDetailFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-snapshots/detail");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/detail");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -386,7 +386,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testCreateSnapshot() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-snapshots");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -403,7 +403,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = AuthorizationException.class)
public void testCreateSnapshotFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-snapshots");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -418,7 +418,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteSnapshot() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-snapshots/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -431,7 +431,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = AuthorizationException.class)
public void testDeleteSnapshotFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-snapshots/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots/1");
VolumeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
index 2820c17..57be07c 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
@@ -47,7 +47,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
private DateService dateService = new SimpleDateFormatDateService();
public void testListAttachments() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments");
VolumeAttachmentApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -67,7 +67,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = AuthorizationException.class)
public void testListAttachmentsFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-2/os-volume_attachments");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-2/os-volume_attachments");
VolumeAttachmentApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -79,7 +79,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetAttachment() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments/1");
VolumeAttachmentApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -92,7 +92,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetAttachmentFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments/1");
VolumeAttachmentApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -104,7 +104,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
}
public void testAttachVolume() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments");
VolumeAttachmentApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -119,7 +119,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
@Test(expectedExceptions = ResourceNotFoundException.class)
public void testAttachVolumeFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments");
VolumeAttachmentApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -132,7 +132,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDetachVolume() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments/1");
VolumeAttachmentApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -144,7 +144,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDetachVolumeFail() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/instance-1/os-volume_attachments/1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments/1");
VolumeAttachmentApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java
index ef7dba0..2e84833 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java
@@ -45,7 +45,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
private DateService dateService = new SimpleDateFormatDateService();
public void testListVolumeTypes() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -58,7 +58,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetVolumeType() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/8");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/8");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -71,7 +71,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetVolumeTypeFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/8");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/8");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -83,7 +83,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testCreateVolumeType() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -98,7 +98,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testCreateVolumeTypeWithOptsNONE() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -113,7 +113,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testCreateVolumeTypeWithOptsSet() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -128,7 +128,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteVolumeType() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/8");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/8");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -140,7 +140,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteVolumeTypeFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/8");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/8");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -152,7 +152,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetAllExtraSpecs() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/9/extra_specs");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/9/extra_specs");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -164,7 +164,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetAllExtraSpecsFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/9/extra_specs");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/9/extra_specs");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -176,7 +176,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testSetAllExtraSpecs() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/9/extra_specs");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/9/extra_specs");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -190,7 +190,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testSetExtraSpec() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/5/extra_specs/test1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/5/extra_specs/test1");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -204,7 +204,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetExtraSpec() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/5/extra_specs/test1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/5/extra_specs/test1");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -216,7 +216,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testGetExtraSpecFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/5/extra_specs/test1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/5/extra_specs/test1");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -228,7 +228,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteExtraSpec() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/5/extra_specs/test1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/5/extra_specs/test1");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
@@ -240,7 +240,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
}
public void testDeleteExtraSpecFailNotFound() {
- URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-volume-types/5/extra_specs/test1");
+ URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volume-types/5/extra_specs/test1");
VolumeTypeApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ExtensionApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ExtensionApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ExtensionApiExpectTest.java
index 49a8920..8c58fa3 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ExtensionApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ExtensionApiExpectTest.java
@@ -39,7 +39,7 @@ public class ExtensionApiExpectTest extends BaseNovaApiExpectTest {
public void testListExtensionsWhenResponseIs2xx() throws Exception {
HttpRequest listExtensions = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/extensions")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/extensions")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -59,7 +59,7 @@ public class ExtensionApiExpectTest extends BaseNovaApiExpectTest {
public void testListExtensionsWhenReponseIs404IsEmpty() throws Exception {
HttpRequest listExtensions = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/extensions")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/extensions")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -76,7 +76,7 @@ public class ExtensionApiExpectTest extends BaseNovaApiExpectTest {
public void testGetExtensionByAliasWhenResponseIs2xx() throws Exception {
HttpRequest getExtension = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/extensions/RS-PIE")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/extensions/RS-PIE")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -94,7 +94,7 @@ public class ExtensionApiExpectTest extends BaseNovaApiExpectTest {
public void testGetExtensionByAliasWhenResponseIs404() throws Exception {
HttpRequest getExtension = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/extensions/RS-PIE")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/extensions/RS-PIE")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/FlavorApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/FlavorApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/FlavorApiExpectTest.java
index 91c1b9f..c52e9b5 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/FlavorApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/FlavorApiExpectTest.java
@@ -45,7 +45,7 @@ public class FlavorApiExpectTest extends BaseNovaApiExpectTest {
public void testListFlavorsWhenResponseIs2xx() throws Exception {
HttpRequest listFlavors = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -65,7 +65,7 @@ public class FlavorApiExpectTest extends BaseNovaApiExpectTest {
public void testListFlavorsWhenReponseIs404IsEmpty() throws Exception {
HttpRequest listFlavors = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -82,7 +82,7 @@ public class FlavorApiExpectTest extends BaseNovaApiExpectTest {
public void testGetFlavorWhenResponseIs2xx() throws Exception {
HttpRequest getFlavor = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/52415800-8b69-11e0-9b19-734f1195ff37")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/52415800-8b69-11e0-9b19-734f1195ff37")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -101,7 +101,7 @@ public class FlavorApiExpectTest extends BaseNovaApiExpectTest {
public void testGetFlavorWhenResponseIs404() throws Exception {
HttpRequest getFlavor = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/123")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/123")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -118,7 +118,7 @@ public class FlavorApiExpectTest extends BaseNovaApiExpectTest {
ParseCreateFlavorTest parser = new ParseCreateFlavorTest();
HttpRequest listFlavors = HttpRequest.builder()
.method(HttpMethod.POST)
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors")
.addHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON)
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromResource(parser.resource())).build();
@@ -141,7 +141,7 @@ public class FlavorApiExpectTest extends BaseNovaApiExpectTest {
String flavorId = "1cb47a44-9b84-4da4-bf81-c1976e8414ab";
HttpRequest updateMetadata = HttpRequest.builder()
.method(HttpMethod.DELETE)
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/" + flavorId)
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/" + flavorId)
.addHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON)
.addHeader("X-Auth-Token", authToken)
.build();
[4/6] JCLOUDS-554: Update Nova default API to v2
Posted by jd...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java
index 30840f2..d3a5231 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java
@@ -43,7 +43,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
public void testListImagesWhenResponseIs2xx() throws Exception {
HttpRequest list = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -63,7 +63,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
public void testListImagesWhenReponseIs404IsEmpty() throws Exception {
HttpRequest list = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -80,7 +80,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest getImage = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -99,7 +99,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
public void testGetImageWhenResponseIs404() throws Exception {
HttpRequest getImage = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/52415800-8b69-11e0-9b19-734f5736d2a2")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -116,7 +116,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
HttpRequest getMetadata = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -135,7 +135,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
String imageId = "52415800-8b69-11e0-9b19-734f5736d2a2";
HttpRequest getMetadata = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId + "/metadata")
.addHeader("Accept", "*/*")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -162,7 +162,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("PUT")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -188,7 +188,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("PUT")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId + "/metadata")
.addHeader("Accept", "*/*")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -217,7 +217,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -243,7 +243,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + imageId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + imageId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}", "application/json"))
@@ -269,7 +269,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest getMetadata = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + key)
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId + "/metadata/" + key)
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -290,7 +290,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest getMetadata = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + key)
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId + "/metadata/" + key)
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -310,7 +310,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest updateMetadata = HttpRequest.builder()
.method("PUT")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + "Image%20Version")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId + "/metadata/" + "Image%20Version")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType("{\"metadata\":{\"Image Version\":\"2.5\"}}", "application/json"))
@@ -332,7 +332,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest deleteMetadata = HttpRequest.builder()
.method("DELETE")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + key)
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId + "/metadata/" + key)
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -351,7 +351,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest deleteMetadata = HttpRequest.builder()
.method("DELETE")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId + "/metadata/" + key)
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId + "/metadata/" + key)
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java
index 65d7f7e..cfee8a6 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java
@@ -48,7 +48,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
public void testListServersWhenResponseIs2xx() throws Exception {
HttpRequest listServers = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -67,7 +67,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
public void testListServersWhenReponseIs404IsEmpty() throws Exception {
HttpRequest listServers = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -83,7 +83,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/detail")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/detail")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -103,7 +103,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest listServers = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/detail")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/detail")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
@@ -118,7 +118,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
public void testCreateServerWhenResponseIs202() throws Exception {
HttpRequest createServer = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -138,7 +138,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
public void testCreateServerInAvailabilityZoneWhenResponseIs202() throws Exception {
HttpRequest createServer = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -160,7 +160,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
public void testCreateServerWithSecurityGroupsWhenResponseIs202() throws Exception {
HttpRequest createServer = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -181,7 +181,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
public void testCreateServerWithNetworksWhenResponseIs202() throws Exception {
HttpRequest createServer = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -202,7 +202,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
public void testCreateServerWithDiskConfigAuto() throws Exception {
HttpRequest createServer = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -224,7 +224,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
public void testCreateServerWithDiskConfigManual() throws Exception {
HttpRequest createServer = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -247,7 +247,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
String serverId = "52415800-8b69-11e0-9b19-734f565bc83b";
HttpRequest rebuildServer = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/action")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -271,7 +271,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest createImage = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/action")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -281,7 +281,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpResponse createImageResponse = HttpResponse.builder()
.statusCode(200)
.headers(ImmutableMultimap.<String, String> builder()
- .put("Location", "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/" + imageId).build()).build();
+ .put("Location", "https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/" + imageId).build()).build();
NovaApi apiWhenServerExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, createImage, createImageResponse);
@@ -296,7 +296,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest createImage = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/action")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -320,7 +320,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
String serverId = "123";
HttpRequest stopServer = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/action")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -339,7 +339,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
String serverId = "123";
HttpRequest stopServer = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/action")
.addHeader("Accept", "*/*")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -364,7 +364,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest startServer = HttpRequest
.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/action")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -383,7 +383,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
String serverId = "123";
HttpRequest startServer = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/action")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/action")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -407,7 +407,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
String serverId = "123";
HttpRequest getMetadata = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -426,7 +426,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
String serverId = "123";
HttpRequest getMetadata = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "*/*")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -453,7 +453,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("PUT")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -479,7 +479,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("PUT")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "*/*")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -508,7 +508,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -534,8 +534,8 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
- .addHeader("Accept", "*/*")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata")
+ .addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
"{\"metadata\":{\"Server Label\":\"Web Head 2\",\"Server Description\":\"Simple Server\"}}", "application/json"))
@@ -562,7 +562,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest getMetadata = HttpRequest
.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata/" + "Server%20Label")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata/" + "Server%20Label")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -585,7 +585,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("GET")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -615,7 +615,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -641,7 +641,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest setMetadata = HttpRequest.builder()
.method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.payload(payloadFromStringWithContentType(
@@ -668,7 +668,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest updateMetadata = HttpRequest.builder()
.method("DELETE")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata/" + key)
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata/" + key)
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -687,7 +687,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest deleteMetadata = HttpRequest.builder()
.method("DELETE")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/metadata/" + key)
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/metadata/" + key)
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -705,7 +705,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest getDiagnostics = HttpRequest.builder()
.method("GET")
.addHeader("Accept", "application/json")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/diagnostics")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/diagnostics")
.addHeader("X-Auth-Token", authToken)
.build();
@@ -723,7 +723,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest {
HttpRequest getDiagnostics = HttpRequest.builder()
.method("GET")
.addHeader("Accept", "application/json")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/" + serverId + "/diagnostics")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/" + serverId + "/diagnostics")
.addHeader("X-Auth-Token", authToken)
.build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java
index 19b511e..fc15e92 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/CreateSecurityGroupIfNeededTest.java
@@ -39,7 +39,7 @@ import com.google.common.collect.ImmutableSet;
@Test(groups = "unit", testName = "CreateSecurityGroupIfNeededTest")
public class CreateSecurityGroupIfNeededTest extends BaseNovaApiExpectTest {
HttpRequest create = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build())
.payload(
@@ -68,7 +68,7 @@ public class CreateSecurityGroupIfNeededTest extends BaseNovaApiExpectTest {
for (int port : ImmutableList.of(22, 8080)) {
HttpRequest createCidrRule = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build())
.payload(
@@ -85,7 +85,7 @@ public class CreateSecurityGroupIfNeededTest extends BaseNovaApiExpectTest {
builder.put(createCidrRule, createCidrRuleResponse);
HttpRequest createSelfRule = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-group-rules")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build())
.payload(
@@ -104,7 +104,7 @@ public class CreateSecurityGroupIfNeededTest extends BaseNovaApiExpectTest {
}
HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups/" + groupId)).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/" + groupId)).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -141,7 +141,7 @@ public class CreateSecurityGroupIfNeededTest extends BaseNovaApiExpectTest {
builder.put(create, createResponse);
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java
index d2cddbd..d9c467e 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java
@@ -42,7 +42,7 @@ public class FindSecurityGroupWithNameAndReturnTrueExpectTest extends BaseNovaAp
public void testUpdateReferenceWhenSecurityGroupListContainsGroupName() throws Exception {
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -70,7 +70,7 @@ public class FindSecurityGroupWithNameAndReturnTrueExpectTest extends BaseNovaAp
public void testDoesNotUpdateReferenceWhenSecurityGroupListMissingGroupName() throws Exception {
HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-security-groups")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandlerTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandlerTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandlerTest.java
index 38bbe23..0756c44 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandlerTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/handlers/NovaErrorHandlerTest.java
@@ -55,7 +55,7 @@ public class NovaErrorHandlerTest {
assertEquals(command.getException().getClass(), AuthorizationException.class);
assertEquals(command.getException().getMessage(),
- "POST https://nova/v1.1/servers HTTP/1.1 -> HTTP/1.1 401 Unauthorized");
+ "POST https://nova/v2/servers HTTP/1.1 -> HTTP/1.1 401 Unauthorized");
}
@Test
@@ -64,7 +64,7 @@ public class NovaErrorHandlerTest {
assertEquals(command.getException().getClass(), ResourceNotFoundException.class);
assertEquals(command.getException().getMessage(),
- "POST https://nova/v1.1/servers HTTP/1.1 -> HTTP/1.1 404 Not Found");
+ "POST https://nova/v2/servers HTTP/1.1 -> HTTP/1.1 404 Not Found");
}
// should wait until ips are associated w/the server
@@ -215,7 +215,7 @@ public class NovaErrorHandlerTest {
new OverLimitParser(new GsonWrapper(new Gson())));
private HttpCommand command() {
- return new HttpCommand(HttpRequest.builder().method("POST").endpoint("https://nova/v1.1/servers").build());
+ return new HttpCommand(HttpRequest.builder().method("POST").endpoint("https://nova/v2/servers").build());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaComputeServiceContextExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaComputeServiceContextExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaComputeServiceContextExpectTest.java
index a9ab825..df58ae0 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaComputeServiceContextExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaComputeServiceContextExpectTest.java
@@ -30,13 +30,15 @@ import com.google.common.collect.ImmutableMultimap;
import com.google.inject.Module;
/**
- * Base class for writing KeyStone Expect tests with the ComputeService abstraction
+
+ * Base class for writing Keystone Expect tests with the ComputeService abstraction
+ *
*/
public abstract class BaseNovaComputeServiceContextExpectTest<T> extends BaseNovaExpectTest<T> implements
Function<ComputeServiceContext, T> {
-
+
protected final HttpRequest listDetail = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/images/detail")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/images/detail")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -44,7 +46,7 @@ public abstract class BaseNovaComputeServiceContextExpectTest<T> extends BaseNov
payloadFromResource("/image_list_detail.json")).build();
protected final HttpRequest listFlavorsDetail = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/flavors/detail")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/flavors/detail")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -52,7 +54,7 @@ public abstract class BaseNovaComputeServiceContextExpectTest<T> extends BaseNov
payloadFromResource("/flavor_list_detail.json")).build();
protected final HttpRequest listServers = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/servers/detail")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/detail")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -60,7 +62,7 @@ public abstract class BaseNovaComputeServiceContextExpectTest<T> extends BaseNov
payloadFromResource("/server_list_details.json")).build();
protected final HttpRequest listFloatingIps = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/os-floating-ips")).headers(
+ URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")).headers(
ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
authToken).build()).build();
@@ -76,7 +78,7 @@ public abstract class BaseNovaComputeServiceContextExpectTest<T> extends BaseNov
Properties props) {
return createInjector(fn, module, props).getInstance(ComputeServiceContext.class);
}
-
+
@Override
protected ApiMetadata createApiMetadata() {
return new NovaApiMetadata();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaExpectTest.java
index 144b3d4..76460bc 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/internal/BaseNovaExpectTest.java
@@ -57,7 +57,7 @@ public class BaseNovaExpectTest<T> extends BaseRestApiExpectTest<T> {
extensionsOfNovaRequest = HttpRequest.builder().method("GET")
// NOTE THIS IS NOVA, NOT KEYSTONE
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/3456/extensions")
+ .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/extensions")
.addHeader("Accept", "application/json")
.addHeader("X-Auth-Token", authToken).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreateFlavorTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreateFlavorTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreateFlavorTest.java
index f70438e..0ad50b2 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreateFlavorTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreateFlavorTest.java
@@ -35,23 +35,21 @@ import com.google.inject.Injector;
@Test(groups = "unit", testName = "ParseCreateFlavorTest")
public class ParseCreateFlavorTest extends BaseItemParserTest<Flavor> {
- @Override
- public String resource() {
- return "/flavor_new.json";
- }
+ @Override
+ public String resource() {
+ return "/flavor_new.json";
+ }
- @Override
- @SelectJson("flavor")
- @Consumes(MediaType.APPLICATION_JSON)
- public Flavor expected() {
- return Flavor.builder()
- .id("1cb47a44-9b84-4da4-bf81-c1976e8414ab")
- .name("128 MB Server").ram(128).vcpus(1)
- .disk(10).build();
- }
+ @Override
+ @SelectJson("flavor")
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Flavor expected() {
+ return Flavor.builder().id("1cb47a44-9b84-4da4-bf81-c1976e8414ab").name("128 MB Server")
+ .ram(128).vcpus(1).disk(10).build();
+ }
- @Override
- protected Injector injector() {
- return Guice.createInjector(new NovaParserModule(), new GsonModule());
- }
+ @Override
+ protected Injector injector() {
+ return Guice.createInjector(new NovaParserModule(), new GsonModule());
+ }
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreatedServerTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreatedServerTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreatedServerTest.java
index f0dcfd5..0cfda1a 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreatedServerTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseCreatedServerTest.java
@@ -51,7 +51,7 @@ public class ParseCreatedServerTest extends BaseItemParserTest<ServerCreated> {
.name("test-e92")
.adminPass("ZWuHcmTMQ7eXoHeM")
.links(
- Link.create(Relation.SELF, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752")),
+ Link.create(Relation.SELF, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752")),
Link.create(Relation.BOOKMARK, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752"))).build();
}
@@ -66,7 +66,7 @@ public class ParseCreatedServerTest extends BaseItemParserTest<ServerCreated> {
.adminPass("ZWuHcmTMQ7eXoHeM")
.diskConfig(diskConfig)
.links(
- Link.create(Relation.SELF, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/71752")),
+ Link.create(Relation.SELF, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/71752")),
Link.create(Relation.BOOKMARK, URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/71752"))).build();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorListTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorListTest.java
index b1180cb..3351c64 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorListTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorListTest.java
@@ -55,7 +55,7 @@ public class ParseFlavorListTest extends BaseSetParserTest<Resource> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37")),
+ URI.create("http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37")))
@@ -67,7 +67,7 @@ public class ParseFlavorListTest extends BaseSetParserTest<Resource> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd")),
+ URI.create("http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd")))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorTest.java
index 5597653..69b4ead 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseFlavorTest.java
@@ -54,7 +54,7 @@ public class ParseFlavorTest extends BaseItemParserTest<Flavor> {
ImmutableSet.of(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37")),
+ URI.create("http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"))))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageListTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageListTest.java
index 2e8db96..ef5d745 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageListTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageListTest.java
@@ -55,7 +55,7 @@ public class ParseImageListTest extends BaseSetParserTest<Resource> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54")),
+ URI.create("http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54")))
@@ -67,7 +67,7 @@ public class ParseImageListTest extends BaseSetParserTest<Resource> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2")),
+ URI.create("http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2")))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageTest.java
index 2c5c620..3f93dd5 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseImageTest.java
@@ -73,7 +73,7 @@ public class ParseImageTest extends BaseItemParserTest<Image> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3")),
+ URI.create("http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3")))
@@ -82,7 +82,7 @@ public class ParseImageTest extends BaseItemParserTest<Image> {
ImmutableSet.of(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2")),
+ URI.create("http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"))))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java
index bbe476f..4f151d9 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java
@@ -61,7 +61,7 @@ public class ParseServerDetailsEssexTest extends BaseSetParserTest<Server> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://nova:8774/v1.1/8d10e6646d5d4585937395b04839a353/servers/0c80b392-db30-4736-ae02-4480090f1207")),
+ URI.create("http://nova:8774/v2/8d10e6646d5d4585937395b04839a353/servers/0c80b392-db30-4736-ae02-4480090f1207")),
Link.create(
Relation.BOOKMARK,
URI.create("http://nova:8774/8d10e6646d5d4585937395b04839a353/servers/0c80b392-db30-4736-ae02-4480090f1207")))
@@ -96,7 +96,7 @@ public class ParseServerDetailsEssexTest extends BaseSetParserTest<Server> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://nova:8774/v1.1/8d10e6646d5d4585937395b04839a353/servers/b332b5cd-535e-4677-b68e-fc8badc13236")),
+ URI.create("http://nova:8774/v2/8d10e6646d5d4585937395b04839a353/servers/b332b5cd-535e-4677-b68e-fc8badc13236")),
Link.create(
Relation.BOOKMARK,
URI.create("http://nova:8774/8d10e6646d5d4585937395b04839a353/servers/b332b5cd-535e-4677-b68e-fc8badc13236")))
@@ -130,7 +130,7 @@ public class ParseServerDetailsEssexTest extends BaseSetParserTest<Server> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://nova:8774/v1.1/8d10e6646d5d4585937395b04839a353/servers/f9d43436-4572-4c9b-9b74-5fa6890a2f21")),
+ URI.create("http://nova:8774/v2/8d10e6646d5d4585937395b04839a353/servers/f9d43436-4572-4c9b-9b74-5fa6890a2f21")),
Link.create(
Relation.BOOKMARK,
URI.create("http://nova:8774/8d10e6646d5d4585937395b04839a353/servers/f9d43436-4572-4c9b-9b74-5fa6890a2f21")))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerListTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerListTest.java
index f630c7d..ad2811e 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerListTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerListTest.java
@@ -55,7 +55,7 @@ public class ParseServerListTest extends BaseSetParserTest<Resource> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6af67565")),
+ URI.create("http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f6af67565")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6af67565")))
@@ -67,7 +67,7 @@ public class ParseServerListTest extends BaseSetParserTest<Resource> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f1f1350e5")),
+ URI.create("http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f1f1350e5")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f1f1350e5")))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerTest.java
index a5f444a..019f215 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerTest.java
@@ -75,7 +75,7 @@ public class ParseServerTest extends BaseItemParserTest<Server> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54")),
+ URI.create("http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54")))
@@ -88,7 +88,7 @@ public class ParseServerTest extends BaseItemParserTest<Server> {
.links(
Link.create(
Relation.SELF,
- URI.create("http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd")),
+ URI.create("http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd")),
Link.create(
Relation.BOOKMARK,
URI.create("http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd")))
@@ -101,10 +101,10 @@ public class ParseServerTest extends BaseItemParserTest<Server> {
.putAll("private", createV4("10.176.42.16"), createV6("::babe:10.176.42.16"))
.build())
.links(Link.create(
- Relation.SELF, URI.create("http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6f006e54")),
+ Relation.SELF, URI.create("http://servers.api.openstack.org/v2/1234/servers/71752")),
Link.create(
Relation.BOOKMARK,
- URI.create("http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6f006e54")))
+ URI.create("http://servers.api.openstack.org/1234/servers/71752")))
.build();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithInternetAddressesTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithInternetAddressesTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithInternetAddressesTest.java
index 55c0a85..77230aa 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithInternetAddressesTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithInternetAddressesTest.java
@@ -82,7 +82,7 @@ public class ParseServerWithInternetAddressesTest extends BaseItemParserTest<Ser
.links(
Link.create(
Relation.SELF,
- URI.create("https://nova-api.openstack.org:9774/v1.1/37/servers/1459")),
+ URI.create("https://nova-api.openstack.org:9774/v2/37/servers/1459")),
Link.create(
Relation.BOOKMARK,
URI.create("https://nova-api.openstack.org:9774/37/servers/1459")))
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithoutImageTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithoutImageTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithoutImageTest.java
index fa2d7a0..83c748b 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithoutImageTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerWithoutImageTest.java
@@ -86,10 +86,10 @@ public class ParseServerWithoutImageTest extends BaseItemParserTest<Server> {
.putAll("private", createV4("10.176.42.16"), createV6("::babe:10.176.42.16"))
.build())
.links(Link.create(
- Relation.SELF, URI.create("http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6f006e54")),
+ Relation.SELF, URI.create("http://servers.api.openstack.org/v2/1234/servers/71752")),
Link.create(
Relation.BOOKMARK,
- URI.create("http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6f006e54")))
+ URI.create("http://servers.api.openstack.org/1234/servers/71752")))
.build();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/PublicIpsInPrivateAddressBlockExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/PublicIpsInPrivateAddressBlockExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/PublicIpsInPrivateAddressBlockExpectTest.java
index 6d0ffdf..ee55926 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/PublicIpsInPrivateAddressBlockExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/PublicIpsInPrivateAddressBlockExpectTest.java
@@ -85,7 +85,7 @@ public class PublicIpsInPrivateAddressBlockExpectTest extends BaseItemParserTest
.addresses(ImmutableMultimap.<String, Address>builder()
.putAll("private", Address.createV4("10.6.39.189"), Address.createV4("15.185.181.94")).build())
.links(
- Link.create(Relation.SELF, URI.create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v1.1/37936628937291/servers/59662")),
+ Link.create(Relation.SELF, URI.create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/v2/37936628937291/servers/59662")),
Link.create(Relation.BOOKMARK, URI.create("https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/servers/59662"))).build();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/access.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/access.json b/apis/openstack-nova/src/test/resources/access.json
index 84a9625..fab1645 100644
--- a/apis/openstack-nova/src/test/resources/access.json
+++ b/apis/openstack-nova/src/test/resources/access.json
@@ -10,219 +10,219 @@
"is_admin": 0
},
"user": {
- "name":"joe",
+ "name": "joe",
"roles": [
{
- "name":"_member_"
+ "name": "_member_"
},
{
- "name":"anotherrole"
+ "name": "anotherrole"
},
{
- "name":"heat_stack_owner"
+ "name": "heat_stack_owner"
},
{
- "name":"Member"
+ "name": "Member"
}
],
- "id":"8fbf8e68d36e4ac7bcf912a26213bd49",
+ "id": "8fbf8e68d36e4ac7bcf912a26213bd49",
"roles_links": [],
- "username":"joe"
+ "username": "joe"
},
"serviceCatalog": [
{
- "name":"nova",
- "type":"compute",
+ "name": "nova",
+ "type": "compute",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/v2/da0d12be20394afb851716e10a49e4a7",
- "id":"2122bcaa704343c19ad2578410d4961d",
- "internalURL":"URL/v2/da0d12be20394afb851716e10a49e4a7",
- "region":"RegionOne",
- "adminURL":"URL/v2/da0d12be20394afb851716e10a49e4a7"
+ "publicURL": "URL/v2/da0d12be20394afb851716e10a49e4a7",
+ "id": "2122bcaa704343c19ad2578410d4961d",
+ "internalURL": "URL/v2/da0d12be20394afb851716e10a49e4a7",
+ "region": "RegionOne",
+ "adminURL": "URL/v2/da0d12be20394afb851716e10a49e4a7"
}
]
},
{
- "name":"neutron",
- "type":"network",
+ "name": "neutron",
+ "type": "network",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/",
- "id":"65a4d3f13cfb49a6a57a04e205cc2158",
- "internalURL":"URL/",
- "region":"RegionOne",
- "adminURL":"URL/"
+ "publicURL": "URL/",
+ "id": "65a4d3f13cfb49a6a57a04e205cc2158",
+ "internalURL": "URL/",
+ "region": "RegionOne",
+ "adminURL": "URL/"
}
]
},
{
- "name":"cinderv2",
- "type":"volumev2",
+ "name": "cinderv2",
+ "type": "volumev2",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/v2/da0d12be20394afb851716e10a49e4a7",
- "id":"31fe4d92eac44044b05be21c6f44cebc",
- "internalURL":"URL/v2/da0d12be20394afb851716e10a49e4a7",
- "region":"RegionOne",
- "adminURL":"URL/v2/da0d12be20394afb851716e10a49e4a7"
+ "publicURL": "URL/v2/da0d12be20394afb851716e10a49e4a7",
+ "id": "31fe4d92eac44044b05be21c6f44cebc",
+ "internalURL": "URL/v2/da0d12be20394afb851716e10a49e4a7",
+ "region": "RegionOne",
+ "adminURL": "URL/v2/da0d12be20394afb851716e10a49e4a7"
}
]
},
{
- "name":"trove",
- "type":"database",
+ "name": "trove",
+ "type": "database",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/v1.0/da0d12be20394afb851716e10a49e4a7",
- "id":"06b7a7dbd25c4a01819c879700a9712a",
- "internalURL":"URL/v1.0/da0d12be20394afb851716e10a49e4a7",
- "region":"RegionOne",
- "adminURL":"URL/v1.0/da0d12be20394afb851716e10a49e4a7"
+ "publicURL": "URL/v1.0/da0d12be20394afb851716e10a49e4a7",
+ "id": "06b7a7dbd25c4a01819c879700a9712a",
+ "internalURL": "URL/v1.0/da0d12be20394afb851716e10a49e4a7",
+ "region": "RegionOne",
+ "adminURL": "URL/v1.0/da0d12be20394afb851716e10a49e4a7"
}
]
},
{
- "name":"s3",
- "type":"s3",
+ "name": "s3",
+ "type": "s3",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL",
- "id":"93b0b67091324e8ba01b62ee0584994c",
- "internalURL":"URL",
- "region":"RegionOne",
- "adminURL":"URL"
+ "publicURL": "URL",
+ "id": "93b0b67091324e8ba01b62ee0584994c",
+ "internalURL": "URL",
+ "region": "RegionOne",
+ "adminURL": "URL"
}
]
},
{
- "name":"glance",
- "type":"image",
+ "name": "glance",
+ "type": "image",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL",
- "id":"a542e91bcfa046bfa1bf2397356d1414",
- "internalURL":"URL",
- "region":"RegionOne",
- "adminURL":"URL"
+ "publicURL": "URL",
+ "id": "a542e91bcfa046bfa1bf2397356d1414",
+ "internalURL": "URL",
+ "region": "RegionOne",
+ "adminURL": "URL"
}
]
},
{
- "name":"novav3",
- "type":"computev3",
+ "name": "novav3",
+ "type": "computev3",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/v3",
- "id":"9c3e8abb576d483db93bcef70c67bc1d",
- "internalURL":"URL/v3",
- "region":"RegionOne",
- "adminURL":"URL/v3"
+ "publicURL": "URL/v3",
+ "id": "9c3e8abb576d483db93bcef70c67bc1d",
+ "internalURL": "URL/v3",
+ "region": "RegionOne",
+ "adminURL": "URL/v3"
}
]
},
{
- "name":"heat",
- "type":"cloudformation",
+ "name": "heat",
+ "type": "cloudformation",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/v1",
- "id":"6f4ca5ca9698425b85c300b3fc176c39",
- "internalURL":"URL/v1",
- "region":"RegionOne",
- "adminURL":"URL/v1"
+ "publicURL": "URL/v1",
+ "id": "6f4ca5ca9698425b85c300b3fc176c39",
+ "internalURL": "URL/v1",
+ "region": "RegionOne",
+ "adminURL": "URL/v1"
}
]
},
{
- "name":"cinder",
- "type":"volume",
+ "name": "cinder",
+ "type": "volume",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/v1/da0d12be20394afb851716e10a49e4a7",
- "id":"037039c676694a35aa28d34fce09e51d",
- "internalURL":"URL/v1/da0d12be20394afb851716e10a49e4a7",
- "region":"RegionOne",
- "adminURL":"URL/v1/da0d12be20394afb851716e10a49e4a7"
+ "publicURL": "URL/v1/da0d12be20394afb851716e10a49e4a7",
+ "id": "037039c676694a35aa28d34fce09e51d",
+ "internalURL": "URL/v1/da0d12be20394afb851716e10a49e4a7",
+ "region": "RegionOne",
+ "adminURL": "URL/v1/da0d12be20394afb851716e10a49e4a7"
}
]
},
{
- "name":"ec2",
- "type":"ec2",
+ "name": "ec2",
+ "type": "ec2",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/services/Cloud",
- "id":"1d242631bccb4ff4ba7a395dbcb51648",
- "internalURL":"URL/services/Cloud",
- "region":"RegionOne",
- "adminURL":"URL/services/Admin"
+ "publicURL": "URL/services/Cloud",
+ "id": "1d242631bccb4ff4ba7a395dbcb51648",
+ "internalURL": "URL/services/Cloud",
+ "region": "RegionOne",
+ "adminURL": "URL/services/Admin"
}
]
},
{
- "name":"heat",
- "type":"orchestration",
+ "name": "heat",
+ "type": "orchestration",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/v1/da0d12be20394afb851716e10a49e4a7",
- "id":"199d00075e4a40308a6ad2aa8980d0cd",
- "internalURL":"URL/v1/da0d12be20394afb851716e10a49e4a7",
- "region":"RegionOne",
- "adminURL":"URL/v1/da0d12be20394afb851716e10a49e4a7"
+ "publicURL": "URL/v1/da0d12be20394afb851716e10a49e4a7",
+ "id": "199d00075e4a40308a6ad2aa8980d0cd",
+ "internalURL": "URL/v1/da0d12be20394afb851716e10a49e4a7",
+ "region": "RegionOne",
+ "adminURL": "URL/v1/da0d12be20394afb851716e10a49e4a7"
}
]
},
{
- "name":"swift",
- "type":"object-store",
+ "name": "swift",
+ "type": "object-store",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/v1/AUTH_da0d12be20394afb851716e10a49e4a7",
- "id":"26b2cb1efb044193b847fc3f2fb12e82",
- "internalURL":"URL/v1/AUTH_da0d12be20394afb851716e10a49e4a7",
- "region":"RegionOne",
- "adminURL":"URL"
+ "publicURL": "URL/v1/AUTH_da0d12be20394afb851716e10a49e4a7",
+ "id": "26b2cb1efb044193b847fc3f2fb12e82",
+ "internalURL": "URL/v1/AUTH_da0d12be20394afb851716e10a49e4a7",
+ "region": "RegionOne",
+ "adminURL": "URL"
}
]
},
{
- "name":"keystone",
- "type":"identity",
+ "name": "keystone",
+ "type": "identity",
"endpoints_links": [],
"endpoints": [
{
- "publicURL":"URL/v2.0",
- "id":"1bbfe80b50df4c4a84040aa782e42140",
- "internalURL":"URL/v2.0",
- "region":"RegionOne",
- "adminURL":"URL/v2.0"
+ "publicURL": "URL/v2.0",
+ "id": "1bbfe80b50df4c4a84040aa782e42140",
+ "internalURL": "URL/v2.0",
+ "region": "RegionOne",
+ "adminURL": "URL/v2.0"
}
]
}
],
"token": {
"tenant": {
- "name":"jclouds",
- "id":"da0d12be20394afb851716e10a49e4a7",
+ "name": "jclouds",
+ "id": "da0d12be20394afb851716e10a49e4a7",
"enabled": true,
"description": null
},
- "id":"TOKEN",
- "expires":"2014-04-28T22:48:24Z",
- "issued_at":"2014-04-28T21:48:24.972896"
+ "id": "TOKEN",
+ "expires": "2014-04-28T22:48:24Z",
+ "issued_at": "2014-04-28T21:48:24.972896"
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/attachment_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/attachment_details.json b/apis/openstack-nova/src/test/resources/attachment_details.json
index c436406..9b9eaf3 100644
--- a/apis/openstack-nova/src/test/resources/attachment_details.json
+++ b/apis/openstack-nova/src/test/resources/attachment_details.json
@@ -1 +1,8 @@
-{"volumeAttachment": {"device": "/dev/vdc", "serverId": "b4785058-cb80-491b-baa3-e4ee6546450e", "id": 1, "volumeId": 1}}
\ No newline at end of file
+{
+ "volumeAttachment": {
+ "device": "/dev/vdc",
+ "serverId": "b4785058-cb80-491b-baa3-e4ee6546450e",
+ "id": 1,
+ "volumeId": 1
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/attachment_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/attachment_list.json b/apis/openstack-nova/src/test/resources/attachment_list.json
index b40de0b..03f5c53 100644
--- a/apis/openstack-nova/src/test/resources/attachment_list.json
+++ b/apis/openstack-nova/src/test/resources/attachment_list.json
@@ -1 +1,10 @@
-{"volumeAttachments": [{"device": "/dev/vdc", "serverId": "b4785058-cb80-491b-baa3-e4ee6546450e", "id": 1, "volumeId": 1}]}
\ No newline at end of file
+{
+ "volumeAttachments": [
+ {
+ "device": "/dev/vdc",
+ "serverId": "b4785058-cb80-491b-baa3-e4ee6546450e",
+ "id": 1,
+ "volumeId": 1
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/extension_details.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/extension_details.json b/apis/openstack-nova/src/test/resources/extension_details.json
index 6336a42..98a0614 100644
--- a/apis/openstack-nova/src/test/resources/extension_details.json
+++ b/apis/openstack-nova/src/test/resources/extension_details.json
@@ -1,21 +1,21 @@
{
- "extension" : {
- "name" : "Public Image Extension",
- "namespace" : "http://docs.rackspacecloud.com/servers/api/ext/pie/v1.0",
- "alias" : "RS-PIE",
- "updated" : "2011-01-22T13:25:27-06:00",
- "description" : "Adds the capability to share an image with other users.",
- "links" : [
+ "extension": {
+ "name": "Public Image Extension",
+ "namespace": "http://docs.rackspacecloud.com/servers/api/ext/pie/v1.0",
+ "alias": "RS-PIE",
+ "updated": "2011-01-22T13:25:27-06:00",
+ "description": "Adds the capability to share an image with other users.",
+ "links": [
{
- "rel" : "describedby",
- "type" : "application/pdf",
- "href" : "http://docs.rackspacecloud.com/servers/api/ext/cs-pie-20111111.pdf"
+ "rel": "describedby",
+ "type": "application/pdf",
+ "href": "http://docs.rackspacecloud.com/servers/api/ext/cs-pie-20111111.pdf"
},
{
- "rel" : "describedby",
- "type" : "application/vnd.sun.wadl+xml",
- "href" : "http://docs.rackspacecloud.com/servers/api/ext/cs-pie.wadl"
+ "rel": "describedby",
+ "type": "application/vnd.sun.wadl+xml",
+ "href": "http://docs.rackspacecloud.com/servers/api/ext/cs-pie.wadl"
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0d77d8c2/apis/openstack-nova/src/test/resources/extension_list.json
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/resources/extension_list.json b/apis/openstack-nova/src/test/resources/extension_list.json
index 4f3faa5..3fd77fc 100644
--- a/apis/openstack-nova/src/test/resources/extension_list.json
+++ b/apis/openstack-nova/src/test/resources/extension_list.json
@@ -39,4 +39,4 @@
]
}
]
-}
\ No newline at end of file
+}