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:12 UTC
[3/6] JCLOUDS-554: Update Nova default API to v2
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
+ }
+ ]
+}