diff --git a/doc/src/docbkx/openstack-api-site/pom.xml b/doc/src/docbkx/openstack-api-site/pom.xml index 4e946899c..d653001af 100644 --- a/doc/src/docbkx/openstack-api-site/pom.xml +++ b/doc/src/docbkx/openstack-api-site/pom.xml @@ -38,8 +38,8 @@ UTF-8 1.5.0 - - + + com.rackspace.cloud.api clouddocs-maven-plugin @@ -63,7 +63,7 @@ true src/docbkx - index.xml + api-reference.xml reviewer openstack diff --git a/doc/src/docbkx/openstack-api-site/src/docbkx/index.xml b/doc/src/docbkx/openstack-api-site/src/docbkx/api-reference.xml similarity index 100% rename from doc/src/docbkx/openstack-api-site/src/docbkx/index.xml rename to doc/src/docbkx/openstack-api-site/src/docbkx/api-reference.xml diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json new file mode 100644 index 000000000..337bc26db --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json @@ -0,0 +1,57 @@ +{ + "server": { + "OS-EXT-SRV-ATTR:host": "f852c7db3f344eec955c369b8478fef7", + "OS-EXT-SRV-ATTR:hypervisor_hostname": null, + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2012-09-13T17:48:30Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "4f846b99d954c7eb75dcbb25e1b92ccc5e77ba74f2bf22c2d8dd24d5", + "id": "0b57a8d2-b1d0-43d8-b81b-9ef446281bfa", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/0b57a8d2-b1d0-43d8-b81b-9ef446281bfa", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/0b57a8d2-b1d0-43d8-b81b-9ef446281bfa", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-09-13T17:48:30Z", + "user_id": "fake" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml new file mode 100644 index 000000000..e8d340a97 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml @@ -0,0 +1,19 @@ + + + + + + + + + + Apache1 + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json new file mode 100644 index 000000000..f92181a34 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json @@ -0,0 +1,59 @@ +{ + "servers": [ + { + "OS-EXT-SRV-ATTR:host": "c90b8445a27f4057ac2457d4f511a617", + "OS-EXT-SRV-ATTR:hypervisor_hostname": null, + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2012-09-14T09:30:19Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "5cb28923c8cc3f45fca3dd884249a8bf98f8a81900dd4b244d446cfd", + "id": "f678aaae-1430-409d-8a48-efa08b885b25", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/f678aaae-1430-409d-8a48-efa08b885b25", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/f678aaae-1430-409d-8a48-efa08b885b25", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-09-14T09:30:19Z", + "user_id": "fake" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml new file mode 100644 index 000000000..4fb7a2f82 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + Apache1 + + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-req.json new file mode 100644 index 000000000..d88eb4122 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-req.json @@ -0,0 +1,16 @@ +{ + "server" : { + "name" : "new-server-test", + "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "http://openstack.example.com/openstack/flavors/1", + "metadata" : { + "My Server Name" : "Apache1" + }, + "personality" : [ + { + "path" : "/etc/banner.txt", + "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml similarity index 71% rename from doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-req.xml rename to doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml index 21a07d520..0a3c8bb53 100644 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-req.xml +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml @@ -1,9 +1,5 @@ - + Apache1 @@ -20,4 +16,4 @@ b25zLiINCg0KLVJpY2hhcmQgQmFjaA== - + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-resp.json new file mode 100644 index 000000000..db9badb91 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-resp.json @@ -0,0 +1,16 @@ +{ + "server": { + "adminPass": "u2mLZBKHKRou", + "id": "0b57a8d2-b1d0-43d8-b81b-9ef446281bfa", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/0b57a8d2-b1d0-43d8-b81b-9ef446281bfa", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/0b57a8d2-b1d0-43d8-b81b-9ef446281bfa", + "rel": "bookmark" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml new file mode 100644 index 000000000..1c7833c3c --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json new file mode 100644 index 000000000..3b421b4e1 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json @@ -0,0 +1,20 @@ +{ + "flavor": { + "OS-FLV-EXT-DATA:ephemeral": 0, + "disk": 0, + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/1", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ], + "name": "m1.tiny", + "ram": 512, + "vcpus": 1 + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml new file mode 100644 index 000000000..dfecff1fc --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json new file mode 100644 index 000000000..ee7696bed --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json @@ -0,0 +1,94 @@ +{ + "flavors": [ + { + "OS-FLV-EXT-DATA:ephemeral": 0, + "disk": 0, + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/1", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ], + "name": "m1.tiny", + "ram": 512, + "vcpus": 1 + }, + { + "OS-FLV-EXT-DATA:ephemeral": 0, + "disk": 20, + "id": "2", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/2", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/2", + "rel": "bookmark" + } + ], + "name": "m1.small", + "ram": 2048, + "vcpus": 1 + }, + { + "OS-FLV-EXT-DATA:ephemeral": 0, + "disk": 40, + "id": "3", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/3", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/3", + "rel": "bookmark" + } + ], + "name": "m1.medium", + "ram": 4096, + "vcpus": 2 + }, + { + "OS-FLV-EXT-DATA:ephemeral": 0, + "disk": 80, + "id": "4", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/4", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/4", + "rel": "bookmark" + } + ], + "name": "m1.large", + "ram": 8192, + "vcpus": 4 + }, + { + "OS-FLV-EXT-DATA:ephemeral": 0, + "disk": 160, + "id": "5", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/5", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/5", + "rel": "bookmark" + } + ], + "name": "m1.xlarge", + "ram": 16384, + "vcpus": 8 + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml new file mode 100644 index 000000000..7b53621b7 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json new file mode 100644 index 000000000..b0e481a62 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json @@ -0,0 +1,12 @@ +{ + "flavor": { + "OS-FLV-EXT-DATA:ephemeral": 30, + "disk": 10, + "id": "666", + "name": "flavortest", + "ram": 1024, + "rxtx_factor": 2, + "swap": 5, + "vcpus": 2 + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml new file mode 100644 index 000000000..ec1ec2e2b --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml @@ -0,0 +1,11 @@ + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.json new file mode 100644 index 000000000..9eb2c77ff --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.json @@ -0,0 +1,20 @@ +{ + "flavor": { + "OS-FLV-EXT-DATA:ephemeral": 30, + "disk": 10, + "id": "666", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/666", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/666", + "rel": "bookmark" + } + ], + "name": "flavortest", + "ram": 1024, + "vcpus": 2 + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml new file mode 100644 index 000000000..c877553a1 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/extensions-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/extensions-get-resp.json new file mode 100644 index 000000000..22eb1e207 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/extensions-get-resp.json @@ -0,0 +1,348 @@ +{ + "extensions": [ + { + "alias": "NMN", + "description": "Multiple network support", + "links": [], + "name": "Multinic", + "namespace": "http://docs.openstack.org/compute/ext/multinic/api/v1.1", + "updated": "2011-06-09T00:00:00+00:00" + }, + { + "alias": "OS-DCF", + "description": "Disk Management Extension", + "links": [], + "name": "DiskConfig", + "namespace": "http://docs.openstack.org/compute/ext/disk_config/api/v1.1", + "updated": "2011-09-27T00:00:00+00:00" + }, + { + "alias": "OS-EXT-SRV-ATTR", + "description": "Extended Server Attributes support.", + "links": [], + "name": "ExtendedServerAttributes", + "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1", + "updated": "2011-11-03T00:00:00+00:00" + }, + { + "alias": "OS-EXT-STS", + "description": "Extended Status support", + "links": [], + "name": "ExtendedStatus", + "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1", + "updated": "2011-11-03T00:00:00+00:00" + }, + { + "alias": "OS-FLV-DISABLED", + "description": "Support to show the disabled status of a flavor", + "links": [], + "name": "FlavorDisabled", + "namespace": "http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1", + "updated": "2012-08-29T00:00:00+00:00" + }, + { + "alias": "OS-FLV-EXT-DATA", + "description": "Provide additional data for flavors", + "links": [], + "name": "FlavorExtraData", + "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1", + "updated": "2011-09-14T00:00:00+00:00" + }, + { + "alias": "os-admin-actions", + "description": "Enable admin-only server actions\n\n Actions include: pause, unpause, suspend, resume, migrate,\n resetNetwork, injectNetworkInfo, lock, unlock, createBackup\n ", + "links": [], + "name": "AdminActions", + "namespace": "http://docs.openstack.org/compute/ext/admin-actions/api/v1.1", + "updated": "2011-09-20T00:00:00+00:00" + }, + { + "alias": "os-aggregates", + "description": "Admin-only aggregate administration", + "links": [], + "name": "Aggregates", + "namespace": "http://docs.openstack.org/compute/ext/aggregates/api/v1.1", + "updated": "2012-01-12T00:00:00+00:00" + }, + { + "alias": "os-availability-zone", + "description": "Add availability_zone to the Create Server v1.1 API", + "links": [], + "name": "AvailabilityZone", + "namespace": "http://docs.openstack.org/compute/ext/availabilityzone/api/v1.1", + "updated": "2012-08-09T00:00:00+00:00" + }, + { + "alias": "os-certificates", + "description": "Certificates support", + "links": [], + "name": "Certificates", + "namespace": "http://docs.openstack.org/compute/ext/certificates/api/v1.1", + "updated": "2012-01-19T00:00:00+00:00" + }, + { + "alias": "os-cloudpipe", + "description": "Adds actions to create cloudpipe instances.\n\n When running with the Vlan network mode, you need a mechanism to route\n from the public Internet to your vlans. This mechanism is known as a\n cloudpipe.\n\n At the time of creating this class, only OpenVPN is supported. Support for\n a SSH Bastion host is forthcoming.\n ", + "links": [], + "name": "Cloudpipe", + "namespace": "http://docs.openstack.org/compute/ext/cloudpipe/api/v1.1", + "updated": "2011-12-16T00:00:00+00:00" + }, + { + "alias": "os-config-drive", + "description": "Config Drive Extension", + "links": [], + "name": "ConfigDrive", + "namespace": "http://docs.openstack.org/compute/ext/config_drive/api/v1.1", + "updated": "2012-07-16T00:00:00+00:00" + }, + { + "alias": "os-console-output", + "description": "Console log output support, with tailing ability.", + "links": [], + "name": "ConsoleOutput", + "namespace": "http://docs.openstack.org/compute/ext/os-console-output/api/v2", + "updated": "2011-12-08T00:00:00+00:00" + }, + { + "alias": "os-consoles", + "description": "Interactive Console support.", + "links": [], + "name": "Consoles", + "namespace": "http://docs.openstack.org/compute/ext/os-consoles/api/v2", + "updated": "2011-12-23T00:00:00+00:00" + }, + { + "alias": "os-create-server-ext", + "description": "Extended support to the Create Server v1.1 API", + "links": [], + "name": "Createserverext", + "namespace": "http://docs.openstack.org/compute/ext/createserverext/api/v1.1", + "updated": "2011-07-19T00:00:00+00:00" + }, + { + "alias": "os-deferred-delete", + "description": "Instance deferred delete", + "links": [], + "name": "DeferredDelete", + "namespace": "http://docs.openstack.org/compute/ext/deferred-delete/api/v1.1", + "updated": "2011-09-01T00:00:00+00:00" + }, + { + "alias": "os-flavor-access", + "description": "Flavor access supprt", + "links": [], + "name": "FlavorAccess", + "namespace": "http://docs.openstack.org/compute/ext/flavor_access/api/v2", + "updated": "2012-08-01T00:00:00+00:00" + }, + { + "alias": "os-flavor-extra-specs", + "description": "Instance type (flavor) extra specs", + "links": [], + "name": "FlavorExtraSpecs", + "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_specs/api/v1.1", + "updated": "2011-06-23T00:00:00+00:00" + }, + { + "alias": "os-flavor-manage", + "description": "\n Flavor create/delete API support\n ", + "links": [], + "name": "FlavorManage", + "namespace": "http://docs.openstack.org/compute/ext/flavor_manage/api/v1.1", + "updated": "2012-01-19T00:00:00+00:00" + }, + { + "alias": "os-flavor-rxtx", + "description": "Support to show the rxtx status of a flavor", + "links": [], + "name": "FlavorRxtx", + "namespace": "http://docs.openstack.org/compute/ext/flavor_rxtx/api/v1.1", + "updated": "2012-08-29T00:00:00+00:00" + }, + { + "alias": "os-flavor-swap", + "description": "Support to show the swap status of a flavor", + "links": [], + "name": "FlavorSwap", + "namespace": "http://docs.openstack.org/compute/ext/flavor_swap/api/v1.1", + "updated": "2012-08-29T00:00:00+00:00" + }, + { + "alias": "os-floating-ip-dns", + "description": "Floating IP DNS support", + "links": [], + "name": "FloatingIpDns", + "namespace": "http://docs.openstack.org/ext/floating_ip_dns/api/v1.1", + "updated": "2011-12-23T00:00:00+00:00" + }, + { + "alias": "os-floating-ip-pools", + "description": "Floating IPs support", + "links": [], + "name": "FloatingIpPools", + "namespace": "http://docs.openstack.org/compute/ext/floating_ip_pools/api/v1.1", + "updated": "2012-01-04T00:00:00+00:00" + }, + { + "alias": "os-floating-ips", + "description": "Floating IPs support", + "links": [], + "name": "FloatingIps", + "namespace": "http://docs.openstack.org/compute/ext/floating_ips/api/v1.1", + "updated": "2011-06-16T00:00:00+00:00" + }, + { + "alias": "os-hosts", + "description": "Admin-only host administration", + "links": [], + "name": "Hosts", + "namespace": "http://docs.openstack.org/compute/ext/hosts/api/v1.1", + "updated": "2011-06-29T00:00:00+00:00" + }, + { + "alias": "os-hypervisors", + "description": "Admin-only hypervisor administration", + "links": [], + "name": "Hypervisors", + "namespace": "http://docs.openstack.org/compute/ext/hypervisors/api/v1.1", + "updated": "2012-06-21T00:00:00+00:00" + }, + { + "alias": "os-instance_usage_audit_log", + "description": "Admin-only Task Log Monitoring", + "links": [], + "name": "OSInstanceUsageAuditLog", + "namespace": "http://docs.openstack.org/ext/services/api/v1.1", + "updated": "2012-07-06T01:00:00+00:00" + }, + { + "alias": "os-keypairs", + "description": "Keypair Support", + "links": [], + "name": "Keypairs", + "namespace": "http://docs.openstack.org/compute/ext/keypairs/api/v1.1", + "updated": "2011-08-08T00:00:00+00:00" + }, + { + "alias": "os-multiple-create", + "description": "Allow multiple create in the Create Server v1.1 API", + "links": [], + "name": "MultipleCreate", + "namespace": "http://docs.openstack.org/compute/ext/multiplecreate/api/v1.1", + "updated": "2012-08-07T00:00:00+00:00" + }, + { + "alias": "os-networks", + "description": "Admin-only Network Management Extension", + "links": [], + "name": "Networks", + "namespace": "http://docs.openstack.org/compute/ext/networks/api/v1.1", + "updated": "2011-12-23T00:00:00+00:00" + }, + { + "alias": "os-quota-class-sets", + "description": "Quota classes management support", + "links": [], + "name": "QuotaClasses", + "namespace": "http://docs.openstack.org/compute/ext/quota-classes-sets/api/v1.1", + "updated": "2012-03-12T00:00:00+00:00" + }, + { + "alias": "os-quota-sets", + "description": "Quotas management support", + "links": [], + "name": "Quotas", + "namespace": "http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1", + "updated": "2011-08-08T00:00:00+00:00" + }, + { + "alias": "os-rescue", + "description": "Instance rescue mode", + "links": [], + "name": "Rescue", + "namespace": "http://docs.openstack.org/compute/ext/rescue/api/v1.1", + "updated": "2011-08-18T00:00:00+00:00" + }, + { + "alias": "os-scheduler-hints", + "description": "Pass arbitrary key/value pairs to the scheduler", + "links": [], + "name": "SchedulerHints", + "namespace": "http://docs.openstack.org/compute/ext/scheduler-hints/api/v2", + "updated": "2011-07-19T00:00:00+00:00" + }, + { + "alias": "os-security-groups", + "description": "Security group support", + "links": [], + "name": "SecurityGroups", + "namespace": "http://docs.openstack.org/compute/ext/securitygroups/api/v1.1", + "updated": "2011-07-21T00:00:00+00:00" + }, + { + "alias": "os-server-diagnostics", + "description": "Allow Admins to view server diagnostics through server action", + "links": [], + "name": "ServerDiagnostics", + "namespace": "http://docs.openstack.org/compute/ext/server-diagnostics/api/v1.1", + "updated": "2011-12-21T00:00:00+00:00" + }, + { + "alias": "os-server-start-stop", + "description": "Start/Stop instance compute API support", + "links": [], + "name": "ServerStartStop", + "namespace": "http://docs.openstack.org/compute/ext/servers/api/v1.1", + "updated": "2012-01-23T00:00:00+00:00" + }, + { + "alias": "os-simple-tenant-usage", + "description": "Simple tenant usage extension", + "links": [], + "name": "SimpleTenantUsage", + "namespace": "http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1", + "updated": "2011-08-19T00:00:00+00:00" + }, + { + "alias": "os-used-limits", + "description": "Provide data on limited resources that are being used.", + "links": [], + "name": "UsedLimits", + "namespace": "http://docs.openstack.org/compute/ext/used_limits/api/v1.1", + "updated": "2012-07-13T00:00:00+00:00" + }, + { + "alias": "os-user-data", + "description": "Add user_data to the Create Server v1.1 API", + "links": [], + "name": "UserData", + "namespace": "http://docs.openstack.org/compute/ext/userdata/api/v1.1", + "updated": "2012-08-07T00:00:00+00:00" + }, + { + "alias": "os-virtual-interfaces", + "description": "Virtual interface support", + "links": [], + "name": "VirtualInterfaces", + "namespace": "http://docs.openstack.org/compute/ext/virtual_interfaces/api/v1.1", + "updated": "2011-08-17T00:00:00+00:00" + }, + { + "alias": "os-volume-types", + "description": "Volume types support", + "links": [], + "name": "VolumeTypes", + "namespace": "http://docs.openstack.org/compute/ext/volume_types/api/v1.1", + "updated": "2011-08-24T00:00:00+00:00" + }, + { + "alias": "os-volumes", + "description": "Volumes support", + "links": [], + "name": "Volumes", + "namespace": "http://docs.openstack.org/compute/ext/volumes/api/v1.1", + "updated": "2011-03-25T00:00:00+00:00" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/extensions-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/extensions-get-resp.xml new file mode 100644 index 000000000..4532244d9 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/extensions-get-resp.xml @@ -0,0 +1,146 @@ + + + + Multiple network support + + + Disk Management Extension + + + Extended Server Attributes support. + + + Extended Status support + + + Support to show the disabled status of a flavor + + + Provide additional data for flavors + + + Enable admin-only server actions + + Actions include: pause, unpause, suspend, resume, migrate, + resetNetwork, injectNetworkInfo, lock, unlock, createBackup + + + + Admin-only aggregate administration + + + Add availability_zone to the Create Server v1.1 API + + + Certificates support + + + Adds actions to create cloudpipe instances. + + When running with the Vlan network mode, you need a mechanism to route + from the public Internet to your vlans. This mechanism is known as a + cloudpipe. + + At the time of creating this class, only OpenVPN is supported. Support for + a SSH Bastion host is forthcoming. + + + + Config Drive Extension + + + Console log output support, with tailing ability. + + + Interactive Console support. + + + Extended support to the Create Server v1.1 API + + + Instance deferred delete + + + Flavor access supprt + + + Instance type (flavor) extra specs + + + + Flavor create/delete API support + + + + Support to show the rxtx status of a flavor + + + Support to show the swap status of a flavor + + + Floating IP DNS support + + + Floating IPs support + + + Floating IPs support + + + Admin-only host administration + + + Admin-only hypervisor administration + + + Admin-only Task Log Monitoring + + + Keypair Support + + + Allow multiple create in the Create Server v1.1 API + + + Admin-only Network Management Extension + + + Quota classes management support + + + Quotas management support + + + Instance rescue mode + + + Pass arbitrary key/value pairs to the scheduler + + + Security group support + + + Allow Admins to view server diagnostics through server action + + + Start/Stop instance compute API support + + + Simple tenant usage extension + + + Provide data on limited resources that are being used. + + + Add user_data to the Create Server v1.1 API + + + Virtual interface support + + + Volume types support + + + Volumes support + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavor-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavor-get-resp.json new file mode 100644 index 000000000..bbd681e66 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavor-get-resp.json @@ -0,0 +1,24 @@ +{ + "flavor": { + "OS-FLV-DISABLED:disabled": false, + "OS-FLV-EXT-DATA:ephemeral": 0, + "disk": 0, + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/1", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ], + "name": "m1.tiny", + "os-flavor-access:is_public": true, + "ram": 512, + "rxtx_factor": 1.0, + "swap": "", + "vcpus": 1 + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavor-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavor-get-resp.xml new file mode 100644 index 000000000..fe0451c1e --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavor-get-resp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavors-list-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavors-list-resp.json new file mode 100644 index 000000000..ab86d2a52 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavors-list-resp.json @@ -0,0 +1,74 @@ +{ + "flavors": [ + { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/1", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ], + "name": "m1.tiny" + }, + { + "id": "2", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/2", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/2", + "rel": "bookmark" + } + ], + "name": "m1.small" + }, + { + "id": "3", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/3", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/3", + "rel": "bookmark" + } + ], + "name": "m1.medium" + }, + { + "id": "4", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/4", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/4", + "rel": "bookmark" + } + ], + "name": "m1.large" + }, + { + "id": "5", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/5", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/5", + "rel": "bookmark" + } + ], + "name": "m1.xlarge" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavors-list-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavors-list-resp.xml new file mode 100644 index 000000000..435f96be5 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/flavors-list-resp.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-get-resp.json new file mode 100644 index 000000000..3eb1870f9 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-get-resp.json @@ -0,0 +1,68 @@ +{ + "server": { + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-SRV-ATTR:host": "3972bc79fa2a4754b7559153a5a48422", + "OS-EXT-SRV-ATTR:hypervisor_hostname": null, + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "config_drive": "", + "created": "2012-08-20T21:11:06Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "dc23873c80c22f14705d190b645b59398cbc8ed3cdf6145468051c0d", + "id": "7dc62bde-85f0-45b5-8c74-5fb209314807", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "key_name": null, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/7dc62bde-85f0-45b5-8c74-5fb209314807", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/7dc62bde-85f0-45b5-8c74-5fb209314807", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-08-20T21:11:06Z", + "user_id": "fake" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-get-resp.xml new file mode 100644 index 000000000..6f2d8587f --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-get-resp.xml @@ -0,0 +1,22 @@ + + + + + + + + + + Apache1 + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-req.json new file mode 100644 index 000000000..2269848f4 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-req.json @@ -0,0 +1,16 @@ +{ + "server": { + "flavorRef": "http://openstack.example.com/openstack/flavors/1", + "imageRef": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "personality": [ + { + "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==", + "path": "/etc/banner.txt" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-req.xml new file mode 100644 index 000000000..2dbbb4438 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-req.xml @@ -0,0 +1,19 @@ + + + + Apache1 + + + + ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp + dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k + IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs + c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g + QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo + ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv + dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy + c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 + b25zLiINCg0KLVJpY2hhcmQgQmFjaA== + + + diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-resp.json new file mode 100644 index 000000000..a8dc8258a --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-resp.json @@ -0,0 +1,22 @@ +{ + "server": { + "OS-DCF:diskConfig": "AUTO", + "adminPass": "ahW3PjQNAu6r", + "id": "e726f5ae-8179-44ba-bbfb-8a0c52b33095", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/e726f5ae-8179-44ba-bbfb-8a0c52b33095", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/e726f5ae-8179-44ba-bbfb-8a0c52b33095", + "rel": "bookmark" + } + ], + "security_groups": [ + { + "name": "default" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-resp.xml new file mode 100644 index 000000000..1754dc700 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/server-post-resp.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-details-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-details-resp.json new file mode 100644 index 000000000..dc2698fec --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-details-resp.json @@ -0,0 +1,69 @@ +{ + "servers": [ + { + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-SRV-ATTR:host": "1ed961df12f5434a8e54e0efd1049fa5", + "OS-EXT-SRV-ATTR:hypervisor_hostname": null, + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "config_drive": "", + "created": "2012-09-12T17:16:15Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "c161a6e3edcd047317a6cfbe599d7711850fd871210b62fdd2f6479e", + "id": "1d0f60bc-8c90-425d-8c64-cdaa49cd2303", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/1d0f60bc-8c90-425d-8c64-cdaa49cd2303", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/1d0f60bc-8c90-425d-8c64-cdaa49cd2303", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-09-12T17:16:15Z", + "user_id": "fake" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-details-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-details-resp.xml new file mode 100644 index 000000000..c769c8ec1 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-details-resp.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + Apache1 + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-list-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-list-resp.json new file mode 100644 index 000000000..99b9b1dcc --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-list-resp.json @@ -0,0 +1,18 @@ +{ + "servers": [ + { + "id": "eb51f4a9-8192-4cd0-be78-d8e2c834dbc4", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/eb51f4a9-8192-4cd0-be78-d8e2c834dbc4", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/eb51f4a9-8192-4cd0-be78-d8e2c834dbc4", + "rel": "bookmark" + } + ], + "name": "new-server-test" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-list-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-list-resp.xml new file mode 100644 index 000000000..34e7d90f8 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/all_extensions/servers-list-resp.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavor-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavor-get-resp.json new file mode 100644 index 000000000..160238eea --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavor-get-resp.json @@ -0,0 +1,19 @@ +{ + "flavor": { + "disk": 0, + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/1", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ], + "name": "m1.tiny", + "ram": 512, + "vcpus": 1 + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavor-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavor-get-resp.xml new file mode 100644 index 000000000..93b91a531 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavor-get-resp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavors-list-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavors-list-resp.json new file mode 100644 index 000000000..ab86d2a52 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavors-list-resp.json @@ -0,0 +1,74 @@ +{ + "flavors": [ + { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/1", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ], + "name": "m1.tiny" + }, + { + "id": "2", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/2", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/2", + "rel": "bookmark" + } + ], + "name": "m1.small" + }, + { + "id": "3", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/3", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/3", + "rel": "bookmark" + } + ], + "name": "m1.medium" + }, + { + "id": "4", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/4", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/4", + "rel": "bookmark" + } + ], + "name": "m1.large" + }, + { + "id": "5", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/flavors/5", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/flavors/5", + "rel": "bookmark" + } + ], + "name": "m1.xlarge" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavors-list-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavors-list-resp.xml new file mode 100644 index 000000000..435f96be5 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/flavors-list-resp.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-get-resp.json new file mode 100644 index 000000000..da419650d --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/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/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-get-resp.xml new file mode 100644 index 000000000..77fa67bb1 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-get-resp.xml @@ -0,0 +1,12 @@ + + + + nokernel + True + nokernel + x86_64 + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-get.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-get.json new file mode 100644 index 000000000..6d022eb97 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-get.json @@ -0,0 +1,5 @@ +{ + "meta": { + "kernel_id": "nokernel" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-get.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-get.xml new file mode 100644 index 000000000..1de6b4078 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-get.xml @@ -0,0 +1,2 @@ + +nokernel \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-req.json new file mode 100644 index 000000000..8dec6767d --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-req.json @@ -0,0 +1,5 @@ +{ + "meta" : { + "auto_disk_config" : "False" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-req.xml new file mode 100644 index 000000000..23a6f4718 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-req.xml @@ -0,0 +1,4 @@ + +False \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-resp.json new file mode 100644 index 000000000..3db563ec1 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-resp.json @@ -0,0 +1,5 @@ +{ + "meta": { + "auto_disk_config": "False" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-resp.xml new file mode 100644 index 000000000..c989c38a2 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-meta-key-put-resp.xml @@ -0,0 +1,2 @@ + +False \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-get-resp.json new file mode 100644 index 000000000..588f688d5 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-get-resp.json @@ -0,0 +1,8 @@ +{ + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-get-resp.xml new file mode 100644 index 000000000..8409016bf --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-get-resp.xml @@ -0,0 +1,7 @@ + + + nokernel + True + nokernel + x86_64 + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-req.json new file mode 100644 index 000000000..8447c3dec --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-req.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "kernel_id": "False", + "Label": "UpdatedImage" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-req.xml new file mode 100644 index 000000000..db1b74572 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-req.xml @@ -0,0 +1,5 @@ + + + False + UpdatedImage + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-resp.json new file mode 100644 index 000000000..9479bb339 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/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" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-resp.xml new file mode 100644 index 000000000..1d96bd9af --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-post-resp.xml @@ -0,0 +1,8 @@ + + + False + nokernel + UpdatedImage + x86_64 + True + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-req.json new file mode 100644 index 000000000..36fbc003d --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-req.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "auto_disk_config": "True", + "Label": "Changed" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-req.xml new file mode 100644 index 000000000..454d9294f --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-req.xml @@ -0,0 +1,6 @@ + + + + True + Changed + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-resp.json new file mode 100644 index 000000000..c8c5ee9c4 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-resp.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "Label": "Changed", + "auto_disk_config": "True" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-resp.xml new file mode 100644 index 000000000..7011871cc --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-put-resp.xml @@ -0,0 +1,5 @@ + + + True + Changed + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-resp.json new file mode 100644 index 000000000..657f0b197 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/image-metadata-resp.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-get-resp.json new file mode 100644 index 000000000..44a0e1d77 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/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/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-get-resp.xml new file mode 100644 index 000000000..654251a33 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-get-resp.xml @@ -0,0 +1,71 @@ + + + + + nokernel + True + nokernel + x86_64 + + + + + + + + nokernel + nokernel + x86_64 + + + + + + + + nokernel + nokernel + + + + + + + + nokernel + False + nokernel + x86_64 + + + + + + + + 155d900f-4e14-4e4c-a73d-069cbf4541e6 + None + + + + + + + + nokernel + nokernel + + + + + + + + nokernel + nokernel + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-resp.json new file mode 100644 index 000000000..44a0e1d77 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-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/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-resp.xml new file mode 100644 index 000000000..654251a33 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-details-resp.xml @@ -0,0 +1,71 @@ + + + + + nokernel + True + nokernel + x86_64 + + + + + + + + nokernel + nokernel + x86_64 + + + + + + + + nokernel + nokernel + + + + + + + + nokernel + False + nokernel + x86_64 + + + + + + + + 155d900f-4e14-4e4c-a73d-069cbf4541e6 + None + + + + + + + + nokernel + nokernel + + + + + + + + nokernel + nokernel + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-get-resp.json new file mode 100644 index 000000000..eb14ed3c7 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-get-resp.json @@ -0,0 +1,137 @@ +{ + "images": [ + { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-get-resp.xml new file mode 100644 index 000000000..0674afb09 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-get-resp.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-resp.json new file mode 100644 index 000000000..eb14ed3c7 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-resp.json @@ -0,0 +1,137 @@ +{ + "images": [ + { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/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/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-resp.xml new file mode 100644 index 000000000..0674afb09 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/images-list-resp.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/limit-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/limit-get-resp.json new file mode 100644 index 000000000..29b7b80b6 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/limit-get-resp.json @@ -0,0 +1,74 @@ +{ + "limits": { + "absolute": { + "maxImageMeta": 128, + "maxPersonality": 5, + "maxPersonalitySize": 10240, + "maxServerMeta": 128, + "maxTotalCores": 20, + "maxTotalFloatingIps": 10, + "maxTotalInstances": 10, + "maxTotalKeypairs": 100, + "maxTotalRAMSize": 51200, + "maxTotalVolumeGigabytes": 1000, + "maxTotalVolumes": 10, + "maxSecurityGroups": 10, + "maxSecurityGroupRules": 20 + }, + "rate": [ + { + "limit": [ + { + "next-available": "2012-08-31T22:36:27Z", + "remaining": 10, + "unit": "MINUTE", + "value": 10, + "verb": "POST" + }, + { + "next-available": "2012-08-31T22:36:27Z", + "remaining": 10, + "unit": "MINUTE", + "value": 10, + "verb": "PUT" + }, + { + "next-available": "2012-08-31T22:36:27Z", + "remaining": 100, + "unit": "MINUTE", + "value": 100, + "verb": "DELETE" + } + ], + "regex": ".*", + "uri": "*" + }, + { + "limit": [ + { + "next-available": "2012-08-31T22:36:27Z", + "remaining": 50, + "unit": "DAY", + "value": 50, + "verb": "POST" + } + ], + "regex": "^/servers", + "uri": "*/servers" + }, + { + "limit": [ + { + "next-available": "2012-08-31T22:36:27Z", + "remaining": 3, + "unit": "MINUTE", + "value": 3, + "verb": "GET" + } + ], + "regex": ".*changes-since.*", + "uri": "*changes-since*" + } + ] + } +} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/limit-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/limit-get-resp.xml new file mode 100644 index 000000000..b3811a528 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/limit-get-resp.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-req.json new file mode 100644 index 000000000..7bed92359 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-req.json @@ -0,0 +1,5 @@ +{ + "os-getConsoleOutput": { + "length": 50 + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-req.xml new file mode 100644 index 000000000..9024061fc --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-req.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-resp.json new file mode 100644 index 000000000..27ffe7d4c --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-resp.json @@ -0,0 +1,3 @@ +{ + "output": "FAKE CONSOLE OUTPUT\nANOTHER\nLAST LINE" +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-resp.xml new file mode 100644 index 000000000..9c5bad625 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/console-output-post-resp.xml @@ -0,0 +1,4 @@ + +FAKE CONSOLE OUTPUT +ANOTHER +LAST LINE \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-req.json new file mode 100644 index 000000000..d88eb4122 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-req.json @@ -0,0 +1,16 @@ +{ + "server" : { + "name" : "new-server-test", + "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "http://openstack.example.com/openstack/flavors/1", + "metadata" : { + "My Server Name" : "Apache1" + }, + "personality" : [ + { + "path" : "/etc/banner.txt", + "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-req.xml new file mode 100644 index 000000000..0a3c8bb53 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-req.xml @@ -0,0 +1,19 @@ + + + + Apache1 + + + + ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp + dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k + IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs + c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g + QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo + ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv + dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy + c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 + b25zLiINCg0KLVJpY2hhcmQgQmFjaA== + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-resp.json new file mode 100644 index 000000000..54e47aefa --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-resp.json @@ -0,0 +1,16 @@ +{ + "server": { + "adminPass": "N4Lxd6cMUXmE", + "id": "4e44ac84-f3ed-4219-aa2e-b3d1477f0ac3", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/4e44ac84-f3ed-4219-aa2e-b3d1477f0ac3", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/4e44ac84-f3ed-4219-aa2e-b3d1477f0ac3", + "rel": "bookmark" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-resp.xml new file mode 100644 index 000000000..0efd9029d --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-console-output/server-post-resp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-req.json new file mode 100644 index 000000000..3e437e63f --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-req.json @@ -0,0 +1,11 @@ +{ + "server": { + "name": "new-server-test", + "imageRef": "70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef": "1" + }, + "os:scheduler_hints": { + "hypervisor": "xen", + "near": "2b7c42eb-7736-4a0f-afab-f23969a35ada" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-req.xml new file mode 100644 index 000000000..079289de0 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-req.xml @@ -0,0 +1,10 @@ + + + xen + eb999657-dd6b-464e-8713-95c532ac3b18 + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json new file mode 100644 index 000000000..cc3a87316 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json @@ -0,0 +1,16 @@ +{ + "server": { + "adminPass": "yjzytFHb7XHc", + "id": "f8f4f3ce-f6e0-4e05-8f79-bf984fdfce45", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/f8f4f3ce-f6e0-4e05-8f79-bf984fdfce45", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/f8f4f3ce-f6e0-4e05-8f79-bf984fdfce45", + "rel": "bookmark" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-resp.xml new file mode 100644 index 000000000..59929d808 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-scheduler-hints/scheduler-hints-post-resp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-group-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-group-post-req.json new file mode 100644 index 000000000..d6ab42c69 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-group-post-req.json @@ -0,0 +1,6 @@ +{ + "security_group": { + "name": "json-test", + "description": "description" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-group-post-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-group-post-req.xml new file mode 100644 index 000000000..60b3c249d --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-group-post-req.xml @@ -0,0 +1,5 @@ + + + description + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-create-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-create-resp.json new file mode 100644 index 000000000..d09f83d98 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-create-resp.json @@ -0,0 +1,9 @@ +{ + "security_group": { + "description": "description", + "id": 2, + "name": "json-test", + "rules": [], + "tenant_id": "openstack" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-create-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-create-resp.xml new file mode 100644 index 000000000..494fb28d9 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-create-resp.xml @@ -0,0 +1,7 @@ + + + + description + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-get-resp.json new file mode 100644 index 000000000..1b134d790 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-get-resp.json @@ -0,0 +1,9 @@ +{ + "security_group": { + "description": "default", + "id": 1, + "name": "default", + "rules": [], + "tenant_id": "openstack" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-get-resp.xml new file mode 100644 index 000000000..140f58b4e --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-get-resp.xml @@ -0,0 +1,5 @@ + + + default + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-list-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-list-get-resp.json new file mode 100644 index 000000000..a5c33e699 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-list-get-resp.json @@ -0,0 +1,11 @@ +{ + "security_groups": [ + { + "description": "default", + "id": 1, + "name": "default", + "rules": [], + "tenant_id": "openstack" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-list-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-list-get-resp.xml new file mode 100644 index 000000000..f4266adef --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/security-groups-list-get-resp.xml @@ -0,0 +1,7 @@ + + + + default + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-req.json new file mode 100644 index 000000000..d88eb4122 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-req.json @@ -0,0 +1,16 @@ +{ + "server" : { + "name" : "new-server-test", + "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "flavorRef" : "http://openstack.example.com/openstack/flavors/1", + "metadata" : { + "My Server Name" : "Apache1" + }, + "personality" : [ + { + "path" : "/etc/banner.txt", + "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-req.xml new file mode 100644 index 000000000..77f8db2ef --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-req.xml @@ -0,0 +1,19 @@ + + + + Apache1 + + + + ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp + dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k + IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs + c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g + QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo + ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv + dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy + c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 + b25zLiINCg0KLVJpY2hhcmQgQmFjaA== + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-resp.json new file mode 100644 index 000000000..f77a91e38 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-resp.json @@ -0,0 +1,21 @@ +{ + "server": { + "adminPass": "QmKpgBk7izBM", + "id": "3ad37a3a-d5c4-40ab-9bff-af5b66a0e35b", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/3ad37a3a-d5c4-40ab-9bff-af5b66a0e35b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/3ad37a3a-d5c4-40ab-9bff-af5b66a0e35b", + "rel": "bookmark" + } + ], + "security_groups": [ + { + "name": "default" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-resp.xml new file mode 100644 index 000000000..31af00c24 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-post-resp.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-security-groups-list-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-security-groups-list-resp.json new file mode 100644 index 000000000..a5c33e699 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-security-groups-list-resp.json @@ -0,0 +1,11 @@ +{ + "security_groups": [ + { + "description": "default", + "id": 1, + "name": "default", + "rules": [], + "tenant_id": "openstack" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-security-groups-list-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-security-groups-list-resp.xml new file mode 100644 index 000000000..f4266adef --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-security-groups/server-security-groups-list-resp.xml @@ -0,0 +1,7 @@ + + + + default + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-server-start-stop/server_start_stop.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-server-start-stop/server_start_stop.json new file mode 100644 index 000000000..7fdb5fd30 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-server-start-stop/server_start_stop.json @@ -0,0 +1,3 @@ +{ + "os-stop" : null +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-server-start-stop/server_start_stop.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-server-start-stop/server_start_stop.xml new file mode 100644 index 000000000..69aac4af4 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/os-server-start-stop/server_start_stop.xml @@ -0,0 +1,2 @@ + + diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-changepassword.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-changepassword.json new file mode 100644 index 000000000..6c73e3287 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-changepassword.json @@ -0,0 +1,5 @@ +{ + "changePassword" : { + "adminPass" : "supersecret" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/changepassword.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-changepassword.xml similarity index 78% rename from doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/changepassword.xml rename to doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-changepassword.xml index f1a7ffa16..dad828c46 100644 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/changepassword.xml +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-changepassword.xml @@ -1,4 +1,4 @@ + adminPass="supersecret"/> \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-confirmresize.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-confirmresize.json new file mode 100644 index 000000000..2940d2a39 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-confirmresize.json @@ -0,0 +1,3 @@ +{ + "confirmResize" : null +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-confirmresize.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-confirmresize.xml new file mode 100644 index 000000000..ffad7f16a --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-confirmresize.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-createimage.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-createimage.json new file mode 100644 index 000000000..5631f1eaa --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-createimage.json @@ -0,0 +1,8 @@ +{ + "createImage" : { + "name" : "test-image", + "metadata": { + "myvar": "testenv" + } + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-createimage.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-createimage.xml new file mode 100644 index 000000000..83eec78f0 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-createimage.xml @@ -0,0 +1,8 @@ + + + + testenv + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-reboot.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-reboot.json new file mode 100644 index 000000000..3920ea728 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-reboot.json @@ -0,0 +1,5 @@ +{ + "reboot" : { + "type" : "SOFT" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-reboot.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-reboot.xml new file mode 100644 index 000000000..b36d35801 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-reboot.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild-resp.json new file mode 100644 index 000000000..c68c00038 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild-resp.json @@ -0,0 +1,55 @@ +{ + "server": { + "accessIPv4": "1.2.3.4", + "accessIPv6": "fe80::100", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "adminPass": "seekr3t", + "created": "2012-09-12T17:20:36Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "1e3da81662354c25560b7e5ea6d8123031f67168b6992f20bb84df69", + "id": "075e40fe-9f03-4652-ba8e-5f8e2547899a", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/075e40fe-9f03-4652-ba8e-5f8e2547899a", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/075e40fe-9f03-4652-ba8e-5f8e2547899a", + "rel": "bookmark" + } + ], + "metadata": { + "meta var": "meta val" + }, + "name": "testserver", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-09-12T17:20:37Z", + "user_id": "fake" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild-resp.xml new file mode 100644 index 000000000..3e4a0255b --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild-resp.xml @@ -0,0 +1,19 @@ + + + + + + + + + + Apache1 + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild.json similarity index 63% rename from doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-req.json rename to doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild.json index 2e6a7a342..e5f2c0cd5 100644 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-req.json +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild.json @@ -1,16 +1,18 @@ { - "server" : { - "name" : "new-server-test", - "imageRef" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54", - "flavorRef" : "52415800-8b69-11e0-9b19-734f1195ff37", + "rebuild" : { + "imageRef" : "http://openstack.example.com/v2/32278/images/70a599e0-31e7-49b7-b260-868f441e862b", + "name" : "testserver", + "adminPass" : "seekr3t", + "accessIPv4" : "1.2.3.4", + "accessIPv6" : "fe80::100", "metadata" : { - "My Server Name" : "Apache1" + "meta var" : "meta val" }, "personality" : [ { "path" : "/etc/banner.txt", - "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" - } - ] + "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] } -} +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild.xml new file mode 100644 index 000000000..c97e6a6c1 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-rebuild.xml @@ -0,0 +1,25 @@ + + + + Apache1 + + + + ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp + dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k + IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs + c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g + QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo + ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv + dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy + c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 + b25zLiINCg0KLVJpY2hhcmQgQmFjaA== + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-resize.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-resize.json new file mode 100644 index 000000000..bdaa37a17 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-resize.json @@ -0,0 +1,5 @@ +{ + "resize" : { + "flavorRef" : "2" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/resize.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-resize.xml similarity index 50% rename from doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/resize.xml rename to doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-resize.xml index 0e0125422..8dfb53c6a 100644 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/resize.xml +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-resize.xml @@ -1,4 +1,4 @@ + flavorRef="2"/> \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-revertresize.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-revertresize.json new file mode 100644 index 000000000..76c460242 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-revertresize.json @@ -0,0 +1,3 @@ +{ + "revertResize" : null +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-revertresize.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-revertresize.xml new file mode 100644 index 000000000..7981753e7 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-action-revertresize.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-get-resp.json new file mode 100644 index 000000000..c6ebd4195 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-get-resp.json @@ -0,0 +1,54 @@ +{ + "server": { + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2012-08-20T21:11:09Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "65201c14a29663e06d0748e561207d998b343e1d164bfa0aafa9c45d", + "id": "893c7791-f1df-4c3d-8383-3caae9656c62", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/893c7791-f1df-4c3d-8383-3caae9656c62", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/893c7791-f1df-4c3d-8383-3caae9656c62", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-08-20T21:11:09Z", + "user_id": "fake" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-get-resp.xml new file mode 100644 index 000000000..e59319e42 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-get-resp.xml @@ -0,0 +1,19 @@ + + + + + + + + + + Apache1 + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-req.json new file mode 100644 index 000000000..70e91a97c --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-req.json @@ -0,0 +1,5 @@ +{ + "metadata" : { + "label" : "production servers" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-req.xml new file mode 100644 index 000000000..5c18330c1 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-req.xml @@ -0,0 +1,5 @@ + + + + production servers + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-resp.json new file mode 100644 index 000000000..a3dbd849f --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-resp.json @@ -0,0 +1,5 @@ +{ + "metadata": { + "label": "production servers" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-resp.xml new file mode 100644 index 000000000..bfc90f7f6 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-all-resp.xml @@ -0,0 +1,4 @@ + + + production servers + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-req.json new file mode 100644 index 000000000..730d25345 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-req.json @@ -0,0 +1,5 @@ +{ + "meta" : { + "label" : "production servers" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-req.xml new file mode 100644 index 000000000..b8dd09595 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-req.xml @@ -0,0 +1,3 @@ + + +production servers \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-resp.json new file mode 100644 index 000000000..b83aa4b2e --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-resp.json @@ -0,0 +1,5 @@ +{ + "meta": { + "label": "production servers" + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-resp.xml new file mode 100644 index 000000000..16656dfd5 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-metadata-resp.xml @@ -0,0 +1,2 @@ + +production servers \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-req.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-req.json new file mode 100644 index 000000000..2269848f4 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-req.json @@ -0,0 +1,16 @@ +{ + "server": { + "flavorRef": "http://openstack.example.com/openstack/flavors/1", + "imageRef": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "personality": [ + { + "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==", + "path": "/etc/banner.txt" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-req.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-req.xml new file mode 100644 index 000000000..2dbbb4438 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-req.xml @@ -0,0 +1,19 @@ + + + + Apache1 + + + + ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp + dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k + IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs + c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g + QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo + ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv + dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy + c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 + b25zLiINCg0KLVJpY2hhcmQgQmFjaA== + + + diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-resp.json new file mode 100644 index 000000000..29ce13717 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-resp.json @@ -0,0 +1,16 @@ +{ + "server": { + "adminPass": "MVk5HPrazHcG", + "id": "5bbcc3c4-1da2-4437-a48a-66f15b1b13f9", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9", + "rel": "bookmark" + } + ] + } +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-resp.xml new file mode 100644 index 000000000..9725f33bf --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/server-post-resp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-details-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-details-resp.json new file mode 100644 index 000000000..3ea61531e --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-details-resp.json @@ -0,0 +1,56 @@ +{ + "servers": [ + { + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2012-09-07T16:56:37Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "16d193736a5cfdb60c697ca27ad071d6126fa13baeb670fc9d10645e", + "id": "05184ba3-00ba-4fbc-b7a2-03b62b884931", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/05184ba3-00ba-4fbc-b7a2-03b62b884931", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/05184ba3-00ba-4fbc-b7a2-03b62b884931", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-09-07T16:56:37Z", + "user_id": "fake" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-details-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-details-resp.xml new file mode 100644 index 000000000..83bcf0f79 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-details-resp.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + Apache1 + + + + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-list-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-list-resp.json new file mode 100644 index 000000000..2cc75eef1 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-list-resp.json @@ -0,0 +1,18 @@ +{ + "servers": [ + { + "id": "616fb98f-46ca-475e-917e-2563e5a8cd19", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/616fb98f-46ca-475e-917e-2563e5a8cd19", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/616fb98f-46ca-475e-917e-2563e5a8cd19", + "rel": "bookmark" + } + ], + "name": "new-server-test" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-list-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-list-resp.xml new file mode 100644 index 000000000..cbd7892e7 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/servers-list-resp.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/versions-get-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/versions-get-resp.json new file mode 100644 index 000000000..8bcc7f4f2 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/versions-get-resp.json @@ -0,0 +1,15 @@ +{ + "versions": [ + { + "id": "v2.0", + "links": [ + { + "href": "http://openstack.example.com/v2/", + "rel": "self" + } + ], + "status": "CURRENT", + "updated": "2011-01-21T11:33:21Z" + } + ] +} \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/versions-get-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/versions-get-resp.xml new file mode 100644 index 000000000..d0cea0cd5 --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/api_samples/versions-get-resp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/os-compute-2.wadl b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/os-compute-2.wadl index 7dac146f8..59e40f38a 100644 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/os-compute-2.wadl +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/os-compute-2.wadl @@ -1,13 +1,13 @@ - + - + %common;]> @@ -278,7 +278,7 @@ - + - + &commonFaults; @@ -306,12 +306,12 @@ - + - + &commonFaults; @@ -326,7 +326,7 @@ - + - + &commonFaults; @@ -365,11 +365,11 @@ - + - + &commonFaults; &getFaults; @@ -386,7 +386,7 @@ - + - + &commonFaults; @@ -423,7 +423,7 @@ - + - + &commonFaults; @@ -461,11 +461,11 @@ - + - + &commonFaults; &getFaults; @@ -490,7 +490,7 @@ The following examples show XML and JSON requests: - + @@ -539,7 +539,7 @@ - + @@ -551,12 +551,12 @@ - + - + @@ -577,7 +577,9 @@ path="/csapi:servers/atom:link[@rel='servers']/@href">

List - of servers.

 + of servers.

+ + - + + + + + &commonFaults; @@ -613,7 +619,7 @@

The following examples show the list server responses:

- + @@ -633,8 +639,9 @@ - - + + + &commonFaults; @@ -647,12 +654,12 @@ - + - + &commonFaults; &getFaults; @@ -668,7 +675,7 @@ - + @@ -681,7 +688,7 @@ - + @@ -713,12 +720,12 @@ - + - + @@ -736,11 +743,11 @@ - + - + @@ -756,11 +763,11 @@ - + - + @@ -773,12 +780,12 @@ - + - + @@ -796,11 +803,11 @@ - + - + @@ -831,11 +838,11 @@ - + - + @@ -867,12 +874,12 @@ - + - + @@ -903,11 +910,11 @@ - + - + @@ -1043,7 +1050,7 @@ - + - + @@ -1084,7 +1091,7 @@ - + @@ -1104,7 +1111,7 @@ - + @@ -1119,12 +1126,12 @@ - + - + @@ -1140,7 +1147,7 @@ - + @@ -1159,7 +1166,7 @@ - + @@ -1182,14 +1189,14 @@ - + href="api_samples/image-metadata-post-req.json"/> @@ -1198,7 +1205,7 @@ element="csapi:metadata"> + href="api_samples/image-metadata-post-resp.xml"/> @@ -1218,7 +1225,7 @@ + href="api_samples/image-metadata-post-resp.json"/> @@ -1244,12 +1251,12 @@ - + - + @@ -1257,7 +1264,7 @@ - + @@ -1276,7 +1283,7 @@ - + @@ -1295,12 +1302,12 @@ - + - + @@ -1321,12 +1328,12 @@ - + - + @@ -1334,12 +1341,12 @@ - + - + diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/changepassword.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/changepassword.json deleted file mode 100644 index 45c4fd978..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/changepassword.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "changePassword" : { - "adminPass" : "ss1293837$%^" - } -} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extension.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extension.json deleted file mode 100644 index ce6b62520..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extension.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "extension" : { - "name" : "Public Image Extension", - "namespace" : "http://docs.rackspacecloud.com/servers/api/ext/pie/v1.0", - "alias" : "RS-PIE", - "updated" : "2011-01-22T13:25:27-06:00", - "description" : "Adds the capability to share an image with other users.", - "links" : [ - { - "rel" : "describedby", - "type" : "application/pdf", - "href" : "http://docs.rackspacecloud.com/servers/api/ext/cs-pie-20111111.pdf" - }, - { - "rel" : "describedby", - "type" : "application/vnd.sun.wadl+xml", - "href" : "http://docs.rackspacecloud.com/servers/api/ext/cs-pie.wadl" - } - ] - } -} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extension.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extension.xml deleted file mode 100644 index c6e4023e0..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extension.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - Adds the capability to share an image with other users. - - - - - - diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extensions.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extensions.json deleted file mode 100644 index 3fd77fcdd..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extensions.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "extensions": [ - { - "name": "Public Image Extension", - "namespace": "http://docs.rackspacecloud.com/servers/api/ext/pie/v1.0", - "alias": "RAX-PIE", - "updated": "2011-01-22T13:25:27-06:00", - "description": "Adds the capability to share an image with other users.", - "links": [ - { - "rel": "describedby", - "type": "application/pdf", - "href": "http://docs.rackspacecloud.com/servers/api/ext/cs-pie-20111111.pdf" - }, - { - "rel": "describedby", - "type": "application/vnd.sun.wadl+xml", - "href": "http://docs.rackspacecloud.com/servers/api/ext/cs-pie.wadl" - } - ] - }, - { - "name": "Cloud Block Storage", - "namespace": "http://docs.rackspacecloud.com/servers/api/ext/cbs/v1.0", - "alias": "RAX-CBS", - "updated": "2011-01-12T11:22:33-06:00", - "description": "Allows mounting cloud block storage volumes.", - "links": [ - { - "rel": "describedby", - "type": "application/pdf", - "href": "http://docs.rackspacecloud.com/servers/api/ext/cs-cbs-20111201.pdf" - }, - { - "rel": "describedby", - "type": "application/vnd.sun.wadl+xml", - "href": "http://docs.rackspacecloud.com/servers/api/ext/cs-cbs.wadl" - } - ] - } - ] -} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extensions.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extensions.xml deleted file mode 100644 index 09784bb13..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/extensions.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - Adds the capability to share an - image with other users. - - - - - - - - - Allows mounting cloud block - storage volumes. - - - - - - diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/image.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/image.json deleted file mode 100644 index 1d81a514c..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/image.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "image" : { - "id" : "52415800-8b69-11e0-9b19-734f5736d2a2", - "name" : "My Server Backup", - "updated" : "2010-10-10T12:00:00Z", - "created" : "2010-08-10T12:00:00Z", - "tenant_id" : "12345", - "user_id" : "joe", - "status" : "SAVING", - "progress" : 80, - "minDisk" : 5, - "minRam" : 256, - "server" : { - "id": "52415800-8b69-11e0-9b19-734f335aa7b3", - "links": [ - { - "rel": "self", - "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3" - }, - { - "rel": "bookmark", - "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3" - } - ] - }, - "links": [ - { - "rel" : "self", - "href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" - }, - { - "rel" : "bookmark", - "href" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" - } - ] - } -} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/image.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/image.xml deleted file mode 100644 index fd9d870ad..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/images.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/images.json deleted file mode 100644 index cb96f9cae..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/images.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "images": [ - { - "id": "52415800-8b69-11e0-9b19-734f6f006e54", - "name": "CentOS 5.2", - "updated": "2010-10-10T12:00:00Z", - "created": "2010-08-10T12:00:00Z", - "tenant_id" : "12345", - "user_id" : "joe", - "status": "ACTIVE", - "metadata": { - "ImageType": "Gold", - "ImageVersion": "1.5" - }, - "links": [ - { - "rel": "self", - "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54" - }, - { - "rel": "bookmark", - "href": "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54" - } - ] - }, - { - "id" : "52415800-8b69-11e0-9b19-734f5736d2a2", - "name" : "My Server Backup", - "updated" : "2010-10-10T12:00:00Z", - "created" : "2010-08-10T12:00:00Z", - "tenant_id" : "12345", - "user_id" : "joe", - "status" : "SAVING", - "progress" : 80, - "minDisk" : 5, - "minRam" : 256, - "server" : { - "id": "52415800-8b69-11e0-9b19-734f335aa7b3", - "links": [ - { - "rel": "self", - "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3" - }, - { - "rel": "bookmark", - "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3" - } - ] - }, - "links": [ - { - "rel" : "self", - "href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" - }, - { - "rel" : "bookmark", - "href" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" - } - ]}]} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/images.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/images.xml deleted file mode 100644 index 4b2a41b25..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/images.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - Gold - 1.5 - - - - - - - - - - - - - diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/limits.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/limits.json deleted file mode 100644 index 46b10d219..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/limits.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "limits": { - "rate": [ - { - "uri": "*", - "regex": ".*", - "limit": [ - { - "value": 10, - "verb": "POST", - "remaining": 2, - "unit": "MINUTE", - "next-available": "2011-12-15T22:42:45Z" - }, - { - "value": 10, - "verb": "PUT", - "remaining": 2, - "unit": "MINUTE", - "next-available": "2011-12-15T22:42:45Z" - }, - { - "value": 100, - "verb": "DELETE", - "remaining": 100, - "unit": "MINUTE", - "next-available": "2011-12-15T22:42:45Z" - } - ] - }, - { - "uri": "*changes-since*", - "regex": "changes-since", - "limit": [ - { - "value": 3, - "verb": "GET", - "remaining": 3, - "unit": "MINUTE", - "next-available": "2011-12-15T22:42:45Z" - } - ] - }, - { - "uri": "*/servers", - "regex": "^/servers", - "limit": [ - { - "verb": "POST", - "value": 25, - "remaining": 24, - "unit": "DAY", - "next-available": "2011-12-15T22:42:45Z" - } - ] - } - ], - "absolute": { - "maxTotalRAMSize": 51200, - "maxServerMeta": 5, - "maxImageMeta": 5, - "maxPersonality": 5, - "maxPersonalitySize": 10240 - } - } -} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/limits.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/limits.xml deleted file mode 100644 index 2e2365635..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/limits.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/resize.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/resize.json deleted file mode 100644 index c8d0b2bda..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/resize.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "resize" : { - "flavorRef" : "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37" - } -} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-resp.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-resp.json deleted file mode 100644 index d302e6ee9..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-resp.json +++ /dev/null @@ -1,78 +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" : "67.23.10.138", - "accessIPv6" : "::babe:67.23.10.138", - "progress": 0, - "status": "BUILD", - "adminPass": "GFf1j9aP", - "image" : { - "id": "52415800-8b69-11e0-9b19-734f6f006e54", - "name": "CentOS 5.2", - "links": [ - { - "rel": "self", - "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54" - }, - { - "rel": "bookmark", - "href": "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54" - } - ] - }, - "flavor" : { - "id": "52415800-8b69-11e0-9b19-734f1195ff37", - "name": "256 MB Server", - "links": [ - { - "rel": "self", - "href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37" - }, - { - "rel": "bookmark", - "href": "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37" - } - ] - }, - "metadata": { - "My Server Name": "Apache1" - }, - "addresses": { - "public" : [ - { - "version": 4, - "addr": "67.23.10.138" - }, - { - "version": 6, - "addr": "::babe:67.23.10.138" - } - ], - "private" : [ - { - "version": 4, - "addr": "10.176.42.19" - }, - { - "version": 6, - "addr": "::babe:10.176.42.19" - } - ] - }, - "links": [ - { - "rel": "self", - "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734fcece0043" - }, - { - "rel": "bookmark", - "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734fcece0043" - } - ] - } -} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-resp.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-resp.xml deleted file mode 100644 index 0b169b2b6..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/server-post-resp.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - Apache1 - - - - - - - - - - - - - - diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/version.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/version.json deleted file mode 100644 index b5c363758..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/version.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version" : { - "id" : "v1.1", - "status" : "CURRENT", - "updated" : "2011-01-21T11:33:21-06:00", - "links": [ - { - "rel" : "self", - "href" : "http://servers.api.openstack.org/v1.0/" - }, - { - "rel" : "describedby", - "type" : "application/pdf", - "href" : "http://docs.rackspacecloud.com/servers/api/v1.1/cs-devguide-20110125.pdf" - }, - { - "rel" : "describedby", - "type" : "application/vnd.sun.wadl+xml", - "href" : "http://docs.rackspacecloud.com/servers/api/v1.1/application.wadl" - } - ], - "media-types": [ - { - "base" : "application/xml", - "type" : "application/vnd.openstack.compute+xml;version=1.1" - }, - { - "base" : "application/json", - "type" : "application/vnd.openstack.compute+json;version=1.1" - } - ] - } -} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/version.xml b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/version.xml deleted file mode 100644 index 400fcc8cf..000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/samples/version.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - -