diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/agent-update-put-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/agent-update-put-req.json deleted file mode 100644 index cc8ce2865..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/agent-update-put-req.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "snapshot": { - "display_name": "snap-001", - "display_description": "Daily backup", - "volume_id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c", - "force": true - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/agent-update-put-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/agent-update-put-resp.json deleted file mode 100644 index f23f0e0f4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/agent-update-put-resp.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "server": { - "id": "52415800-8b69-11e0-9b19-734f565bc83b", - "tenant_id": "1234", - "user_id": "5678", - "name": "new-server-test", - "created": "2010-11-11T12:00:00Z", - "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0", - "accessIPv4": null, - "accessIPv6": null, - "progress": 0, - "status": "BUILD", - "adminPass": "GFf1j9aP", - "image": { - "id": "cedef40a-ed67-4d10-800e-17455edce175", - "name": "CentOS 5.2", - "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": "1", - "name": "256 MB Server", - "links": [ - { - "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" - } - ] - }, - "metadata": {}, - "addresses": {}, - "links": [ - { - "rel": "self", - "href": "http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734fcece0043" - }, - { - "rel": "bookmark", - "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734fcece0043" - } - ], - "security_groups": [ - { - "name": "sec-group-1" - }, - { - "name": "sec-group-2" - } - ], - "config_drive": "0c5eb502-3ee7-42e2-acfc-399b67fe72db" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-get-resp.json index 57df5d56c..09d387237 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-get-resp.json @@ -15,7 +15,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/flavors/1", "rel": "bookmark" } ] @@ -26,7 +26,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-resp.json index 9cf21f2d6..b25c95f0f 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-resp.json @@ -5,11 +5,11 @@ "id": "8195065c-fea4-4d57-b93f-5c5c63fe90e8", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/8195065c-fea4-4d57-b93f-5c5c63fe90e8", + "href": "http://openstack.example.com/v2.1/servers/8195065c-fea4-4d57-b93f-5c5c63fe90e8", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/8195065c-fea4-4d57-b93f-5c5c63fe90e8", + "href": "http://openstack.example.com/servers/8195065c-fea4-4d57-b93f-5c5c63fe90e8", "rel": "bookmark" } ], diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-details-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-details-resp.json index 16a196bdf..523e71dc1 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-details-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-details-resp.json @@ -16,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/flavors/1", "rel": "bookmark" } ] @@ -27,7 +27,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -35,11 +35,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/9cbefc35-d372-40c5-88e2-9fda1b6ea12c", + "href": "http://openstack.example.com/v2.1/servers/9cbefc35-d372-40c5-88e2-9fda1b6ea12c", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/9cbefc35-d372-40c5-88e2-9fda1b6ea12c", + "href": "http://openstack.example.com/servers/9cbefc35-d372-40c5-88e2-9fda1b6ea12c", "rel": "bookmark" } ], diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-list-resp.json index db2322992..34f58da3d 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-list-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-list-resp.json @@ -4,11 +4,11 @@ "id": "a291599e-6de2-41a6-88df-c443ddcef70d", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/a291599e-6de2-41a6-88df-c443ddcef70d", + "href": "http://openstack.example.com/v2.1/servers/a291599e-6de2-41a6-88df-c443ddcef70d", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/a291599e-6de2-41a6-88df-c443ddcef70d", + "href": "http://openstack.example.com/servers/a291599e-6de2-41a6-88df-c443ddcef70d", "rel": "bookmark" } ], diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/extension-info/extensions-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/extension-info/extensions-get-resp.json index f05b34f52..659e826f0 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/extension-info/extensions-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/extension-info/extensions-get-resp.json @@ -1,9 +1,10 @@ { "extension": { - "alias": "flavors", - "description": "Flavors Extension.", - "name": "flavors", - "namespace": "http://docs.openstack.org/compute/core/flavors/v2.1", - "version": 1 + "alias": "os-create-backup", + "description": "Create a backup of a server.", + "links": [], + "name": "CreateBackup", + "namespace": "http://docs.openstack.org/compute/ext/fake_xml", + "updated": "2014-12-03T00:00:00Z" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/extension-info/extensions-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/extension-info/extensions-list-resp.json deleted file mode 100644 index 229cec0fd..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/extension-info/extensions-list-resp.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extensions": [ - { - "alias": "extensions", - "description": "Extension information.", - "name": "extensions", - "namespace": "http://docs.openstack.org/compute/core/extension_info/api/v2.1", - "version": 1 - }, - { - "alias": "flavors", - "description": "Flavors Extension.", - "name": "flavors", - "namespace": "http://docs.openstack.org/compute/core/flavors/v2.1", - "version": 1 - } - ] -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-add-tenant-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-add-tenant-req.json index 4583dda5a..eb23a76c1 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-add-tenant-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-add-tenant-req.json @@ -1,5 +1,5 @@ { - "add_tenant_access": { - "tenant_id": "fake_tenant" + "addTenantAccess": { + "tenant": "fake_tenant" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-add-tenant-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-add-tenant-resp.json index 8a4be6559..e89da4c66 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-add-tenant-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-add-tenant-resp.json @@ -1,9 +1,5 @@ { "flavor_access": [ - { - "flavor_id": "10", - "tenant_id": "openstack" - }, { "flavor_id": "10", "tenant_id": "fake_tenant" diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-create-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-create-req.json index 40280e7df..26950b447 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-create-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-create-req.json @@ -5,6 +5,6 @@ "vcpus": 2, "disk": 10, "id": "10", - "flavor-access:is_public": false + "os-flavor-access:is_public": false } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-create-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-create-resp.json index 5d38673bd..2172774a3 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-create-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-create-resp.json @@ -1,9 +1,9 @@ { "flavor": { - "disabled": false, + "OS-FLV-DISABLED:disabled": false, "disk": 10, - "ephemeral": 0, - "flavor-access:is_public": false, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": false, "id": "10", "links": [ { @@ -17,7 +17,7 @@ ], "name": "test_flavor", "ram": 1024, - "swap": 0, + "swap": "", "vcpus": 2 } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-detail-resp.json index 987e32f52..579fee4e2 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-detail-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-detail-resp.json @@ -1,10 +1,10 @@ { "flavors": [ { - "disabled": false, + "OS-FLV-DISABLED:disabled": false, "disk": 1, - "ephemeral": 0, - "flavor-access:is_public": true, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "1", "links": [ { @@ -18,14 +18,14 @@ ], "name": "m1.tiny", "ram": 512, - "swap": 0, + "swap": "", "vcpus": 1 }, { - "disabled": false, + "OS-FLV-DISABLED:disabled": false, "disk": 20, - "ephemeral": 0, - "flavor-access:is_public": true, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "2", "links": [ { @@ -39,14 +39,14 @@ ], "name": "m1.small", "ram": 2048, - "swap": 0, + "swap": "", "vcpus": 1 }, { - "disabled": false, + "OS-FLV-DISABLED:disabled": false, "disk": 40, - "ephemeral": 0, - "flavor-access:is_public": true, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "3", "links": [ { @@ -60,14 +60,14 @@ ], "name": "m1.medium", "ram": 4096, - "swap": 0, + "swap": "", "vcpus": 2 }, { - "disabled": false, + "OS-FLV-DISABLED:disabled": false, "disk": 80, - "ephemeral": 0, - "flavor-access:is_public": true, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "4", "links": [ { @@ -81,14 +81,14 @@ ], "name": "m1.large", "ram": 8192, - "swap": 0, + "swap": "", "vcpus": 4 }, { - "disabled": false, + "OS-FLV-DISABLED:disabled": false, "disk": 160, - "ephemeral": 0, - "flavor-access:is_public": true, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "5", "links": [ { @@ -102,7 +102,7 @@ ], "name": "m1.xlarge", "ram": 16384, - "swap": 0, + "swap": "", "vcpus": 8 } ] diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-list-resp.json index 8a4be6559..e89da4c66 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-list-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-list-resp.json @@ -1,9 +1,5 @@ { "flavor_access": [ - { - "flavor_id": "10", - "tenant_id": "openstack" - }, { "flavor_id": "10", "tenant_id": "fake_tenant" diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-remove-tenant-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-remove-tenant-req.json index 0ced1e557..a5bee9ae9 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-remove-tenant-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-remove-tenant-req.json @@ -1,5 +1,5 @@ { - "remove_tenant_access": { - "tenant_id": "fake_tenant" + "removeTenantAccess": { + "tenant": "fake_tenant" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-remove-tenant-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-remove-tenant-resp.json index 9fc9fa52f..3e4bd858b 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-remove-tenant-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-remove-tenant-resp.json @@ -1,8 +1,3 @@ { - "flavor_access": [ - { - "flavor_id": "10", - "tenant_id": "openstack" - } - ] + "flavor_access": [] } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-show-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-show-resp.json index d32d3c8a6..aafe446b4 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-show-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-access/flavor-access-show-resp.json @@ -1,9 +1,9 @@ { "flavor": { - "disabled": false, + "OS-FLV-DISABLED:disabled": false, "disk": 1, - "ephemeral": 0, - "flavor-access:is_public": true, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "1", "links": [ { @@ -17,7 +17,7 @@ ], "name": "m1.tiny", "ram": 512, - "swap": 0, + "swap": "", "vcpus": 1 } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-manage/flavor-create-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-manage/flavor-create-post-resp.json index 6d9c82d92..5785b2b7e 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-manage/flavor-create-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/flavor-manage/flavor-create-post-resp.json @@ -1,9 +1,9 @@ { "flavor": { - "disabled": false, + "OS-FLV-DISABLED:disabled": false, "disk": 10, - "ephemeral": 0, - "flavor-access:is_public": true, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "10", "links": [ { @@ -17,7 +17,7 @@ ], "name": "test_flavor", "ram": 1024, - "swap": 0, + "swap": "", "vcpus": 2 } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/image-size/image-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/image-size/image-get-resp.json new file mode 100644 index 000000000..74a911d92 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/image-size/image-get-resp.json @@ -0,0 +1,34 @@ +{ + "image": { + "OS-EXT-IMG-SIZE:size": "74185822", + "created": "2011-01-01T01:02:03Z", + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage7", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/image-size/images-details-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/image-size/images-details-get-resp.json new file mode 100644 index 000000000..cd684b9c5 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/image-size/images-details-get-resp.json @@ -0,0 +1,219 @@ +{ + "images": [ + { + "OS-EXT-IMG-SIZE:size": "74185822", + "created": "2011-01-01T01:02:03Z", + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage7", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "OS-EXT-IMG-SIZE:size": "25165824", + "created": "2011-01-01T01:02:03Z", + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "OS-EXT-IMG-SIZE:size": "58145823", + "created": "2011-01-01T01:02:03Z", + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "OS-EXT-IMG-SIZE:size": "49163826", + "created": "2011-01-01T01:02:03Z", + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "False", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage6", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "OS-EXT-IMG-SIZE:size": "26360814", + "created": "2011-01-01T01:02:03Z", + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "ramdisk_id": null + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "OS-EXT-IMG-SIZE:size": "84035174", + "created": "2011-01-01T01:02:03Z", + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "OS-EXT-IMG-SIZE:size": "83594576", + "created": "2011-01-01T01:02:03Z", + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + } + ] +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-get-resp.json new file mode 100644 index 000000000..4e21b3e71 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-get-resp.json @@ -0,0 +1,33 @@ +{ + "image": { + "created": "2011-01-01T01:02:03Z", + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage7", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-meta-key-get.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-meta-key-get.json new file mode 100644 index 000000000..9d5df64d7 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-meta-key-get.json @@ -0,0 +1,5 @@ +{ + "meta": { + "kernel_id": "nokernel" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-meta-key-put-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-meta-key-put-req.json new file mode 100644 index 000000000..01528f1ce --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-meta-key-put-req.json @@ -0,0 +1,5 @@ +{ + "meta": { + "auto_disk_config": "False" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-meta-key-put-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-meta-key-put-resp.json new file mode 100644 index 000000000..01528f1ce --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-meta-key-put-resp.json @@ -0,0 +1,5 @@ +{ + "meta": { + "auto_disk_config": "False" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-get-resp.json new file mode 100644 index 000000000..0e3fb0c44 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-get-resp.json @@ -0,0 +1,8 @@ +{ + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-post-req.json new file mode 100644 index 000000000..b51e5f00f --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-post-req.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "kernel_id": "False", + "Label": "UpdatedImage" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-post-resp.json new file mode 100644 index 000000000..21c50fd14 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-post-resp.json @@ -0,0 +1,9 @@ +{ + "metadata": { + "Label": "UpdatedImage", + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "False", + "ramdisk_id": "nokernel" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-put-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-put-req.json new file mode 100644 index 000000000..eec6152d7 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-put-req.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "auto_disk_config": "True", + "Label": "Changed" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-put-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-put-resp.json new file mode 100644 index 000000000..8c9d6f437 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/image-metadata-put-resp.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "Label": "Changed", + "auto_disk_config": "True" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/images-details-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/images-details-get-resp.json new file mode 100644 index 000000000..2c2abf3c2 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/images-details-get-resp.json @@ -0,0 +1,212 @@ +{ + "images": [ + { + "created": "2011-01-01T01:02:03Z", + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage7", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "False", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage6", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "ramdisk_id": null + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + } + ] +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/images-list-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/images-list-get-resp.json new file mode 100644 index 000000000..f73061c80 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/images/images-list-get-resp.json @@ -0,0 +1,137 @@ +{ + "images": [ + { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage7" + }, + { + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage6" + }, + { + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "http://openstack.example.com/v2.1/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + } + ] +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/limits/limit-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/limits/limit-get-resp.json deleted file mode 100644 index 57fbc856c..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/limits/limit-get-resp.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "limits": { - "rate": [ - { - "limit": [ - { - "next-available": "2013-09-09T13:37:32Z", - "remaining": 10, - "unit": "MINUTE", - "value": 10, - "verb": "POST" - }, - { - "next-available": "2013-09-09T13:37:32Z", - "remaining": 10, - "unit": "MINUTE", - "value": 10, - "verb": "PUT" - }, - { - "next-available": "2013-09-09T13:37:32Z", - "remaining": 100, - "unit": "MINUTE", - "value": 100, - "verb": "DELETE" - } - ], - "regex": ".*", - "uri": "*" - }, - { - "limit": [ - { - "next-available": "2013-09-09T13:37:32Z", - "remaining": 50, - "unit": "DAY", - "value": 50, - "verb": "POST" - } - ], - "regex": "^/servers", - "uri": "*/servers" - }, - { - "limit": [ - { - "next-available": "2013-09-09T13:37:32Z", - "remaining": 3, - "unit": "MINUTE", - "value": 3, - "verb": "GET" - } - ], - "regex": ".*changes_since.*", - "uri": "*changes_since*" - } - ] - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-add-host-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-add-host-post-req.json index 4525bdd29..6e3012041 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-add-host-post-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-add-host-post-req.json @@ -1,5 +1,5 @@ { "add_host": { - "host": "581d29b9e3504d8a895caddb13839b15" + "host": "21549b2f665945baaa7101926a00143c" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-add-host-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-add-host-post-req.xml deleted file mode 100644 index 1917706bc..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-add-host-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-metadata-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-metadata-post-req.xml deleted file mode 100644 index 72b1e742a..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-metadata-post-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - value - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-post-req.xml deleted file mode 100644 index 4931476ae..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-post-resp.json index 74662af48..1f8ab1809 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-post-resp.json @@ -1,7 +1,7 @@ { "aggregate": { "availability_zone": "nova", - "created_at": "2012-10-01T18:50:27.781065", + "created_at": "2013-08-18T12:17:55.751757", "deleted": false, "deleted_at": null, "id": 1, diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-post-resp.xml deleted file mode 100644 index 8adf636f4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-post-resp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - name - nova - False - 2012-10-01 18:50:35.506667 - None - None - 1 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-remove-host-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-remove-host-post-req.json index f635f4421..14fca62fa 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-remove-host-post-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-remove-host-post-req.json @@ -1,5 +1,5 @@ { "remove_host": { - "host": "581d29b9e3504d8a895caddb13839b15" + "host": "bf1454b3d71145d49fca2101c56c728d" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-remove-host-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-remove-host-post-req.xml deleted file mode 100644 index f481b413e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-remove-host-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-update-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-update-post-req.xml deleted file mode 100644 index 04ce4fba5..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-update-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-update-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-update-post-resp.json index 5eeba4c9b..c59a82f15 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-update-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-update-post-resp.json @@ -1,7 +1,7 @@ { "aggregate": { "availability_zone": "nova2", - "created_at": "2012-12-04T12:04:27.075065", + "created_at": "2013-08-18T12:17:56.259751", "deleted": false, "deleted_at": null, "hosts": [], @@ -10,6 +10,6 @@ "availability_zone": "nova2" }, "name": "newname", - "updated_at": "2012-12-04T12:04:27.242597" + "updated_at": "2013-08-18T12:17:56.286720" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-update-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-update-post-resp.xml deleted file mode 100644 index 87a52f88d..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregate-update-post-resp.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - newname - nova2 - False - 2012-12-04 12:04:30.245284 - 2012-12-04 12:04:30.357795 - - None - 1 - - nova2 - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-add-host-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-add-host-post-resp.json index 99cbb6b00..568be44eb 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-add-host-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-add-host-post-resp.json @@ -1,11 +1,11 @@ { "aggregate": { "availability_zone": "nova", - "created_at": "2012-12-04T12:04:24.399784", + "created_at": "2013-08-18T12:17:56.297823", "deleted": false, "deleted_at": null, "hosts": [ - "0438c6a4e8d841ad823b801d681f4680" + "21549b2f665945baaa7101926a00143c" ], "id": 1, "metadata": { diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-add-host-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-add-host-post-resp.xml deleted file mode 100644 index a3a4820aa..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-add-host-post-resp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - name - nova - False - 2012-12-04 12:04:27.574038 - None - - 392adba19dd449179804eaff16ff4a97 - - None - 1 - - nova - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-get-resp.json index 101a6584d..08f4b8ed0 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-get-resp.json @@ -1,7 +1,7 @@ { "aggregate": { "availability_zone": "nova", - "created_at": "2012-11-16T06:22:23.032493", + "created_at": "2013-08-18T12:17:56.380226", "deleted": false, "deleted_at": null, "hosts": [], diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-get-resp.xml deleted file mode 100644 index 431e59cf4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-get-resp.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - name - nova - False - 2012-11-16 06:22:25.587739 - None - - None - 1 - - nova - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-list-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-list-get-resp.json index bc090cee8..f10de405f 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-list-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-list-get-resp.json @@ -2,7 +2,7 @@ "aggregates": [ { "availability_zone": "nova", - "created_at": "2012-11-16T06:22:23.361359", + "created_at": "2013-08-18T12:17:56.856455", "deleted": false, "deleted_at": null, "hosts": [], diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-list-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-list-get-resp.xml deleted file mode 100644 index 8d92e1466..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-list-get-resp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - name - nova - False - 2012-11-16 06:22:25.935099 - None - - None - 1 - - nova - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-metadata-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-metadata-post-resp.json index 1322f448b..83bf953f0 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-metadata-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-metadata-post-resp.json @@ -1,7 +1,7 @@ { "aggregate": { "availability_zone": "nova", - "created_at": "2012-11-16T06:22:22.342791", + "created_at": "2013-08-18T12:17:55.959571", "deleted": false, "deleted_at": null, "hosts": [], diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-metadata-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-metadata-post-resp.xml deleted file mode 100644 index 9d6e0ca95..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-metadata-post-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - name - nova - False - 2012-11-16 06:22:24.864471 - None - - None - 1 - - value - nova - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-remove-host-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-remove-host-post-resp.json index 4c4367bea..732766b1f 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-remove-host-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-remove-host-post-resp.json @@ -1,14 +1,13 @@ { "aggregate": { "availability_zone": "nova", - "created_at": "2012-12-04T12:04:26.557909", + "created_at": "2013-08-18T12:17:56.990581", "deleted": false, "deleted_at": null, "hosts": [], "id": 1, "metadata": { - "availability_zone": "nova", - "key": "value" + "availability_zone": "nova" }, "name": "name", "updated_at": null diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml deleted file mode 100644 index a04d53e24..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - name - nova - False - 2012-12-04 12:04:29.722109 - None - - None - 1 - - nova - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json index 3ca0dd144..8c9a309ea 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.json @@ -3,7 +3,7 @@ "volume_id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c", "create_info": { "snapshot_id": "421752a6-acf6-4b2d-bc7a-119f9148cd8c", - "type": "qcow", + "type": "qcow2", "new_file": "new_file_name" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml deleted file mode 100644 index 9aff79dd2..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - 521752a6-acf6-4b2d-bc7a-119f9148cd8c - - 421752a6-acf6-4b2d-bc7a-119f9148cd8c - qcow - new_file_name - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml deleted file mode 100644 index 5da7d148b..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml deleted file mode 100644 index 877c1d845..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - ce531f90-199f-48c0-816c-13e38010b442 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json index 3b4e8fff8..49f140448 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-create-resp.json @@ -2,7 +2,7 @@ "interfaceAttachment": { "fixed_ips": [ { - "ip_address": "192.168.1.1", + "ip_address": "192.168.1.3", "subnet_id": "f8a6e8f8-c2ec-497c-9f23-da9616de54ef" } ], diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml deleted file mode 100644 index fba557cb0..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - 3cb9bc59-5699-4588-a4b1-b87f96708bc6 - ce531f90-199f-48c0-816c-13e38010b442 - - - f8a6e8f8-c2ec-497c-9f23-da9616de54ef - 192.168.1.3 - - - ACTIVE - fa:16:3e:4c:2c:30 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json index 2c62ef9d5..8ab3e7919 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-list-resp.json @@ -1,16 +1,16 @@ { "interfaceAttachments": [ { - "port_state": "ACTIVE", "fixed_ips": [ { - "subnet_id": "f8a6e8f8-c2ec-497c-9f23-da9616de54ef", - "ip_address": "192.168.1.3" + "ip_address": "192.168.1.3", + "subnet_id": "f8a6e8f8-c2ec-497c-9f23-da9616de54ef" } ], + "mac_addr": "fa:16:3e:4c:2c:30", "net_id": "3cb9bc59-5699-4588-a4b1-b87f96708bc6", "port_id": "ce531f90-199f-48c0-816c-13e38010b442", - "mac_addr": "fa:16:3e:4c:2c:30" + "port_state": "ACTIVE" } ] } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml deleted file mode 100644 index 23912dbdc..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - ACTIVE - - - f8a6e8f8-c2ec-497c-9f23-da9616de54ef - 192.168.1.3 - - - ce531f90-199f-48c0-816c-13e38010b442 - 3cb9bc59-5699-4588-a4b1-b87f96708bc6 - fa:16:3e:4c:2c:30 - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-list.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-list.xml deleted file mode 100644 index 3392e2cc6..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-list.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ACTIVE - - - f8a6e8f8-c2ec-497c-9f23-da9616de54ef - 192.168.1.3 - - - ce531f90-199f-48c0-816c-13e38010b442 - 3cb9bc59-5699-4588-a4b1-b87f96708bc6 - fa:16:3e:4c:2c:30 - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json index 14f5b9e1e..49f140448 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-show-resp.json @@ -1,14 +1,14 @@ { "interfaceAttachment": { - "port_state": "ACTIVE", "fixed_ips": [ { - "subnet_id": "f8a6e8f8-c2ec-497c-9f23-da9616de54ef", - "ip_address": "192.168.1.3" + "ip_address": "192.168.1.3", + "subnet_id": "f8a6e8f8-c2ec-497c-9f23-da9616de54ef" } ], + "mac_addr": "fa:16:3e:4c:2c:30", "net_id": "3cb9bc59-5699-4588-a4b1-b87f96708bc6", "port_id": "ce531f90-199f-48c0-816c-13e38010b442", - "mac_addr": "fa:16:3e:4c:2c:30" + "port_state": "ACTIVE" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml deleted file mode 100644 index ce3e2fec2..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - ACTIVE - - - b6e47749-6bf0-4d6e-ae4b-ba6b5e238510 - 192.168.123.131 - - - 89e64f2e-86bd-4c19-9155-4548b36fdcb2 - a9efd207-2c1a-4cdd-a296-d3c7c3211302 - fa:16:3e:a4:1c:12 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-availability-zone/availability-zone-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-availability-zone/availability-zone-list-resp.json new file mode 100644 index 000000000..8190c5492 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-availability-zone/availability-zone-list-resp.json @@ -0,0 +1,11 @@ +{ + "availabilityZoneInfo": [ + { + "hosts": null, + "zoneName": "nova", + "zoneState": { + "available": true + } + } + ] +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.json deleted file mode 100644 index 19a1f76a4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "add_interface": { - "address": "aa:aa:aa:aa:aa:aa" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.xml deleted file mode 100644 index 13b88a8ff..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.json deleted file mode 100644 index 5806617e9..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "interface": { - "address": "aa:aa:aa:aa:aa:aa", - "datapath_id": null, - "id": 1, - "port_no": null - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.xml deleted file mode 100644 index e031325eb..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-req.json deleted file mode 100644 index 389517ed7..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-req.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "node": { - "service_host": "host", - "cpus": 8, - "memory_mb": 8192, - "local_gb": 128, - "pm_address": "10.1.2.3", - "pm_user": "pm_user", - "pm_password": "pm_pass", - "terminal_port": 8000 - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-req.xml deleted file mode 100644 index a06b8d73f..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-req.xml +++ /dev/null @@ -1,10 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.json deleted file mode 100644 index 55000aed4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "node": { - "cpus": 8, - "id": 1, - "instance_uuid": null, - "interfaces": [], - "local_gb": 128, - "memory_mb": 8192, - "pm_address": "10.1.2.3", - "pm_user": "pm_user", - "pxe_config_path": null, - "service_host": "host", - "task_state": null, - "terminal_port": 8000, - "updated_at": null, - "uuid": "73d35253-b6fb-4c83-b8eb-0229336e79b6" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.xml deleted file mode 100644 index b3b78c3de..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.json deleted file mode 100644 index 82b6485b9..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "node": { - "service_host": "host", - "cpus": 8, - "memory_mb": 8192, - "local_gb": 128, - "pm_address": "10.1.2.3", - "pm_user": "pm_user", - "pm_password": "pm_pass", - "prov_mac_address": "12:34:56:78:90:ab", - "terminal_port": 8000 - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.xml deleted file mode 100644 index 8065c41c1..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.xml +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.json deleted file mode 100644 index a5550f081..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "node": { - "cpus": 8, - "id": 1, - "instance_uuid": null, - "interfaces": [ - { - "address": "12:34:56:78:90:ab", - "datapath_id": null, - "id": 1, - "port_no": null - } - ], - "local_gb": 128, - "memory_mb": 8192, - "pm_address": "10.1.2.3", - "pm_user": "pm_user", - "pxe_config_path": null, - "service_host": "host", - "task_state": null, - "terminal_port": 8000, - "updated_at": null, - "uuid": "0a130464-bccc-4e36-b9d3-9a8c98e636ae" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.xml deleted file mode 100644 index fdbdfad84..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.json deleted file mode 100644 index 16c6c0ed9..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": [ - { - "cpus": 8, - "id": 1, - "instance_uuid": null, - "interfaces": [ - { - "address": "aa:aa:aa:aa:aa:aa", - "datapath_id": null, - "id": 1, - "port_no": null - } - ], - "local_gb": 128, - "memory_mb": 8192, - "pm_address": "10.1.2.3", - "pm_user": "pm_user", - "pxe_config_path": null, - "service_host": "host", - "task_state": null, - "terminal_port": 8000, - "updated_at": null, - "uuid": "6fae68da-108b-4a9d-87c4-88831ee1241b" - } - ] -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.xml deleted file mode 100644 index 3208609d4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.json deleted file mode 100644 index aa5d322d9..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "remove_interface": { - "address": "aa:aa:aa:aa:aa:aa" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.xml deleted file mode 100644 index 41ced8dec..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.json deleted file mode 100644 index af8e11faa..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "node": { - "cpus": 8, - "id": 1, - "instance_uuid": null, - "interfaces": [ - { - "address": "aa:aa:aa:aa:aa:aa", - "datapath_id": null, - "id": 1, - "port_no": null - } - ], - "local_gb": 128, - "memory_mb": 8192, - "pm_address": "10.1.2.3", - "pm_user": "pm_user", - "pxe_config_path": null, - "service_host": "host", - "task_state": null, - "terminal_port": 8000, - "updated_at": null, - "uuid": "c862b836-c7c1-4f7f-8081-6766fa9cf38b" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.xml deleted file mode 100644 index 853542577..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cell-capacities/cells-capacities-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cell-capacities/cells-capacities-resp.json deleted file mode 100644 index 6b7d5a94a..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cell-capacities/cells-capacities-resp.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "cell": { - "capacities": { - "ram_free": { - "units_by_mb": { - "8192": 0, - "512": 13, - "4096": 1, - "2048": 3, - "16384": 0 - }, - "total_mb": 7680 - }, - "disk_free": { - "units_by_mb": { - "81920": 11, - "20480": 46, - "40960": 23, - "163840": 5, - "0": 0 - }, - "total_mb": 1052672 - } - } - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cell-capacities/cells-capacities-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cell-capacities/cells-capacities-resp.xml deleted file mode 100644 index 63672b00b..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cell-capacities/cells-capacities-resp.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml deleted file mode 100644 index 87d21963c..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 192.168.1.1 - 2000 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-create-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-create-req.json index 1c7f45622..74e69e27d 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-create-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-create-req.json @@ -1,5 +1,5 @@ { "cloudpipe": { - "project_id": "cloudpipe-059f21e3-c20e-4efc-9e7a-eba2ab3c6f9a" + "project_id": "059f21e3-c20e-4efc-9e7a-eba2ab3c6f9a" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-create-req.xml deleted file mode 100644 index 883a55ac7..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-create-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml deleted file mode 100644 index 259018c32..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 1a17f615-343b-430f-976a-457c029eddb7 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-get-resp.json index 6f21c6c9f..caaa22774 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-get-resp.json @@ -4,7 +4,7 @@ "created_at": "2012-11-27T17:18:01Z", "instance_id": "27deecdb-baa3-4a26-9c82-32994b815b01", "internal_ip": "192.168.0.3", - "project_id": "cloudpipe-fa1765bd-a352-49c7-a6b7-8ee108a3cb0c", + "project_id": "fa1765bd-a352-49c7-a6b7-8ee108a3cb0c", "public_ip": "127.0.0.1", "public_port": 22, "state": "down" diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml deleted file mode 100644 index 4cb40c174..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - 127.0.0.1 - 2012-09-25T18:18:49Z - 22 - down - 1a17f615-343b-430f-976a-457c029eddb7 - 192.168.0.3 - cloudpipe-6405f2ca-caf9-493b-a1f6-e55f595d75ab - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe-update/cloud-pipe-update-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-update-req.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe-update/cloud-pipe-update-req.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-cloudpipe/cloud-pipe-update-req.json diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-config-drive/server-config-drive-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-config-drive/server-config-drive-get-resp.json index dbf024cef..631c14fc5 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-config-drive/server-config-drive-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-config-drive/server-config-drive-get-resp.json @@ -1,44 +1,44 @@ { "server": { - "accessIPv4": "", - "accessIPv6": "", "addresses": { "private": [ { "addr": "192.168.0.3", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] }, - "config_drive": "", - "created": "2013-02-04T13:17:50Z", + "created": "2013-09-22T02:33:23Z", "flavor": { "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/flavors/1", "rel": "bookmark" } ] }, - "hostId": "8725fb615b191d8249a40f3e90d1efde88d914412e4edb2719176afd", - "id": "dd3b0715-a3fc-43d8-bbd2-2720beb226fb", + "hostId": "1642bbdbd61a0f1c513b4bb6e418326103172698104bfa278eca106b", + "id": "7838ff1b-b71f-48b9-91e9-7c08de20b249", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, + "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/dd3b0715-a3fc-43d8-bbd2-2720beb226fb", + "href": "http://openstack.example.com/v2.1/servers/7838ff1b-b71f-48b9-91e9-7c08de20b249", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/dd3b0715-a3fc-43d8-bbd2-2720beb226fb", + "href": "http://openstack.example.com/servers/7838ff1b-b71f-48b9-91e9-7c08de20b249", "rel": "bookmark" } ], @@ -46,10 +46,11 @@ "My Server Name": "Apache1" }, "name": "new-server-test", + "config_drive": "", "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2013-02-04T13:17:51Z", + "updated": "2013-09-22T02:33:25Z", "user_id": "fake" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-config-drive/servers-config-drive-details-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-config-drive/servers-config-drive-details-resp.json index 3c7bc34bf..53fd8791a 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-config-drive/servers-config-drive-details-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-config-drive/servers-config-drive-details-resp.json @@ -1,45 +1,45 @@ { "servers": [ { - "accessIPv4": "", - "accessIPv6": "", "addresses": { "private": [ { "addr": "192.168.0.3", + "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", + "OS-EXT-IPS:type": "fixed", "version": 4 } ] }, - "config_drive": "", - "created": "2013-02-04T13:21:44Z", + "created": "2013-09-22T02:33:17Z", "flavor": { "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/flavors/1", "rel": "bookmark" } ] }, - "hostId": "76e154b0015e25fad65a7ab0c35a86dd79acfa8312075a6534ef6176", - "id": "720e688f-5ec8-4d4f-b585-dbd1a89ceeb0", + "hostId": "1ed067c90341cd9d94bbe5da960922b56f107262cdc75719a0d97b78", + "id": "f0318e69-11eb-4aed-9840-59b6c72beee8", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] }, + "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/720e688f-5ec8-4d4f-b585-dbd1a89ceeb0", + "href": "http://openstack.example.com/v2.1/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/720e688f-5ec8-4d4f-b585-dbd1a89ceeb0", + "href": "http://openstack.example.com/servers/f0318e69-11eb-4aed-9840-59b6c72beee8", "rel": "bookmark" } ], @@ -47,10 +47,11 @@ "My Server Name": "Apache1" }, "name": "new-server-test", + "config_drive": "", "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2013-02-04T13:21:44Z", + "updated": "2013-09-22T02:33:19Z", "user_id": "fake" } ] diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml deleted file mode 100644 index 18ab81e4c..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - b48316c5-71e8-45e4-9884-6c78055b9b13 - localhost - 5900 - 51af38c3-555e-4884-a314-6c8cdde37444 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml deleted file mode 100644 index 16cf28832..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-req.xml deleted file mode 100644 index 16cf28832..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-resp.json deleted file mode 100644 index 583d9c1e4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-resp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "console": { - "type": "rdp-html5", - "url": "http://example.com:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3&title=dafa(75ecef58-3b8e-4659-ab3b-5501454188e9)" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-resp.xml deleted file mode 100644 index 6c45d6e26..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - rdp-html5 - http://example.com:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-req.json deleted file mode 100644 index d04f7c7ae..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-req.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "os-getSPICEConsole": { - "type": "spice-html5" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-req.xml deleted file mode 100644 index 59052abea..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-resp.json deleted file mode 100644 index 0cbbd8d52..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-resp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "console": { - "type": "spice-html5", - "url": "http://example.com: 6080/spice_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3&title=dafa(75ecef58-3b8e-4659-ab3b-5501454188e9)" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-resp.xml deleted file mode 100644 index 113b982af..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-spice-console-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - spice-html5 - http://example.com:6082/spice_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-req.json deleted file mode 100644 index 1926119ce..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-req.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "os-getVNCConsole": { - "type": "novnc" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-req.xml deleted file mode 100644 index 00f32c6b9..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-resp.json deleted file mode 100644 index 92454fcd2..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-resp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "console": { - "type": "novnc", - "url": "http://example.com: 6080/vnc_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3&title=dafa(75ecef58-3b8e-4659-ab3b-5501454188e9)" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-resp.xml deleted file mode 100644 index 3c7e0c4a3..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-vnc-console-post-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - novnc - http://example.com:6080/vnc_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-deferred-delete/force-delete-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-deferred-delete/force-delete-post-req.xml deleted file mode 100644 index 31928207e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-deferred-delete/force-delete-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-deferred-delete/restore-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-deferred-delete/restore-post-req.xml deleted file mode 100644 index 8a95b4fcc..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-deferred-delete/restore-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-find-host-req.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-find-host-req.json diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-find-host-resp.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-find-host-resp.json diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-req.json index 72a90e19a..583ce9bc7 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-req.json @@ -1,7 +1,7 @@ { "evacuate": { - "host": "TargetHost", + "host": "b419863b7d814906a68fb31703c0dbd6", "adminPass": "MySecretPass", - "onSharedStorage": "True" + "onSharedStorage": "False" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-req.xml deleted file mode 100644 index d9f4824b7..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-resp.xml deleted file mode 100644 index f3235dc0c..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-evacuate/server-evacuate-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -MySecretPass diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml deleted file mode 100644 index a0abe06fb..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml deleted file mode 100644 index f3235dc0c..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -MySecretPass diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-req.json deleted file mode 100644 index fc6476862..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-req.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "pool": "nova" -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-req.xml deleted file mode 100644 index 2d04a4e65..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - -nova diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml deleted file mode 100644 index 9658db49a..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json deleted file mode 100644 index 12f118da5..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "floating_ips": [] -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml deleted file mode 100644 index e2893ef74..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-resp.json deleted file mode 100644 index c3d7e2a14..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-resp.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "floating_ips": [ - { - "fixed_ip": null, - "id": 1, - "instance_id": null, - "ip": "10.10.10.1", - "pool": "nova" - }, - { - "fixed_ip": null, - "id": 2, - "instance_id": null, - "ip": "10.10.10.2", - "pool": "nova" - } - ] -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml deleted file mode 100644 index bbd0b117e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json deleted file mode 100644 index bb20f50af..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "hypervisor": { - "cpu_info": "?", - "current_workload": 0, - "disk_available_least": 0, - "host_ip": "1.1.1.1", - "free_disk_gb": 1028, - "free_ram_mb": 7680, - "hypervisor_hostname": "fake-mini", - "hypervisor_type": "fake", - "hypervisor_version": 1000, - "id": 1, - "local_gb": 1028, - "local_gb_used": 0, - "memory_mb": 8192, - "memory_mb_used": 512, - "running_vms": 0, - "service": { - "host": "5641188ab2964f88a21042b493585ff8", - "id": 2 - }, - "vcpus": 1, - "vcpus_used": 0 - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml deleted file mode 100644 index 4fd6ea8f9..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-req.json deleted file mode 100644 index a58a17912..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-req.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "quota_set": { - "force": "True", - "instances": 45 - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-req.xml deleted file mode 100644 index 9af4a3a1c..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - True - 45 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-resp.json deleted file mode 100644 index d9024b77d..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "quota_set": { - "cores": 20, - "fixed_ips": -1, - "floating_ips": 10, - "injected_file_content_bytes": 10240, - "injected_file_path_bytes": 255, - "injected_files": 5, - "instances": 45, - "key_pairs": 100, - "metadata_items": 128, - "ram": 51200, - "security_group_rules": 20, - "security_groups": 10 - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-resp.xml deleted file mode 100644 index cd1b80ba0..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-quotas/quotas-update-post-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 45 - 100 - 128 - 51200 - 20 - 10 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue-req.json deleted file mode 100644 index 8a4ad0d52..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue-req.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "rescue": { - "adminPass": "MySecretPass", - "rescue_image_ref": "70a599e0-31e7-49b7-b260-868f441e862b" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue-req.xml deleted file mode 100644 index 798e2282b..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue.json deleted file mode 100644 index a023c720b..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "adminPass": "MySecretPass" -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue.xml deleted file mode 100644 index f3235dc0c..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-rescue-with-image/server-rescue.xml +++ /dev/null @@ -1,2 +0,0 @@ - -MySecretPass diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-services-delete/services-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-services-delete/services-get-resp.json deleted file mode 100644 index fefb0474c..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-services-delete/services-get-resp.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "services": [ - { - "id": 1, - "binary": "nova-scheduler", - "host": "host1", - "state": "up", - "status": "disabled", - "updated_at": "2012-10-29T13:42:02.000000", - "zone": "internal" - }, - { - "id": 2, - "binary": "nova-compute", - "host": "host1", - "state": "up", - "status": "disabled", - "updated_at": "2012-10-29T13:42:05.000000", - "zone": "nova" - }, - { - "id": 3, - "binary": "nova-scheduler", - "host": "host2", - "state": "down", - "status": "enabled", - "updated_at": "2012-09-19T06:55:34.000000", - "zone": "internal" - }, - { - "id": 4, - "binary": "nova-compute", - "host": "host2", - "state": "down", - "status": "disabled", - "updated_at": "2012-09-18T08:03:38.000000", - "zone": "nova" - } - ] -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-services-delete/services-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-services-delete/services-get-resp.xml deleted file mode 100644 index b5182a38b..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-services-delete/services-get-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-fixed-ips/fixedip-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-fixed-ips/fixedip-post-req.json index c7598ef6b..4a962d981 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-fixed-ips/fixedip-post-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-fixed-ips/fixedip-post-req.json @@ -1,3 +1,3 @@ { - "reserve": "None" + "reserve": null } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-fixed-ips/fixedip-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-fixed-ips/fixedip-post-req.xml deleted file mode 100644 index 41dd7c0b0..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-fixed-ips/fixedip-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - -None diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-fixed-ips/fixedips-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-fixed-ips/fixedips-get-resp.xml deleted file mode 100644 index 5ac449974..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-fixed-ips/fixedips-get-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - 192.168.1.0/24 - openstack - host -
192.168.1.1
- diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-req.json deleted file mode 100644 index eb23a76c1..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-req.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "addTenantAccess": { - "tenant": "fake_tenant" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml deleted file mode 100644 index 8f0614d88..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - fake_tenant - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json deleted file mode 100644 index e89da4c66..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-resp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor_access": [ - { - "flavor_id": "10", - "tenant_id": "fake_tenant" - } - ] -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml deleted file mode 100644 index 0e889578e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-create-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-create-req.json deleted file mode 100644 index 26950b447..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-create-req.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": { - "name": "test_flavor", - "ram": 1024, - "vcpus": 2, - "disk": 10, - "id": "10", - "os-flavor-access:is_public": false - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-create-req.xml deleted file mode 100644 index f490297ed..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-create-req.xml +++ /dev/null @@ -1,10 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-list-resp.json deleted file mode 100644 index e89da4c66..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-list-resp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "flavor_access": [ - { - "flavor_id": "10", - "tenant_id": "fake_tenant" - } - ] -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-list-resp.xml deleted file mode 100644 index 0e889578e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-list-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json deleted file mode 100644 index a5bee9ae9..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-req.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "removeTenantAccess": { - "tenant": "fake_tenant" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml deleted file mode 100644 index 3cc573f5d..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - fake_tenant - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json deleted file mode 100644 index 3e4bd858b..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "flavor_access": [] -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml deleted file mode 100644 index 80d1ecc48..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.json deleted file mode 100644 index bf6b022ff..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extra_specs": { - "key1": "value1", - "key2": "value2" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml deleted file mode 100644 index ebad9e744..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - value1 - value2 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.json deleted file mode 100644 index bf6b022ff..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extra_specs": { - "key1": "value1", - "key2": "value2" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml deleted file mode 100644 index 246f56302..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - value2 - value1 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.json deleted file mode 100644 index 513df0922..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "key1": "value1" -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml deleted file mode 100644 index 8ece52723..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -value1 diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.json deleted file mode 100644 index bf6b022ff..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extra_specs": { - "key1": "value1", - "key2": "value2" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml deleted file mode 100644 index 246f56302..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - value2 - value1 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.json deleted file mode 100644 index 085ad55c7..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "key1": "new_value1" -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml deleted file mode 100644 index 8ffc5e539..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - -new_value1 diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.json deleted file mode 100644 index 085ad55c7..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "key1": "new_value1" -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml deleted file mode 100644 index d4fbb28e6..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -new_value1 diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-manage/flavor-create-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-manage/flavor-create-post-req.json deleted file mode 100644 index 0c5914a01..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-manage/flavor-create-post-req.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "flavor": { - "name": "test_flavor", - "ram": 1024, - "vcpus": 2, - "disk": 10, - "id": "10" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-manage/flavor-create-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-manage/flavor-create-post-req.xml deleted file mode 100644 index b90c108d0..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-manage/flavor-create-post-req.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - test_flavor - 1024 - 2 - 10 - 10 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json index ffe24ab08..defb5bd15 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json @@ -1,20 +1,24 @@ { "flavor": { + "OS-FLV-DISABLED:disabled": false, "disk": 1, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "1", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/flavors/1", + "href": "http://openstack.example.com/v2.1/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/flavors/1", "rel": "bookmark" } ], "name": "m1.tiny", "ram": 512, "rxtx_factor": 1.0, + "swap": "", "vcpus": 1 } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json index f104ccfd2..8e65c674d 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json @@ -1,93 +1,113 @@ { "flavors": [ { + "OS-FLV-DISABLED:disabled": false, "disk": 1, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "1", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/flavors/1", + "href": "http://openstack.example.com/v2.1/flavors/1", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/flavors/1", "rel": "bookmark" } ], "name": "m1.tiny", "ram": 512, "rxtx_factor": 1.0, + "swap": "", "vcpus": 1 }, { + "OS-FLV-DISABLED:disabled": false, "disk": 20, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "2", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/flavors/2", + "href": "http://openstack.example.com/v2.1/flavors/2", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/2", + "href": "http://openstack.example.com/flavors/2", "rel": "bookmark" } ], "name": "m1.small", "ram": 2048, "rxtx_factor": 1.0, + "swap": "", "vcpus": 1 }, { + "OS-FLV-DISABLED:disabled": false, "disk": 40, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "3", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/flavors/3", + "href": "http://openstack.example.com/v2.1/flavors/3", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/3", + "href": "http://openstack.example.com/flavors/3", "rel": "bookmark" } ], "name": "m1.medium", "ram": 4096, "rxtx_factor": 1.0, + "swap": "", "vcpus": 2 }, { + "OS-FLV-DISABLED:disabled": false, "disk": 80, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "4", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/flavors/4", + "href": "http://openstack.example.com/v2.1/flavors/4", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/4", + "href": "http://openstack.example.com/flavors/4", "rel": "bookmark" } ], "name": "m1.large", "ram": 8192, "rxtx_factor": 1.0, + "swap": "", "vcpus": 4 }, { + "OS-FLV-DISABLED:disabled": false, "disk": 160, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "5", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/flavors/5", + "href": "http://openstack.example.com/v2.1/flavors/5", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/5", + "href": "http://openstack.example.com/flavors/5", "rel": "bookmark" } ], "name": "m1.xlarge", "ram": 16384, "rxtx_factor": 1.0, + "swap": "", "vcpus": 8 } ] diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml deleted file mode 100644 index e9442628a..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json index ce08695d2..137107913 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json @@ -1,20 +1,24 @@ { "flavor": { + "OS-FLV-DISABLED:disabled": false, "disk": 10, + "OS-FLV-EXT-DATA:ephemeral": 0, + "os-flavor-access:is_public": true, "id": "100", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/flavors/100", + "href": "http://openstack.example.com/v2.1/flavors/100", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/flavors/100", + "href": "http://openstack.example.com/flavors/100", "rel": "bookmark" } ], "name": "flavortest", "ram": 1024, "rxtx_factor": 2.0, + "swap": "", "vcpus": 2 } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-swap/flavor-swap-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-swap/flavor-swap-post-req.json deleted file mode 100644 index e6e686411..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-swap/flavor-swap-post-req.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flavor": { - "name": "flavortest", - "ram": 1024, - "vcpus": 2, - "disk": 10, - "id": "100", - "swap": 5 - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-swap/flavor-swap-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-swap/flavor-swap-post-req.xml deleted file mode 100644 index 8189526a4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-flavor-swap/flavor-swap-post-req.xml +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml deleted file mode 100644 index 47979116a..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 192.168.53.11 - A - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml deleted file mode 100644 index 7d45eb5e3..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json index ce4802451..b2e1df650 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.json @@ -1,6 +1,5 @@ { "domain_entry": { - "domain": "domain1.example.org", "scope": "public", "project": "project1" } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml deleted file mode 100644 index 7686c319a..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - domain1.example.org - public - project1 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml deleted file mode 100644 index 76a88f740..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml deleted file mode 100644 index f3bfe8fb4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml deleted file mode 100644 index 3c960fdc1..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml deleted file mode 100644 index ef7dc5591..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml deleted file mode 100644 index d61d2343f..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml deleted file mode 100644 index 0e95ffcfe..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml +++ /dev/null @@ -1,6 +0,0 @@ - - -192.168.1.0/24 -nova -eth0 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml deleted file mode 100644 index 7be25c8ad..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - eth0 - 192.168.1.0/24 - nova - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml deleted file mode 100644 index caab49435..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - -192.168.1.0/24 diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml deleted file mode 100644 index 82f817b92..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -192.168.1.0/24 diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json index e7f270fd2..2d5e12496 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.json @@ -3,6 +3,7 @@ { "address": "10.10.10.3", "instance_uuid": null, + "fixed_ip": null, "interface": "eth0", "pool": "nova", "project_id": null diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml deleted file mode 100644 index a14302e07..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - eth0 - None - None - nova -
10.10.10.3
- - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json index 6542d4305..f02151884 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.json @@ -3,6 +3,7 @@ { "address": "10.10.10.1", "instance_uuid": null, + "fixed_ip": null, "interface": "eth0", "pool": "nova", "project_id": null @@ -10,6 +11,7 @@ { "address": "10.10.10.2", "instance_uuid": null, + "fixed_ip": null, "interface": "eth0", "pool": "nova", "project_id": null @@ -17,6 +19,7 @@ { "address": "10.10.10.3", "instance_uuid": null, + "fixed_ip": null, "interface": "eth0", "pool": "nova", "project_id": null diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml deleted file mode 100644 index c5efb0b89..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - eth0 - None - None - nova -
10.10.10.1
- - - eth0 - None - None - nova -
10.10.10.2
- - - eth0 - None - None - nova -
10.10.10.3
- - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-create-req.xml deleted file mode 100644 index 2d04a4e65..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-create-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - -nova diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-create-resp.xml deleted file mode 100644 index 9658db49a..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-create-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-get-resp.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-floating-ips/floating-ips-create-resp.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-get-resp.json diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml deleted file mode 100644 index e2893ef74..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-list-resp.xml deleted file mode 100644 index bbd0b117e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-floating-ips/floating-ips-list-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-instance-actions/instance-action-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-instance-actions/instance-action-get-resp.json index 6ad78dfda..cbb6236c4 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-instance-actions/instance-action-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-instance-actions/instance-action-get-resp.json @@ -1,5 +1,5 @@ { - "instance_action": { + "instanceAction": { "action": "reboot", "events": [ { diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-instance-actions/instance-actions-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-instance-actions/instance-actions-list-resp.json index b41dbfa3e..b9ae31ac5 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-instance-actions/instance-actions-list-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-instance-actions/instance-actions-list-resp.json @@ -1,5 +1,5 @@ { - "instance_actions": [ + "instanceActions": [ { "action": "resize", "instance_uuid": "b48316c5-71e8-45e4-9884-6c78055b9b13", diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-multinic/multinic-remove-fixed-ip-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-multinic/multinic-remove-fixed-ip-req.json index 72c8cf294..f93dab91f 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-multinic/multinic-remove-fixed-ip-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-multinic/multinic-remove-fixed-ip-req.json @@ -1,5 +1,5 @@ { - "remove_fixed_ip": { + "removeFixedIp": { "address": "10.0.0.4" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-personality/server-action-rebuild-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-personality/server-action-rebuild-req.json new file mode 100644 index 000000000..2d82ec783 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-personality/server-action-rebuild-req.json @@ -0,0 +1,15 @@ +{ + "rebuild": { + "imageRef": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "name": "new-server-test", + "metadata": { + "meta_var": "meta_val" + }, + "personality": [ + { + "path": "/etc/banner.txt", + "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-personality/server-action-rebuild-resp.json similarity index 66% rename from api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-get-resp.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-personality/server-action-rebuild-resp.json index 523a56d11..dfa0542ea 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-disk-config/server-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-personality/server-action-rebuild-resp.json @@ -1,17 +1,15 @@ { "server": { - "OS-DCF:diskConfig": "AUTO", "addresses": { "private": [ { "addr": "192.168.0.3", - "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff", - "OS-EXT-IPS:type": "fixed", "version": 4 } ] }, - "created": "2012-12-02T02:11:55Z", + "adminPass": "99WHAxN8gpvg", + "created": "2013-11-06T07:51:09Z", "flavor": { "id": "1", "links": [ @@ -21,8 +19,8 @@ } ] }, - "hostId": "c949ab4256cea23b6089b710aa2df48bf6577ed915278b62e33ad8bb", - "id": "5046e2f2-3b33-4041-b3cf-e085f73e78e7", + "hostId": "5c8072dbcda8ce3f26deb6662bd7718e1a6d349bdf2296911d1be4ac", + "id": "53a63a19-c145-47f8-9ae5-b39d6bff33ec", "image": { "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ @@ -34,23 +32,22 @@ }, "links": [ { - "href": "http://openstack.example.com/v2.1/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", + "href": "http://openstack.example.com/v2.1/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", "rel": "self" }, { - "href": "http://openstack.example.com/servers/5046e2f2-3b33-4041-b3cf-e085f73e78e7", + "href": "http://openstack.example.com/servers/53a63a19-c145-47f8-9ae5-b39d6bff33ec", "rel": "bookmark" } ], "metadata": { - "My Server Name": "Apache1" + "meta_var": "meta_val" }, "name": "new-server-test", "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "2012-12-02T02:11:55Z", - "key_name": null, + "updated": "2013-11-06T07:51:11Z", "user_id": "fake" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json new file mode 100644 index 000000000..2e2ea76d1 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-preserve-ephemeral.json @@ -0,0 +1,11 @@ +{ + "rebuild": { + "imageRef": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", + "name": "foobar", + "adminPass": "seekr3t", + "metadata": { + "meta_var": "meta_val" + }, + "preserve_ephemeral": false + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json index 6575c154e..6e477722d 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json @@ -4,13 +4,14 @@ "fixed_ips": -1, "floating_ips": 10, "id": "test_class", + "injected_file_content_bytes": 10240, + "injected_file_path_bytes": 255, + "injected_files": 5, "instances": 10, "key_pairs": 100, "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10, - "server_group_members": 10, - "server_groups": 10 + "security_groups": 10 } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-req.json index 0423bf0a0..f074c829f 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-req.json @@ -4,12 +4,12 @@ "cores": 50, "ram": 51200, "floating_ips": 10, - "fixed_ips": -1, "metadata_items": 128, + "injected_files": 5, + "injected_file_content_bytes": 10240, + "injected_file_path_bytes": 255, "security_groups": 10, "security_group_rules": 20, - "key_pairs": 100, - "server_group_members": 10, - "server_groups": 10 + "key_pairs": 100 } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json index 6d305f67d..c86f86063 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json @@ -3,14 +3,14 @@ "cores": 50, "fixed_ips": -1, "floating_ips": 10, - "id": "test_class", + "injected_file_content_bytes": 10240, + "injected_file_path_bytes": 255, + "injected_files": 5, "instances": 50, "key_pairs": 100, "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10, - "server_group_members": 10, - "server_groups": 10 + "security_groups": 10 } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-rdp-console-post-req.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-consoles/get-rdp-console-post-req.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-rdp-console-post-req.json diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-rdp-console-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-rdp-console-post-resp.json new file mode 100644 index 000000000..09f3ca3d8 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-rdp-console-post-resp.json @@ -0,0 +1,6 @@ +{ + "console": { + "type": "rdp-html5", + "url": "http://127.0.0.1:6083/?token=191996c3-7b0f-42f3-95a7-f1839f2da6ed" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-serial-console-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-serial-console-post-req.json new file mode 100644 index 000000000..1d754d660 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-serial-console-post-req.json @@ -0,0 +1,5 @@ +{ + "os-getSerialConsole": { + "type": "serial" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-serial-console-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-serial-console-post-resp.json new file mode 100644 index 000000000..3f826c6a3 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-serial-console-post-resp.json @@ -0,0 +1,6 @@ +{ + "console": { + "type": "serial", + "url": "ws://127.0.0.1:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-spice-console-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-spice-console-post-req.json index dffe8f138..d04f7c7ae 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-spice-console-post-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-spice-console-post-req.json @@ -1,5 +1,5 @@ { - "get_spice_console": { + "os-getSPICEConsole": { "type": "spice-html5" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-vnc-console-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-vnc-console-post-req.json index 54be90040..1926119ce 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-vnc-console-post-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-remote-consoles/get-vnc-console-post-req.json @@ -1,5 +1,5 @@ { - "get_vnc_console": { + "os-getVNCConsole": { "type": "novnc" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json index e6cdf6f9c..0f9b46210 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.json @@ -3,6 +3,6 @@ "ip_protocol": "TCP", "from_port": "80", "to_port": "80", - "cidr": "10.10.12.0/24" + "cidr": "10.10.10.0/24" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml deleted file mode 100644 index 476a5f798..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - TCP - 80 - 80 - 10.10.12.0/24 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml deleted file mode 100644 index 39067e743..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - TCP - 80 - 80 - - 10.10.10.0/24 - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml deleted file mode 100644 index 3a7e3be78..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - TCP - 80 - 80 - - 10.10.10.0/24 - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json index ab4f907ef..fc5e55fcd 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.json @@ -1,11 +1,11 @@ { "security_group_default_rule": { - "id": 1, "from_port": 80, - "to_port": 80, + "id": 1, "ip_protocol": "TCP", "ip_range": { "cidr": "10.10.10.0/24" - } + }, + "to_port": 80 } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml deleted file mode 100644 index af1afaf1b..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - 80 - 80 - TCP - - 10.10.10.0/24 - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml deleted file mode 100644 index 48b8c0c07..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 524288 - 5778432 - 26701 - 0 - 0 - 2070139 - 262144 - 488 - 140208 - 0 - 662 - 0 - 17300000000 - 112 - -1 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-external-events/event-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-external-events/event-create-req.xml deleted file mode 100644 index cb1d7ecbd..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-external-events/event-create-req.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - test-event - foo - completed - 7dd63360-256e-4304-ba46-7d87311fbf33 - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-external-events/event-create-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-external-events/event-create-resp.json index eebbe11a0..12af9100a 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-external-events/event-create-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-external-events/event-create-resp.json @@ -3,7 +3,7 @@ { "code": 200, "name": "network-changed", - "server_uuid": "b376b585-848e-4fc3-a000-56635d645194", + "server_uuid": "ff1df7b2-6772-45fd-9326-c0a3b05591c2", "status": "completed", "tag": "foo" } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-external-events/event-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-external-events/event-create-resp.xml deleted file mode 100644 index 93b89cd7f..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-external-events/event-create-resp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - completed - foo - network-changed - 8544aae8-a2e0-4429-8537-d3aaeaf55dc2 - 200 - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-get-resp.xml deleted file mode 100644 index 65d7ba23e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-get-resp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - anti-affinity - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-list-resp.xml deleted file mode 100644 index 0123bb078..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-list-resp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - anti-affinity - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-post-req.xml deleted file mode 100644 index abe845954..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-post-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - anti-affinity - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-post-resp.xml deleted file mode 100644 index 65d7ba23e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-groups/server-groups-post-resp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - anti-affinity - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-password/get-password-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-password/get-password-resp.xml deleted file mode 100644 index 4bec5a6c8..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-password/get-password-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -xlozO3wLCBRWAa2yDjCCVx8vwNPypxnypmRYDa/zErlQ+EzPe1S/Gz6nfmC52mOlOSCRuUOmG7kqqgejPof6M7bOezS387zjq4LSvvwp28zUknzy4YzfFGhnHAdai3TxUJ26pfQCYrq8UTzmKF2Bq8ioSEtVVzM0A96pDh8W2i7BOz6MdoiVyiev/I1K2LsuipfxSJR7Wdke4zNXJjHHP2RfYsVbZ/k9ANu+Nz4iIH8/7Cacud/pphH7EjrY6a4RZNrjQskrhKYed0YERpotyjYk1eDtRe72GrSiXteqCM4biaQ5w3ruS+AcX//PXk3uJ5kC7d67fPXaVz4WaQRYMg== diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-log-put-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-log-put-req.xml deleted file mode 100644 index f8eec8173..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-log-put-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-log-put-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-log-put-resp.json index c82bc54c3..841d71ca2 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-log-put-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-log-put-resp.json @@ -1,8 +1,8 @@ { "service": { "binary": "nova-compute", - "host": "host1", "disabled_reason": "test2", + "host": "host1", "status": "disabled" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-log-put-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-log-put-resp.xml deleted file mode 100644 index 1ddf273b1..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-log-put-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-put-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-put-req.xml deleted file mode 100644 index 598ffc0ca..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-put-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-put-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-put-resp.json index 2c21c547f..0c639ec12 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-put-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-put-resp.json @@ -1,7 +1,7 @@ { "service": { - "host": "host1", "binary": "nova-compute", + "host": "host1", "status": "disabled" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-put-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-put-resp.xml deleted file mode 100644 index f7569159d..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-disable-put-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-enable-put-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-enable-put-req.xml deleted file mode 100644 index 598ffc0ca..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-enable-put-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-enable-put-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-enable-put-resp.json index 75c4ebd55..c54738669 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-enable-put-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-enable-put-resp.json @@ -1,7 +1,7 @@ { "service": { - "host": "host1", "binary": "nova-compute", + "host": "host1", "status": "enabled" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-enable-put-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-enable-put-resp.xml deleted file mode 100644 index 04c29ffa0..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/service-enable-put-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-get-resp.json deleted file mode 100644 index b576ae8c9..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-get-resp.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "services": [ - { - "binary": "nova-scheduler", - "host": "host1", - "state": "up", - "status": "disabled", - "updated_at": "2012-10-29T13:42:02.000000", - "zone": "internal", - "disabled_reason": "test1" - }, - { - "binary": "nova-compute", - "host": "host1", - "state": "up", - "status": "disabled", - "updated_at": "2012-10-29T13:42:05.000000", - "zone": "nova", - "disabled_reason": "test2" - }, - { - "binary": "nova-scheduler", - "host": "host2", - "state": "down", - "status": "enabled", - "updated_at": "2012-09-19T06:55:34.000000", - "zone": "internal", - "disabled_reason": null - }, - { - "binary": "nova-compute", - "host": "host2", - "state": "down", - "status": "disabled", - "updated_at": "2012-09-18T08:03:38.000000", - "zone": "nova", - "disabled_reason": "test4" - } - ] -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-get-resp.xml deleted file mode 100644 index f011bf7b1..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-get-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-list-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-list-get-resp.json index 572d5d863..ad3b86ae5 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-list-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-list-get-resp.json @@ -1,7 +1,9 @@ { "services": [ { + "id": 1, "binary": "nova-scheduler", + "disabled_reason": "test1", "host": "host1", "state": "up", "status": "disabled", @@ -9,7 +11,9 @@ "zone": "internal" }, { + "id": 2, "binary": "nova-compute", + "disabled_reason": "test2", "host": "host1", "state": "up", "status": "disabled", @@ -17,7 +21,9 @@ "zone": "nova" }, { + "id": 3, "binary": "nova-scheduler", + "disabled_reason": null, "host": "host2", "state": "down", "status": "enabled", @@ -25,7 +31,9 @@ "zone": "internal" }, { + "id": 4, "binary": "nova-compute", + "disabled_reason": "test4", "host": "host2", "state": "down", "status": "disabled", diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-list-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-list-get-resp.xml deleted file mode 100644 index e9868c2f2..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-services/services-list-get-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-shelve/os-shelve-offload.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-shelve/os-shelve-offload.xml deleted file mode 100644 index 9e56296e1..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-shelve/os-shelve-offload.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-shelve/os-shelve.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-shelve/os-shelve.xml deleted file mode 100644 index 0445d9257..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-shelve/os-shelve.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-shelve/os-unshelve.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-shelve/os-unshelve.xml deleted file mode 100644 index dff610818..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-shelve/os-unshelve.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json deleted file mode 100644 index 3522140ee..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "limits": { - "absolute": { - "maxImageMeta": 128, - "maxPersonality": 5, - "maxPersonalitySize": 10240, - "maxSecurityGroupRules": 20, - "maxSecurityGroups": 10, - "maxServerMeta": 128, - "maxTotalCores": 20, - "maxTotalFloatingIps": 10, - "maxTotalInstances": 10, - "maxTotalKeypairs": 100, - "maxTotalRAMSize": 51200, - "totalCoresUsed": 0, - "totalInstancesUsed": 0, - "totalRAMUsed": 0, - "totalSecurityGroupsUsed": 0, - "totalFloatingIpsUsed": 0 - }, - "rate": [ - { - "limit": [ - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 120, - "unit": "MINUTE", - "value": 120, - "verb": "POST" - }, - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 120, - "unit": "MINUTE", - "value": 120, - "verb": "PUT" - }, - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 120, - "unit": "MINUTE", - "value": 120, - "verb": "DELETE" - } - ], - "regex": ".*", - "uri": "*" - }, - { - "limit": [ - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 120, - "unit": "MINUTE", - "value": 120, - "verb": "POST" - } - ], - "regex": "^/servers", - "uri": "*/servers" - }, - { - "limit": [ - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 120, - "unit": "MINUTE", - "value": 120, - "verb": "GET" - } - ], - "regex": ".*changes-since.*", - "uri": "*changes-since*" - }, - { - "limit": [ - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 12, - "unit": "MINUTE", - "value": 12, - "verb": "GET" - } - ], - "regex": "^/os-fping", - "uri": "*/os-fping" - } - ] - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml deleted file mode 100644 index a403c5eff..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits/usedlimits-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits/usedlimits-get-resp.json index 3522140ee..28309af04 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits/usedlimits-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits/usedlimits-get-resp.json @@ -12,79 +12,15 @@ "maxTotalInstances": 10, "maxTotalKeypairs": 100, "maxTotalRAMSize": 51200, + "maxServerGroups": 10, + "maxServerGroupMembers": 10, "totalCoresUsed": 0, "totalInstancesUsed": 0, "totalRAMUsed": 0, "totalSecurityGroupsUsed": 0, - "totalFloatingIpsUsed": 0 + "totalFloatingIpsUsed": 0, + "totalServerGroupsUsed": 0 }, - "rate": [ - { - "limit": [ - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 120, - "unit": "MINUTE", - "value": 120, - "verb": "POST" - }, - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 120, - "unit": "MINUTE", - "value": 120, - "verb": "PUT" - }, - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 120, - "unit": "MINUTE", - "value": 120, - "verb": "DELETE" - } - ], - "regex": ".*", - "uri": "*" - }, - { - "limit": [ - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 120, - "unit": "MINUTE", - "value": 120, - "verb": "POST" - } - ], - "regex": "^/servers", - "uri": "*/servers" - }, - { - "limit": [ - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 120, - "unit": "MINUTE", - "value": 120, - "verb": "GET" - } - ], - "regex": ".*changes-since.*", - "uri": "*changes-since*" - }, - { - "limit": [ - { - "next-available": "2012-11-27T17:24:52Z", - "remaining": 12, - "unit": "MINUTE", - "value": 12, - "verb": "GET" - } - ], - "regex": "^/os-fping", - "uri": "*/os-fping" - } - ] + "rate": [] } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits/usedlimits-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits/usedlimits-get-resp.xml deleted file mode 100644 index a403c5eff..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-used-limits/usedlimits-get-resp.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-req.json index addfdb88a..ab5964b4b 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-req.json @@ -6,12 +6,6 @@ "metadata": { "My Server Name": "Apache1" }, - "user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==", - "personality": [ - { - "path": "/etc/banner.txt", - "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" - } - ] + "user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==" } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-req.xml deleted file mode 100644 index 12b0c4189..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-req.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg== - - - Apache1 - - - - ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp - dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k - IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs - c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g - QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo - ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv - dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy - c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 - b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-resp.json index 14ca30cfe..a7f023ac5 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-data/userdata-post-resp.json @@ -1,14 +1,14 @@ { "server": { - "adminPass": "bwQZtcB28c29", - "id": "55116d7b-2cad-4d65-9c7c-964cde61946e", + "adminPass": "2xHoDU7Gd7vw", + "id": "976a62bb-0d4a-4e17-9044-1864e888a557", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/55116d7b-2cad-4d65-9c7c-964cde61946e", + "href": "http://openstack.example.com/v2.1/servers/976a62bb-0d4a-4e17-9044-1864e888a557", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/55116d7b-2cad-4d65-9c7c-964cde61946e", + "href": "http://openstack.example.com/servers/976a62bb-0d4a-4e17-9044-1864e888a557", "rel": "bookmark" } ] diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-show-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-show-get-resp.json deleted file mode 100644 index 239c64d23..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-show-get-resp.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "quota_set": { - "cores": 20, - "fixed_ips": -1, - "floating_ips": 10, - "id": "fake_tenant", - "injected_file_content_bytes": 10240, - "injected_file_path_bytes": 255, - "injected_files": 5, - "instances": 10, - "key_pairs": 100, - "metadata_items": 128, - "ram": 51200, - "security_group_rules": 20, - "security_groups": 10 - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-show-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-show-get-resp.xml deleted file mode 100644 index 76a9292c1..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-show-get-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - -1 - 10 - 10240 - 255 - 5 - 10 - 100 - 128 - 51200 - 20 - 10 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-req.json deleted file mode 100644 index b322b2a87..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-req.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "quota_set": { - "force": "True", - "instances": 9 - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-req.xml deleted file mode 100644 index c5084d44e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-req.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - True - 9 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-resp.json deleted file mode 100644 index 553933292..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "quota_set": { - "cores": 20, - "floating_ips": 10, - "fixed_ips": -1, - "injected_file_content_bytes": 10240, - "injected_file_path_bytes": 255, - "injected_files": 5, - "instances": 9, - "key_pairs": 100, - "metadata_items": 128, - "ram": 51200, - "security_group_rules": 20, - "security_groups": 10 - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-resp.xml deleted file mode 100644 index 43c36c7da..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-user-quotas/user-quotas-update-post-resp.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 20 - 10 - -1 - 10240 - 255 - 5 - 9 - 100 - 128 - 51200 - 20 - 10 - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-virtual-interfaces/vifs-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-virtual-interfaces/vifs-list-resp.xml deleted file mode 100644 index 7f414ccc5..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-virtual-interfaces/vifs-list-resp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volume-attachment-update/update-volume-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volume-attachment-update/update-volume-req.json deleted file mode 100644 index de4472e06..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volume-attachment-update/update-volume-req.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "volumeAttachment": { - "volumeId": "a26887c6-c47b-4654-abb5-dfadf7d3f805", - "device": "/dev/sdd" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volume-attachment-update/update-volume-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volume-attachment-update/update-volume-req.xml deleted file mode 100644 index 44398ed25..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volume-attachment-update/update-volume-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/attach-volume-to-server-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/attach-volume-to-server-req.xml deleted file mode 100644 index a2fc2090b..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/attach-volume-to-server-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/attach-volume-to-server-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/attach-volume-to-server-resp.xml deleted file mode 100644 index b5b970a47..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/attach-volume-to-server-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/list-volume-attachments-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/list-volume-attachments-resp.xml deleted file mode 100644 index 339f049d1..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/list-volume-attachments-resp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-detail-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-detail-resp.xml deleted file mode 100644 index c6ff8c23e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-detail-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-get-resp.xml deleted file mode 100644 index a65b78c9d..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-get-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-index-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-index-resp.xml deleted file mode 100644 index c6ff8c23e..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-index-resp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-post-req.xml deleted file mode 100644 index 9a14aea3b..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-post-resp.xml deleted file mode 100644 index a65b78c9d..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/os-volumes-post-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshot-create-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshot-create-req.xml deleted file mode 100644 index 9eb95dd80..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshot-create-req.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - snap-001 - Daily backup - 521752a6-acf6-4b2d-bc7a-119f9148cd8c - false - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshot-create-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshot-create-resp.xml deleted file mode 100644 index 03c9433e9..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshot-create-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshots-detail-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshots-detail-resp.xml deleted file mode 100644 index b91095848..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshots-detail-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshots-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshots-list-resp.xml deleted file mode 100644 index b7d3979c8..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshots-list-resp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshots-show-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshots-show-resp.xml deleted file mode 100644 index c0b09b982..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/snapshots-show-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/update-volume-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/update-volume-req.json new file mode 100644 index 000000000..d95f96981 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/update-volume-req.json @@ -0,0 +1,5 @@ +{ + "volumeAttachment": { + "volumeId": "a26887c6-c47b-4654-abb5-dfadf7d3f805" + } +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/volume-attachment-detail-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/volume-attachment-detail-resp.xml deleted file mode 100644 index 00a6ffded..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-volumes/volume-attachment-detail-resp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers-sort/server-sort-keys-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers-sort/server-sort-keys-list-resp.json new file mode 100644 index 000000000..c310b3e29 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers-sort/server-sort-keys-list-resp.json @@ -0,0 +1,18 @@ +{ + "servers": [ + { + "id": "e08e6d34-fcc1-480e-b11e-24a675b479f8", + "links": [ + { + "href": "http://openstack.example.com/v2.1/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8", + "rel": "self" + }, + { + "href": "http://openstack.example.com/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8", + "rel": "bookmark" + } + ], + "name": "new-server-test" + } + ] +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-get-resp.json index 4c62a39bd..3500a1960 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-get-resp.json @@ -1,7 +1,5 @@ { "server": { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", "addresses": { "private": [ { @@ -17,7 +15,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/flavors/1", "rel": "bookmark" } ] @@ -28,7 +26,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -36,11 +34,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/0e44cc9c-e052-415d-afbf-469b0d384170", + "href": "http://openstack.example.com/v2.1/servers/0e44cc9c-e052-415d-afbf-469b0d384170", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/0e44cc9c-e052-415d-afbf-469b0d384170", + "href": "http://openstack.example.com/servers/0e44cc9c-e052-415d-afbf-469b0d384170", "rel": "bookmark" } ], diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-post-req.json index c663aafda..284192f69 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-post-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-post-req.json @@ -1,7 +1,5 @@ { "server": { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", "name": "new-server-test", "imageRef": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "flavorRef": "http://openstack.example.com/flavors/1", diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-post-resp.json index dd8d23f47..ce365a90f 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-post-resp.json @@ -4,11 +4,11 @@ "id": "f5dc173b-6804-445a-a6d8-c705dad5b5eb", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/v2.1/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "bookmark" } ] diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/servers-details-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/servers-details-resp.json index 2ddcc06d8..3edca9c3d 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/servers-details-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/servers-details-resp.json @@ -1,8 +1,6 @@ { "servers": [ { - "accessIPv4": "1.2.3.4", - "accessIPv6": "80fe::", "addresses": { "private": [ { @@ -18,7 +16,7 @@ "id": "1", "links": [ { - "href": "http://openstack.example.com/openstack/flavors/1", + "href": "http://openstack.example.com/flavors/1", "rel": "bookmark" } ] @@ -29,7 +27,7 @@ "id": "70a599e0-31e7-49b7-b260-868f441e862b", "links": [ { - "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", "rel": "bookmark" } ] @@ -37,11 +35,11 @@ "key_name": null, "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/v2.1/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "href": "http://openstack.example.com/servers/f5dc173b-6804-445a-a6d8-c705dad5b5eb", "rel": "bookmark" } ], diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/servers-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/servers-list-resp.json index 537f7a49e..8d593b5fd 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/servers-list-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/servers-list-resp.json @@ -4,11 +4,11 @@ "id": "22c91117-08de-4894-9aa9-6ef382400985", "links": [ { - "href": "http://openstack.example.com/v2.1/openstack/servers/22c91117-08de-4894-9aa9-6ef382400985", + "href": "http://openstack.example.com/v2.1/servers/22c91117-08de-4894-9aa9-6ef382400985", "rel": "self" }, { - "href": "http://openstack.example.com/openstack/servers/22c91117-08de-4894-9aa9-6ef382400985", + "href": "http://openstack.example.com/servers/22c91117-08de-4894-9aa9-6ef382400985", "rel": "bookmark" } ], diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-admin-actions-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-admin-actions-v2.1.wadl index 5630cdc33..e6df16681 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-admin-actions-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-admin-actions-v2.1.wadl @@ -345,7 +345,7 @@ diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl index 6c3ae428b..b7baa0d07 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl @@ -40,15 +40,7 @@ - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ip-dns-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ip-dns-v2.1.wadl index 31848b1a3..19c60e69f 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ip-dns-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ip-dns-v2.1.wadl @@ -65,14 +65,6 @@ /> - - - - - @@ -90,14 +82,6 @@ /> - - - - - @@ -108,14 +92,6 @@ /> - - - - - @@ -141,14 +117,6 @@ /> - - - - - @@ -159,14 +127,6 @@ /> - - - - - @@ -184,14 +144,6 @@ /> - - - - - @@ -209,14 +161,6 @@ /> - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ip-pools-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ip-pools-v2.1.wadl index 9b136672d..d85c4b1d4 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ip-pools-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ip-pools-v2.1.wadl @@ -34,14 +34,6 @@ /> - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl index 4afb17bd7..b3bb5a68c 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl @@ -44,14 +44,6 @@ /> - - - - - @@ -69,14 +61,6 @@ /> - - - - - @@ -92,14 +76,6 @@ href="../api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.json" /> - - - - - - - - - - @@ -142,14 +110,6 @@ href="../api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.json" /> - - - - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-v2.1.wadl index 89b3cd85d..3dec9a0a3 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-v2.1.wadl @@ -47,14 +47,6 @@ /> - - - - - @@ -77,14 +69,6 @@ href="../api_samples/os-floating-ips/floating-ips-create-req.json" /> - - - - - @@ -107,14 +91,6 @@ /> - - - - - &x-openstack-request-idHeader; diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-diagnostics-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-diagnostics-v2.1.wadl index 361fbf92f..5c4c929d6 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-diagnostics-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-diagnostics-v2.1.wadl @@ -40,15 +40,6 @@ /> - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-groups-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-groups-v2.1.wadl index 86af0d4d8..aed95fc8d 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-groups-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-groups-v2.1.wadl @@ -1,5 +1,5 @@ - + %common; @@ -49,14 +49,6 @@ href="../api_samples/os-server-groups/server-groups-post-req.json" /> - - - - - @@ -65,7 +57,8 @@ The server group name. A non-empty string with no leading or trailing spaces. Maximum length is 255 - characters. + characters. + Each policy name must be a non-empty string with no leading or trailing spaces. Maximum length is 255 - characters. + characters. + @@ -91,14 +85,7 @@ href="../api_samples/os-server-groups/server-groups-post-resp.json" /> - - - - - &serverGroupParameters; + &serverGroupParameters; @@ -114,16 +101,7 @@ href="../api_samples/os-server-groups/server-groups-list-resp.json" /> - - - - - - - &serverGroupsParameters; + &serverGroupsParameters; @@ -140,16 +118,7 @@ href="../api_samples/os-server-groups/server-groups-get-resp.json" /> - - - - - - - &serverGroupParameters; + &serverGroupParameters; diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl index 3cc91a702..636a65a32 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl @@ -39,14 +39,6 @@ /> - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-shelve-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-shelve-v2.1.wadl index 5d4ba73a0..37ce1c872 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-shelve-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-shelve-v2.1.wadl @@ -91,14 +91,7 @@ href="../api_samples/os-shelve/os-shelve.json" /> - - - - - &shelveAction; + &shelveAction; @@ -151,14 +144,7 @@ href="../api_samples/os-shelve/os-shelve-offload.json" /> - - - - - &shelveOffloadAction; + &shelveOffloadAction; @@ -208,14 +194,7 @@ href="../api_samples/os-shelve/os-unshelve.json" /> - - - - - &unshelveAction; + &unshelveAction; diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-virtual-interfaces-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-virtual-interfaces-v2.1.wadl index 5becbb468..d0be21ea9 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-virtual-interfaces-v2.1.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-virtual-interfaces-v2.1.wadl @@ -25,9 +25,9 @@ Lists the virtual interfaces for a specified instance. - Policy defaults enable only users with the administrative - role or the owner of the server to perform this operation. - Change these permissions through the policy.json file. + Policy defaults enable only users with the administrative role + or the owner of the server to perform this operation. Change + these permissions through the policy.json file. @@ -39,14 +39,6 @@ /> - - - - -