Repository: incubator-stratos Updated Branches: refs/heads/master 5857efca8 -> bf3a353bc
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_list_details.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_list_details.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_list_details.json new file mode 100644 index 0000000..7ad6a75 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_list_details.json @@ -0,0 +1,79 @@ +{ + "servers": [ + { + "id": "52415800-8b69-11e0-9b19-734f000004d2", + "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": [ + ] + } + ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_list_details_essex.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_list_details_essex.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_list_details_essex.json new file mode 100644 index 0000000..9ca9445 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_list_details_essex.json @@ -0,0 +1,152 @@ +{ + "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/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: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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_public_ip_in_private.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_public_ip_in_private.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_public_ip_in_private.json new file mode 100644 index 0000000..5a5b84e --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_public_ip_in_private.json @@ -0,0 +1,51 @@ +{ + "server": { + "status": "ACTIVE", + "updated": "2012-03-22T22:11:55Z", + "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" + }], + "addresses": { + "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" + }] + }, + "created": "2012-03-22T22:11:19Z", + "uuid": "7aed8e05-1daf-476a-87b2-640e8f7dcafd", + "accessIPv4": "", + "accessIPv6": "", + "key_name": "jclouds_hpcloud-computes_77", + "progress": 100, + "flavor": { + "id": "100", + "links": [{ + "href": "https://az-2.region-a.geo-1.compute.hpcloudsvc.com/37936628937291/flavors/100";, + "rel": "bookmark" + }] + }, + "config_drive": "", + "id": 59662, + "metadata": { + "Name": "hpcloud-computes" + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_with_security_groups.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_with_security_groups.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_with_security_groups.json new file mode 100644 index 0000000..16e03fe --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_with_security_groups.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_with_security_groups_extension.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_with_security_groups_extension.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_with_security_groups_extension.json new file mode 100644 index 0000000..7a3c4b2 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/server_with_security_groups_extension.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/simple_tenant_usage.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/simple_tenant_usage.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/simple_tenant_usage.json new file mode 100644 index 0000000..de07dc4 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/simple_tenant_usage.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/simple_tenant_usages.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/simple_tenant_usages.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/simple_tenant_usages.json new file mode 100644 index 0000000..6f3c0d7 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/simple_tenant_usages.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_details.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_details.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_details.json new file mode 100644 index 0000000..375127b --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_details.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_list.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_list.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_list.json new file mode 100644 index 0000000..03980b1 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_list.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_list_detail.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_list_detail.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_list_detail.json new file mode 100644 index 0000000..03980b1 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/snapshot_list_detail.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/virtual_interfaces_list.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/virtual_interfaces_list.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/virtual_interfaces_list.json new file mode 100644 index 0000000..7df0182 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/virtual_interfaces_list.json @@ -0,0 +1 @@ +{"virtual_interfaces": [{"id": "02315827-b05c-4668-9c05-75c68838074a", "mac_address": "fa:16:3e:09:71:34"}]} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_details.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_details.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_details.json new file mode 100644 index 0000000..8dd11dc --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_details.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_list.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_list.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_list.json new file mode 100644 index 0000000..d2179e7 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_list.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_list_detail.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_list_detail.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_list_detail.json new file mode 100644 index 0000000..d2179e7 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_list_detail.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type.json new file mode 100644 index 0000000..8739d09 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type.json @@ -0,0 +1,9 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type_extra_specs.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type_extra_specs.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type_extra_specs.json new file mode 100644 index 0000000..6e71d5d --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type_extra_specs.json @@ -0,0 +1 @@ +{"extra_specs": {"test": "value1"}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type_list.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type_list.json b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type_list.json new file mode 100644 index 0000000..3e613a3 --- /dev/null +++ b/dependencies/jclouds/openstack-nova/1.7.1-stratos/src/test/resources/volume_type_list.json @@ -0,0 +1 @@ +{"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 http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 8c31467..1b456fe 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -36,6 +36,7 @@ <modules> <module>jclouds/vcloud/1.7.1-stratos</module> + <module>jclouds/openstack-nova/1.7.1-stratos</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml index f72e9f7..2436a5c 100644 --- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml +++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml @@ -88,7 +88,7 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-nova</artifactId> - <version>${jclouds.version}</version> + <version>${jclouds.stratos.version}</version> </dependency> <dependency> @@ -121,7 +121,7 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>vcloud</artifactId> - <version>${jclouds.vcloud.version}</version> + <version>${jclouds.stratos.version}</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -232,8 +232,8 @@ <bundleDef>org.apache.jclouds:jclouds-core:${jclouds.version}</bundleDef> <bundleDef>org.apache.jclouds:jclouds-compute:${jclouds.version}</bundleDef> <bundleDef>org.apache.jclouds.api:ec2:${jclouds.version}</bundleDef> - <bundleDef>org.apache.jclouds.api:openstack-nova:${jclouds.version}</bundleDef> - <bundleDef>org.apache.jclouds.api:vcloud:${jclouds.vcloud.version}</bundleDef> + <bundleDef>org.apache.jclouds.api:openstack-nova:${jclouds.stratos.version}</bundleDef> + <bundleDef>org.apache.jclouds.api:vcloud:${jclouds.stratos.version}</bundleDef> <bundleDef>com.jamesmurty.utils.wso2:java-xmlbuilder:0.4.wso2v1</bundleDef> <bundleDef>org.apache.jclouds.common:openstack-common:${jclouds.version}</bundleDef> <bundleDef>org.apache.jclouds.api:openstack-keystone:${jclouds.version}</bundleDef> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d4243b7e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 961d951..1984746 100644 --- a/pom.xml +++ b/pom.xml @@ -434,6 +434,6 @@ <carbon.platform.package.export.version>4.2.0</carbon.platform.package.export.version> <axis2.osgi.version>1.6.1.wso2v10</axis2.osgi.version> <jclouds.version>1.7.1</jclouds.version> - <jclouds.vcloud.version>1.7.1-stratos</jclouds.vcloud.version> + <jclouds.stratos.version>1.7.1-stratos</jclouds.stratos.version> </properties> </project>
