diff --git a/api-ref/.gitignore b/api-ref/.gitignore new file mode 100644 index 000000000..4488d7f69 --- /dev/null +++ b/api-ref/.gitignore @@ -0,0 +1,3 @@ +*.bak +*.DS_Store +target/ diff --git a/api-ref/src/docbkx/api-ref.xml b/api-ref/src/docbkx/api-ref.xml index 6db055b1e..83a57b943 100644 --- a/api-ref/src/docbkx/api-ref.xml +++ b/api-ref/src/docbkx/api-ref.xml @@ -9,7 +9,9 @@ 2010-2013 - + + + OpenStack API Reference @@ -98,8 +100,8 @@
Server Password - This extension retrieves and resets the encrypted - admin password set through metadata service. + This extension retrieves and resets the encrypted admin + password set through metadata service. @@ -118,10 +120,21 @@ href="../wadls/compute-api/src/ext/os-rescue.wadl" xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
+
+ Server Actions - List or Get Details + Permits all users to list available actions for a specified server. Permits administrators to get + details for a specified action for a specified server. + + + +
- Admin Actions + Server Actions (Admin) Permits administrators to perform actions on a server. + diff --git a/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-action-get-resp.json b/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-action-get-resp.json new file mode 100755 index 000000000..d5a2ff96c --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-action-get-resp.json @@ -0,0 +1,27 @@ +{ + "instanceAction": { + "action": "reboot", + "events": [ + { + "event": "schedule", + "finish_time": "2012-12-05 01:02:00.000000", + "result": "Success", + "start_time": "2012-12-05 01:00:02.000000", + "traceback": "" + }, + { + "event": "compute_create", + "finish_time": "2012-12-05 01:04:00.000000", + "result": "Success", + "start_time": "2012-12-05 01:03:00.000000", + "traceback": "" + } + ], + "instance_uuid": "b48316c5-71e8-45e4-9884-6c78055b9b13", + "message": "", + "project_id": "147", + "request_id": "req-3293a3f1-b44c-4609-b8d2-d81b105636b8", + "start_time": "2012-12-05 00:00:00.000000", + "user_id": "789" + } +} \ No newline at end of file diff --git a/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-action-get-resp.xml b/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-action-get-resp.xml new file mode 100755 index 000000000..15d901341 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-action-get-resp.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-actions-list-resp.json b/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-actions-list-resp.json new file mode 100755 index 000000000..22d29d076 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-actions-list-resp.json @@ -0,0 +1,22 @@ +{ + "instanceActions": [ + { + "action": "resize", + "instance_uuid": "b48316c5-71e8-45e4-9884-6c78055b9b13", + "message": "", + "project_id": "842", + "request_id": "req-25517360-b757-47d3-be45-0e8d2a01b36a", + "start_time": "2012-12-05 01:00:00.000000", + "user_id": "789" + }, + { + "action": "reboot", + "instance_uuid": "b48316c5-71e8-45e4-9884-6c78055b9b13", + "message": "", + "project_id": "147", + "request_id": "req-3293a3f1-b44c-4609-b8d2-d81b105636b8", + "start_time": "2012-12-05 00:00:00.000000", + "user_id": "789" + } + ] +} \ No newline at end of file diff --git a/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-actions-list-resp.xml b/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-actions-list-resp.xml new file mode 100755 index 000000000..2e7fe1cca --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/api_samples/os-instance-actions/instance-actions-list-resp.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/api-ref/src/wadls/compute-api/src/ext/os-flavormanage.wadl.bak b/api-ref/src/wadls/compute-api/src/ext/os-flavormanage.wadl.bak deleted file mode 100644 index 5b6e06155..000000000 --- a/api-ref/src/wadls/compute-api/src/ext/os-flavormanage.wadl.bak +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - -

- The unique identifier of the tenant or account. -

- - - - - - - - -

- The unique identifier of the flavor. -

- - - - - - - - - - - - -

- Create a flavor. -

- - - - -

Enter a name for the new flavor you want to create

 - - -

Enter a MB value for the amount of RAM for this flavor.

 - - -

Enter a whole integer value for the virtual CPUs for the new flavor you want to create.

 - - -

Enter a GB value for the amount of disk space.

 - - -

Enter a unique integer value for the identifier for the new flavor.

 - - - - - - - - - - - - - - - - - - - -

Delete a flavor.

- - - - - diff --git a/api-ref/src/wadls/compute-api/src/ext/os-floating-ip-dns.wadl.bak b/api-ref/src/wadls/compute-api/src/ext/os-floating-ip-dns.wadl.bak deleted file mode 100644 index 5131a378a..000000000 --- a/api-ref/src/wadls/compute-api/src/ext/os-floating-ip-dns.wadl.bak +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - -

- The unique identifier of the tenant or account. -

- - - - - - - - -

- Registered DNS Domain published by the DNS drivers. -

- - - - - - -

- DNS entry name assigned under a domain. -

- - - - - - - - - - - - - - - - - - - -

Get a list of registered DNS Domains published by the DNS drivers.

- - - - - - - - - - - - -

Create or modify a DNS domain.

- - - - - - - - - - - - - - - - - - - -

Delete a DNS domain and all associated host entries.

- - - - - - -

Create or modify a DNS entry.

- - - - - - - - - - - - - - - - - - - -

Find unique DNS entry for a given domain and name.

- - - - - - - - - - - - -

Find DNS entries for a given domain and IP.

- - - - - - - - - - - - -

Delete a DNS entry.

- - - - - diff --git a/api-ref/src/wadls/compute-api/src/ext/os-floating-ip-pools.wadl.bak b/api-ref/src/wadls/compute-api/src/ext/os-floating-ip-pools.wadl.bak deleted file mode 100644 index ae100708f..000000000 --- a/api-ref/src/wadls/compute-api/src/ext/os-floating-ip-pools.wadl.bak +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - -

- The unique identifier of the tenant or account. -

- - - - - - - - - - - - - -

- View a list of Floating IP Pools. -

- - - - - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/ext/os-floating-ips.wadl.bak b/api-ref/src/wadls/compute-api/src/ext/os-floating-ips.wadl.bak deleted file mode 100644 index 5b8548b24..000000000 --- a/api-ref/src/wadls/compute-api/src/ext/os-floating-ips.wadl.bak +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - -

- The unique identifier of the tenant or account. -

- - - - - - - - - -

- The unique identifier associated with allocated floating IP address. -

- - - - - - - - - - - - - -

Lists floating IP addresses associated with the tenant or account.

- - - - - - - - - - - - -

Allocate a new floating IP address to a tenant or account.

- - - - -

- Pool to allocate ip from. Will use default pool if not specified. -

- - - - - - - - - - - - - - - -

If there are no floating IPs available, the - extension returns an error code 400 with a message indicating that no more floating IPs are available.

 - - - - -

Lists details of the floating IP address associated with floating_IP_address_ID.

- - - - - - - - - - - - -

Deallocates the floating IP address associated with floating_IP_address_ID.

- - - - - diff --git a/api-ref/src/wadls/compute-api/src/ext/os-instance-actions.wadl b/api-ref/src/wadls/compute-api/src/ext/os-instance-actions.wadl new file mode 100644 index 000000000..dd5002507 --- /dev/null +++ b/api-ref/src/wadls/compute-api/src/ext/os-instance-actions.wadl @@ -0,0 +1,117 @@ + + +%common;]> + + + + + + + + + + + + + +

The + ID for the tenant or account in a + multi-tenancy cloud.

+ + + + +

The UUID of the server instance + for which you want to list actions. +

+ + + + + + + +

The UUID of the action for which + you want to get details.

+ + + + + + + + + + + + + + +

Lists available actions + for a specified server. Deployers set permissions for this request in the + policy.json file. By default, all users + can list actions.

+ + + + + + + + + + + + + + + + + + Gets details for a specified action + for a specified server instance. Deployers set permissions for this request in the + policy.json file. By default, only administrators can get details for an action. + + + + + + + + + + + + + + + &commonFaults; + &getFaults; + + diff --git a/api-ref/src/wadls/compute-api/src/ext/os-security-groups.wadl.bak b/api-ref/src/wadls/compute-api/src/ext/os-security-groups.wadl.bak deleted file mode 100644 index 15c6398e1..000000000 --- a/api-ref/src/wadls/compute-api/src/ext/os-security-groups.wadl.bak +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - - - - - - -

- The unique identifier of the tenant or account. -

- - - - - - - - - -

- The unique identifier of the security group. -

- - - - - - - - - - - -

- The unique identifier of the security group rule. -

- - - - - - - - - - - -

- The UUID for the server of interest to you. -

- - - - - - - - - - - - - - -

List security groups.

- - - - - - - - - - - - - - - - - -

- List security groups for a specific server. -

- - - - - - - - - - - - - - - - - -

- Get specific security group. -

- - - - - - - - - - - - - - - - - -

- Create a new security group. -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Delete a security group.

- - - - - - -

- Create security group rule. -

- - - - - - - - - - - - - - - - - - - - - - - - -

- Delete security group rule. -

- - - - -