diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml
index 5ccb5fb7c..8c00fb506 100644
--- a/api-ref/src/docbkx/ch_compute-v2.1.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.1.xml
@@ -376,6 +376,14 @@
href="../wadls/compute-api/src/v2.1/wadl/os-remote-consoles-v2.1.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
+
+ Security groups (os-security-groups)
+ Lists, shows information for, creates, and deletes security
+ groups.
+
+
Server diagnostics (os-server-diagnostics)
Gets the usage data for a server.
@@ -383,6 +391,23 @@
href="../wadls/compute-api/src/v2.1/wadl/os-server-diagnostics-v2.1.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
+
+ Server groups (os-server-groups)
+ Lists, shows information for, creates, and deletes server
+ groups.
+
+
+
+
+
+
+
+
+
+
+
Server usage (os-server-usage)
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.json
index 45fbac750..037251274 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.json
@@ -1,8 +1,8 @@
{
"security_group": {
- "description": "description",
- "id": 2,
- "name": "test",
+ "description": "default",
+ "id": 1,
+ "name": "default",
"rules": [],
"tenant_id": "openstack"
}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/common.ent b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
index 3479d7c8a..a20b64f62 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/common.ent
+++ b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
@@ -514,7 +514,7 @@
-
-
-
-
'>
-
\ No newline at end of file
+
+
+ Security groups object.
+
+
+
+
+ Security group description.
+
+
+
+
+ The security group ID.
+
+
+
+
+ The security group name.
+
+
+
+
+ A rules object.
+
+
+
+
+ The tenant ID.
+
+'>
+
+
+ A server_groups object.
+
+
+
+
+ The ID for the server group.
+
+
+
+
+ The name of the server group.
+
+
+
+
+ A list of policies associated with the server group.
+
+
+
+
+ A list of members in the server group.
+
+
+
+
+ Associated metadata key-and-value pairs.
+
+'>
+
+
+
+ Returns a unique identifier to provide tracking for the request.
+ The request-id associated with the request appears in the log lines for
+ that request. By default, the middleware configuration ensures the
+ request_id appears in the log files.
+
+
+'>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-security-groups-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-security-groups-v2.1.wadl
new file mode 100644
index 000000000..677a680a6
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-security-groups-v2.1.wadl
@@ -0,0 +1,235 @@
+
+
+
+ %common;
+
+ %common_project;
+]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Lists security groups.
+
+
+
+
+
+
+
+
+ Security groups object.
+
+
+
+
+ Security group description.
+
+
+
+
+ The security group ID.
+
+
+
+
+ The security group name.
+
+
+
+
+ A rules object.
+
+
+
+
+ The tenant.
+
+
+
+
+
+
+
+ Lists security groups for a
+ specified server.
+
+
+
+
+ Security groups object.
+
+
+
+
+ Security group description.
+
+
+
+
+ The security group ID.
+
+
+
+
+ The security group name.
+
+
+
+
+ A security group rules object.
+
+
+
+
+ The tenant.
+
+
+
+
+
+
+
+
+
+
+
+ Shows information for a specified
+ security group.
+
+
+
+
+
+
+
+
+ Security group object.
+
+
+
+
+ Security group description.
+
+
+
+
+ The security group ID.
+
+
+
+
+ The security group name.
+
+
+
+
+ A security group rules object.
+
+
+
+
+ The tenant.
+
+
+
+
+
+
+
+ Creates a security group.
+
+
+
+
+
+
+
+
+
+ Specify the addSecurityGroup action in the
+ request body.
+
+
+
+
+
+ The security group name.
+
+
+
+
+ Security group description.
+
+
+
+
+
+
+
+
+
+
+
+ Security group object.
+
+
+
+
+ Security group description.
+
+
+
+
+ The security group ID.
+
+
+
+
+ The security group name.
+
+
+
+
+ A security group rules object.
+
+
+
+
+ The tenant.
+
+
+
+
+
+
+
+ Deletes a specified security
+ group.
+
+
+
+
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-groups-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-groups-v2.1.wadl
new file mode 100644
index 000000000..86af0d4d8
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-groups-v2.1.wadl
@@ -0,0 +1,164 @@
+
+
+
+ %common;
+
+ %common_project;
+]>
+
+
+
+
+
+
+
+
+
+ The server group
+ ID.
+
+
+
+
+
+
+
+
+
+ Creates a server group.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The server group name. A non-empty
+ string with no leading or trailing spaces.
+ Maximum length is 255
+ characters.
+
+
+
+ A list of one or more policy names to
+ associate with the server group. The list
+ must contain at least one policy
+ name.
+ Each policy name must be a non-empty
+ string with no leading or trailing spaces.
+ Maximum length is 255
+ characters.
+
+
+
+
+
+
+
+
+
+
+
+
+ &serverGroupParameters;
+
+
+
+
+ Lists server groups.
+
+
+
+
+
+
+
+
+
+
+
+
+ &serverGroupsParameters;
+
+
+
+
+ Shows details for a specified
+ server group.
+
+
+
+
+
+
+
+
+
+
+
+
+ &serverGroupParameters;
+
+
+
+
+ Deletes a specified server
+ group.
+
+
+ &commonFaults; &getFaults;
+
+
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/server-metadata.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/server-metadata-v2.1.wadl
similarity index 99%
rename from api-ref/src/wadls/compute-api/src/v2.1/wadl/server-metadata.wadl
rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/server-metadata-v2.1.wadl
index 2f6500daf..b6d73f603 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/server-metadata.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/server-metadata-v2.1.wadl
@@ -11,7 +11,7 @@
xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
+ xml:id="server-metadata-v2.1">
diff --git a/api-ref/src/wadls/compute-api/src/v2/common.ent b/api-ref/src/wadls/compute-api/src/v2/common.ent
index 3b5f1ee24..930f51eb7 100644
--- a/api-ref/src/wadls/compute-api/src/v2/common.ent
+++ b/api-ref/src/wadls/compute-api/src/v2/common.ent
@@ -660,7 +660,7 @@
-
-
-
-
'>
+
+
+ Security groups object.
+
+
+
+
+ Security group description.
+
+
+
+
+ The security group ID.
+
+
+
+
+ The security group name.
+
+
+
+
+ A rules object.
+
+
+
+
+ The tenant ID.
+
+'>
@@ -1015,61 +1058,7 @@
Associated metadata key-and-value pairs.
'>
-
-
- A server_group places
- VMs in a grouping based on common
- characteristics, so that you can apply
- policies to groups or categorize servers
- for scheduling purposes.
-
-
-
-
-
- The ID for the server group.
-
-
-
-
- The name of the server group.
-
-
-
-
- A list of policies associated with the server group.
-
-
-
-
- A list of members in the server group.
-
-
-
-
- Associated metadata key-and-value pairs.
-
-'>
-
-
+
-
-
@@ -602,81 +600,6 @@
-
-
- Assigns a specified security group
- to a specified server.
-
-
-
-
-
-
-
-
-
- Specify the
- addSecurityGroup action
- in the request body.
-
-
- The name of
- the security group to assign to the
- server.
-
-
-
-
-
-
-
- Removes a specified security group
- from a specified server.
-
-
-
-
-
-
-
-
-
- Specify the
- removeSecurityGroup
- action in the request
- body.
-
-
- The name of
- the security group to remove from the
- server.
-
-
-
-
-
@@ -718,15 +641,6 @@
with the instance.
-
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
index 137b90e7b..1e0d89e68 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
@@ -1,13 +1,25 @@
-
-
-
+
+
+ %common;
+
+ %common_project;
+]>
+
+
- The unique identifier of the tenant or
- account.
+
+ The unique identifier of the tenant or account.
+
@@ -15,10 +27,12 @@
-
- The
- unique identifier of the security
- group.
+
+
+ The unique identifier of the security group.
+
@@ -29,8 +43,9 @@
- The UUID for the server of
- interest to you.
+
+ The UUID for the server of interest to you.
+
@@ -46,126 +61,99 @@
Lists security groups.
-
-
- Security groups object.
-
-
-
-
- Security group description.
-
-
-
-
- The security group ID.
-
-
-
-
- The security group name.
-
-
-
-
- A rules object.
-
-
-
-
- The tenant.
-
-
+ &serverGroupParameters;
- Lists security groups for a
- specified server.
+
+ Lists security groups for a specified server.
+
-
-
- Security groups object.
-
-
-
-
- Security group description.
-
-
-
-
- The security group ID.
-
-
-
-
- The security group name.
-
-
-
-
- A security group rules object.
-
-
-
-
- The tenant.
-
-
+
+
+ Security groups object.
+
+
+
+
+ Security group description.
+
+
+
+
+ The security group ID.
+
+
+
+
+ The security group name.
+
+
+
+
+ A security group rules object.
+
+
+
+
+ The tenant.
+
+
- Shows information for a specified
- security group.
+
+ Shows information for a specified security group.
+
-
-
- Security group object.
-
-
-
-
- Security group description.
-
-
-
-
- The security group ID.
-
-
-
-
- The security group name.
-
-
-
-
- A security group rules object.
-
-
-
-
- The tenant.
-
-
+
+
+ Security group object.
+
+
+
+
+ Security group description.
+
+
+
+
+ The security group ID.
+
+
+
+
+ The security group name.
+
+
+
+
+ A security group rules object.
+
+
+
+
+ The tenant.
+
+
@@ -174,73 +162,73 @@
Creates a security group.
-
-
-
- Specify the
- addSecurityGroup
- action in the request body.
-
-
-
-
-
- The security group name.
-
-
-
-
- Security group description.
-
-
+
+
+
+ Specify the addSecurityGroup action in the
+ request body.
+
+
+
+
+
+ The security group name.
+
+
+
+
+ Security group description.
+
+
-
-
- Security group object.
-
-
-
-
- Security group description.
-
-
-
-
- The security group ID.
-
-
-
-
- The security group name.
-
-
-
-
- A security group rules object.
-
-
-
-
- The tenant.
-
-
+
+
+ Security group object.
+
+
+
+
+ Security group description.
+
+
+
+
+ The security group ID.
+
+
+
+
+ The security group name.
+
+
+
+
+ A security group rules object.
+
+
+
+
+ The tenant.
+
+
- Deletes a specified security
- group.
+
+ Deletes a specified security group.
+
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-server-groups.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-server-groups.wadl
index 532538a3f..889ffa5bb 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-server-groups.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-server-groups.wadl
@@ -1,7 +1,11 @@
-
-%common;]>
+
+ %common;
+
+ %common_project;
+]>
- The server group
- ID.
+ The server group ID.
@@ -104,7 +107,57 @@
- &serverGroupParameters;
+
+
+
+
+ A server_group groups VMs based on
+ common characteristics so that you can apply
+ policies to groups or categorize servers for
+ scheduling purposes.
+
+
+
+
+
+ The ID for the server group.
+
+
+
+
+ The name of the server group.
+
+
+
+
+ A list of policies associated with the server group.
+
+
+
+
+ A list of members in the server group.
+
+
+
+
+ Associated metadata key-and-value pairs.
+
+
+
@@ -155,7 +208,57 @@
- &serverGroupParameters;
+
+
+
+
+ A server_group places VMs in a grouping
+ based on common characteristics, so that you can
+ apply policies to groups or categorize servers for
+ scheduling purposes.
+
+
+
+
+
+ The ID for the server group.
+
+
+
+
+ The name of the server group.
+
+
+
+
+ A list of policies associated with the server group.
+
+
+
+
+ A list of members in the server group.
+
+
+
+
+ Associated metadata key-and-value pairs.
+
+
+