diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml
index b956885c7..bb9220aa6 100644
--- a/api-ref/src/docbkx/ch_compute-v2.1.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.1.xml
@@ -828,7 +828,21 @@
             <wadl:method href="#deleteServerGroup"/>
          </wadl:resource>
       </wadl:resources>
-   </section>
+  </section>
+  <section xml:id="os-services-v2.1">
+    <title>Compute services (os-services)</title>
+    <para>
+       Lists all running Compute services for a tenant, enables or disables
+       scheduling for a Compute service, logs disabled Compute service
+       information, and deletes a Compute service.
+    </para>
+    <para>
+      For an overview of Compute services, see <link
+      xlink:href="http://docs.openstack.org/liberty/install-guide-obs/common/get_started_compute.html">OpenStack Compute</link>.
+    </para>
+    <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      href="../wadls/compute-api/src/v2.1/wadl/os-services-v2.1.wadl"/>
+  </section>
    <section xml:id="os-simple-tenant-usage-v2.1">
     <title>Usage reports (os-simple-tenant-usage)</title>
     <para>
@@ -857,3 +871,4 @@
       xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
   </section>
 </chapter>
+
diff --git a/api-ref/src/wadls/common_project.ent b/api-ref/src/wadls/common_project.ent
index 76e7aee7a..19152ab8b 100644
--- a/api-ref/src/wadls/common_project.ent
+++ b/api-ref/src/wadls/common_project.ent
@@ -616,8 +616,8 @@
 <param xmlns="http://wadl.dev.java.net/2009/02" name="updated_at" style="plain"
     required="true" type="xsd:dateTime">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
-              xmlns:wadl="http://wadl.dev.java.net/2009/02"
-              xml:lang="EN">
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+        xml:lang="EN">
         <para>
             The date and time when the service was updated.
         </para>
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 e0ea3a7a6..9315e748c 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
@@ -422,6 +422,17 @@
     </para>
   </wadl:doc>
 </param>'>
+<!ENTITY service_idTemplateParameter '
+<param name="service_id" style="template" type="csapi:UUID"
+  xmlns="http://wadl.dev.java.net/2009/02">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xml:lang="EN"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02">
+    <para>
+      The UUID of the service.
+   </para>
+  </wadl:doc>
+</param>'>
 <!ENTITY snapshot_idTemplateParameter '
 <param name="snapshot_id" style="template" type="csapi:UUID"
    xmlns="http://wadl.dev.java.net/2009/02">
@@ -520,29 +531,29 @@
 <!-- Server Create Parameters -->
 <!ENTITY serverCreateParameters '
 <param xmlns="http://wadl.dev.java.net/2009/02"
-   name="security_groups" style="plain" required="false"
-   type="xsd:list">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>
+  name="security_groups" style="plain" required="false"
+  type="xsd:string">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
       One or more security groups. Specify the name of the security group in
       the <code>name</code> attribute. If you omit this attribute, the API
       creates the server in the <code>default</code> security group.
-   </para>
-</wadl:doc>
+    </para>
+  </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
-   name="user_data" style="plain" required="false"
-   type="xsd:string">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>
+  name="user_data" style="plain" required="false"
+  type="xsd:string">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
       Configuration information or scripts to use upon launch. Must be Base64
       encoded.
-   </para>
-</wadl:doc>
+     </para>
+  </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
   name="os-availability-zone:availability_zone"
@@ -860,7 +871,7 @@
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="server" style="plain" required="true"
    type="xsd:dict">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
+   <wadl:doc xmlns="http://docbook.org/ns/docbook"
    xmlns:wadl="http://wadl.dev.java.net/2009/02"
    xml:lang="EN">
    <para>A <code>server</code> object.</para>
@@ -870,11 +881,13 @@
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="servers" style="plain" required="true"
    type="xsd:list">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>List of <code>server</code> objects.</para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+     xmlns:wadl="http://wadl.dev.java.net/2009/02"
+     xml:lang="EN">
+     <para>
+      A list of <code>server</code> objects.
+    </para>
+  </wadl:doc>
 </param>'>
 <!ENTITY config_driveRequestParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" name="config_drive" style="plain"
@@ -1587,57 +1600,57 @@
 <!-- Server List Parameters -->
 <!ENTITY serverListQueryParameters '
 <param xmlns="http://wadl.dev.java.net/2009/02"
-   name="changes-since" style="query" required="false"
-   type="xsd:dateTime">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>
+  name="changes-since" style="query" required="false"
+  type="xsd:dateTime">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
       Filters the response by a date and time stamp when the server last
       changed status.
-   </para>
-</wadl:doc>
+    </para>
+  </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
-   name="image" style="query" required="false"
-   type="csapi:UUID">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>
-      Filters the response by an image, as a UUID.
-   </para>
-</wadl:doc>
+  name="image" style="query" required="false"
+  type="csapi:UUID">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+     xmlns:wadl="http://wadl.dev.java.net/2009/02"
+     xml:lang="EN">
+     <para>
+        Filters the response by an image, as a UUID.
+     </para>
+  </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="flavor" style="query" required="false"
    type="csapi:UUID">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>
-      Filters the response by a flavor, as a UUID. A flavor is a combination
-      of memory, disk size, and CPUs.
-   </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+     xmlns:wadl="http://wadl.dev.java.net/2009/02"
+     xml:lang="EN">
+     <para>
+        Filters the response by a flavor, as a UUID. A flavor is a combination
+        of memory, disk size, and CPUs.
+     </para>
+  </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="name" style="query" required="false"
    type="regexp">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>
-      Filters the response by a server name, as a string.
-   </para>
-   <para>
-      You can use regular expressions in the query. For example, the
-      <code>?name=bob</code> regular expression returns both bob and bobb. If
-      you must match on only bob, you can use a regular expression that
-      matches the syntax of the underlying database server that is implemented
-      for Compute, such as MySQL or PostgreSQL.
-   </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+     xmlns:wadl="http://wadl.dev.java.net/2009/02"
+     xml:lang="EN">
+     <para>
+        Filters the response by a server name, as a string.
+     </para>
+     <para>
+        You can use regular expressions in the query. For example, the
+        <code>?name=bob</code> regular expression returns both bob and bobb. If
+        you must match on only bob, you can use a regular expression that
+        matches the syntax of the underlying database server that is implemented
+        for Compute, such as MySQL or PostgreSQL.
+     </para>
+  </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="status" style="query" required="false"
@@ -1932,7 +1945,7 @@
     </para>
   </wadl:doc>
 </param>'>
-<!ENTITY hostResponseParameter '
+<!ENTITY OS-EXT-SRV-ATTR-hostResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="OS-EXT-SRV-ATTR:host" style="plain" type="xsd:string" required="true">
    <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -3403,40 +3416,60 @@
 <option value="snapshot"/>
 <option value="backup"/>
 </param>'>
-<!ENTITY hostRequestParameter '
-<param xmlns="http://wadl.dev.java.net/2009/02" name="host" style="plain" type="xsd:string"
+<!-- ******************* -->
+<!-- SERVICES            -->
+<!-- ******************* -->
+<!-- *************************** -->
+<!-- SERVICES REQUEST PARAMETERS -->
+<!-- *************************** -->
+<!ENTITY serviceObjectParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="service" style="plain"
+  required="true" type="xsd:dict">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      A <code>service</code> object.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY servicesObjectParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="services" style="plain"
+  required="true" type="xsd:list">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      A list of <code>service</code> objects.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY service-binaryRequestParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="binary" style="plain" type="xsd:string"
   required="true">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
     <para>
-        The host name.
+        The service binary name.
     </para>
   </wadl:doc>
 </param>'>
-<!ENTITY binaryRequestParameter '
-<param xmlns="http://wadl.dev.java.net/2009/02" name="binary" style="plain" type="xsd:string"
-  required="true">
-  <wadl:doc xmlns="http://docbook.org/ns/docbook"
-    xmlns:wadl="http://wadl.dev.java.net/2009/02"
-    xml:lang="EN">
-    <para>
-        The service name.
-    </para>
-  </wadl:doc>
-</param>'>
-<!ENTITY disabled_reasonRequestParameter '
+<!ENTITY service-disabled_reasonRequestParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" name="disabled_reason" style="plain"
-    type="xsd:string" required="true">
+  type="xsd:string" required="true">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
     <para>
-        The reason the service was disabled.
+        The reason that the service was disabled.
     </para>
   </wadl:doc>
 </param>'>
-<!ENTITY forced_downRequestParameter '
+<!ENTITY service-forced_downRequestParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02"
   name="forced_down" style="plain" type="xsd:string"
   required="true">
@@ -3449,19 +3482,66 @@
     </para>
   </wadl:doc>
 </param>'>
-<!ENTITY forced_downResponseParameter '
-<param xmlns="http://wadl.dev.java.net/2009/02"
-  name="forced_down" style="plain" type="xsd:string"
+<!ENTITY service-hostRequestParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="host" style="plain" type="xsd:string"
   required="true">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
     <para>
-      If you force-down the service, this value is <code>true</code>.
+        The host name.
     </para>
   </wadl:doc>
 </param>'>
-<!ENTITY serviceIdResponseParameter '
+<!-- **************************** -->
+<!-- SERVICES RESPONSE PARAMETERS -->
+<!-- **************************** -->
+<!ENTITY service-binaryResponseParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="binary" style="plain" type="xsd:string"
+  required="true">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+        The service binary name.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY service-disabled_reasonResponseParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="disabled_reason" style="plain"
+  type="xsd:string" required="true">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+        The reason that the service was disabled.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY service-forced_downResponseParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="forced_down" style="plain" type="xsd:boolean"
+  required="true">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      If <code>true</code>, the service was forced down.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY service-hostResponseParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="host" style="plain" type="xsd:string"
+  required="true">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+        The host name.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY service-idResponseParameter '
 <param name="id" style="plain" type="csapi:UUID" required="true"
   xmlns="http://wadl.dev.java.net/2009/02">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -3472,7 +3552,7 @@
     </para>
   </wadl:doc>
 </param>'>
-<!ENTITY serviceStateResponseParameter '
+<!ENTITY service-stateResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02"
   name="state" style="plain" type="xsd:string"
   required="true">
@@ -3484,7 +3564,7 @@
     </para>
   </wadl:doc>
 </param>'>
-<!ENTITY serviceStatusResponseParameter '
+<!ENTITY service-statusResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02"
   name="status" style="plain" required="true" type="xsd:string">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -3496,41 +3576,17 @@
     </para>
   </wadl:doc>
 </param>'>
-<!ENTITY zoneResponseParameter '
+<!ENTITY service-zoneResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="zone" style="plain"
    required="true" type="xsd:string">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>
-    The availability zone of the host.
-   </para>
-</wadl:doc>
-</param>'>
-<!ENTITY serviceResponseParameter '
-<param xmlns="http://wadl.dev.java.net/2009/02"
-   name="service" style="plain"
-   required="true" type="xsd:string">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>
-    A <code>service</code> object.
-   </para>
-</wadl:doc>
-</param>'>
-<!ENTITY servicesResponseParameter '
-<param xmlns="http://wadl.dev.java.net/2009/02"
-   name="services" style="plain"
-   required="true" type="xsd:string">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>
-      A <code>services</code> object.
-   </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The availability zone of the host.
+    </para>
+  </wadl:doc>
 </param>'>
 <!ENTITY security-group-nameRequestParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02"
@@ -3585,7 +3641,7 @@
 &serverNameResponseParameter;
 &diskConfigResponseParameter;
 &availability_zoneResponseParameter;
-&hostResponseParameter;
+&OS-EXT-SRV-ATTR-hostResponseParameter;
 &hypervisor_hostnameResponseParameter;
 &instance_nameResponseParameter;
 &power_stateResponseParameter;
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/extensions/extensions-list-response-v2.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/extensions/extensions-list-response-v2.json
new file mode 100644
index 000000000..ec9a4547d
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/extensions/extensions-list-response-v2.json
@@ -0,0 +1,724 @@
+{
+    "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "OS-EXT-AZ",
+            "description": "Extended Availability Zone support.",
+            "links": [],
+            "name": "ExtendedAvailabilityZone",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2",
+            "updated": "2013-01-30T00:00:00Z"
+        },
+        {
+            "alias": "OS-EXT-IMG-SIZE",
+            "description": "Adds image size to image listings.",
+            "links": [],
+            "name": "ImageSize",
+            "namespace": "http://docs.openstack.org/compute/ext/image_size/api/v1.1",
+            "updated": "2013-02-19T00:00:00Z"
+        },
+        {
+            "alias": "OS-EXT-IPS",
+            "description": "Adds type parameter to the ip list.",
+            "links": [],
+            "name": "ExtendedIps",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_ips/api/v1.1",
+            "updated": "2013-01-06T00:00:00Z"
+        },
+        {
+            "alias": "OS-EXT-IPS-MAC",
+            "description": "Adds mac address parameter to the ip list.",
+            "links": [],
+            "name": "ExtendedIpsMac",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1",
+            "updated": "2013-03-07T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "OS-EXT-VIF-NET",
+            "description": "Adds network id parameter to the virtual interface list.",
+            "links": [],
+            "name": "ExtendedVIFNet",
+            "namespace": "http://docs.openstack.org/compute/ext/extended-virtual-interfaces-net/api/v1.1",
+            "updated": "2013-03-07T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "OS-SCH-HNT",
+            "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:00Z"
+        },
+        {
+            "alias": "OS-SRV-USG",
+            "description": "Adds launched_at and terminated_at on Servers.",
+            "links": [],
+            "name": "ServerUsage",
+            "namespace": "http://docs.openstack.org/compute/ext/server_usage/api/v1.1",
+            "updated": "2013-04-29T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-agents",
+            "description": "Agents support.",
+            "links": [],
+            "name": "Agents",
+            "namespace": "http://docs.openstack.org/compute/ext/agents/api/v2",
+            "updated": "2012-10-28T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-assisted-volume-snapshots",
+            "description": "Assisted volume snapshots.",
+            "links": [],
+            "name": "AssistedVolumeSnapshots",
+            "namespace": "http://docs.openstack.org/compute/ext/assisted-volume-snapshots/api/v2",
+            "updated": "2013-08-29T00:00:00Z"
+        },
+        {
+            "alias": "os-attach-interfaces",
+            "description": "Attach interface support.",
+            "links": [],
+            "name": "AttachInterfaces",
+            "namespace": "http://docs.openstack.org/compute/ext/interfaces/api/v1.1",
+            "updated": "2012-07-22T00:00:00Z"
+        },
+        {
+            "alias": "os-availability-zone",
+            "description": "1. Add availability_zone to the Create Server v1.1 API.\n       2. Add availability zones describing.\n    ",
+            "links": [],
+            "name": "AvailabilityZone",
+            "namespace": "http://docs.openstack.org/compute/ext/availabilityzone/api/v1.1",
+            "updated": "2012-12-21T00:00:00Z"
+        },
+        {
+            "alias": "os-baremetal-ext-status",
+            "description": "Add extended status in Baremetal Nodes v2 API.",
+            "links": [],
+            "name": "BareMetalExtStatus",
+            "namespace": "http://docs.openstack.org/compute/ext/baremetal_ext_status/api/v2",
+            "updated": "2013-08-27T00:00:00Z"
+        },
+        {
+            "alias": "os-baremetal-nodes",
+            "description": "Admin-only bare-metal node administration.",
+            "links": [],
+            "name": "BareMetalNodes",
+            "namespace": "http://docs.openstack.org/compute/ext/baremetal_nodes/api/v2",
+            "updated": "2013-01-04T00:00:00Z"
+        },
+        {
+            "alias": "os-block-device-mapping-v2-boot",
+            "description": "Allow boot with the new BDM data format.",
+            "links": [],
+            "name": "BlockDeviceMappingV2Boot",
+            "namespace": "http://docs.openstack.org/compute/ext/block_device_mapping_v2_boot/api/v2",
+            "updated": "2013-07-08T00:00:00Z"
+        },
+        {
+            "alias": "os-cell-capacities",
+            "description": "Adding functionality to get cell capacities.",
+            "links": [],
+            "name": "CellCapacities",
+            "namespace": "http://docs.openstack.org/compute/ext/cell_capacities/api/v1.1",
+            "updated": "2013-05-27T00:00:00Z"
+        },
+        {
+            "alias": "os-cells",
+            "description": "Enables cells-related functionality such as adding neighbor cells,\n    listing neighbor cells, and getting the capabilities of the local cell.\n    ",
+            "links": [],
+            "name": "Cells",
+            "namespace": "http://docs.openstack.org/compute/ext/cells/api/v1.1",
+            "updated": "2013-05-14T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-cloudpipe-update",
+            "description": "Adds the ability to set the vpn ip/port for cloudpipe instances.",
+            "links": [],
+            "name": "CloudpipeUpdate",
+            "namespace": "http://docs.openstack.org/compute/ext/cloudpipe-update/api/v2",
+            "updated": "2012-11-14T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-console-auth-tokens",
+            "description": "Console token authentication support.",
+            "links": [],
+            "name": "ConsoleAuthTokens",
+            "namespace": "http://docs.openstack.org/compute/ext/consoles-auth-tokens/api/v2",
+            "updated": "2013-08-13T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-evacuate",
+            "description": "Enables server evacuation.",
+            "links": [],
+            "name": "Evacuate",
+            "namespace": "http://docs.openstack.org/compute/ext/evacuate/api/v2",
+            "updated": "2013-01-06T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-evacuate-find-host",
+            "description": "Enables server evacuation without target host. Scheduler will select\n       one to target.\n    ",
+            "links": [],
+            "name": "ExtendedEvacuateFindHost",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_evacuate_find_host/api/v2",
+            "updated": "2014-02-12T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-floating-ips",
+            "description": "Adds optional fixed_address to the add floating IP command.",
+            "links": [],
+            "name": "ExtendedFloatingIps",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_floating_ips/api/v2",
+            "updated": "2013-04-19T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-hypervisors",
+            "description": "Extended hypervisors support.",
+            "links": [],
+            "name": "ExtendedHypervisors",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_hypervisors/api/v1.1",
+            "updated": "2014-01-04T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-networks",
+            "description": "Adds additional fields to networks",
+            "links": [],
+            "name": "ExtendedNetworks",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_networks/api/v2",
+            "updated": "2014-05-09T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-quotas",
+            "description": "Adds ability for admins to delete quota\n    and optionally force the update Quota command.\n    ",
+            "links": [],
+            "name": "ExtendedQuotas",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_quotas/api/v1.1",
+            "updated": "2013-06-09T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-rescue-with-image",
+            "description": "Allow the user to specify the image to use for rescue.",
+            "links": [],
+            "name": "ExtendedRescueWithImage",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_rescue_with_image/api/v2",
+            "updated": "2014-01-04T00:00:00Z"
+        },
+        {
+            "alias": "os-hypervisor-status",
+            "description": "Show hypervisor status.",
+            "links": [],
+            "name": "HypervisorStatus",
+            "namespace": "http://docs.openstack.org/compute/ext/hypervisor_status/api/v1.1",
+            "updated": "2014-04-17T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-services",
+            "description": "Extended services support.",
+            "links": [],
+            "name": "ExtendedServices",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_services/api/v2",
+            "updated": "2013-05-17T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-services-delete",
+            "description": "Extended services deletion support.",
+            "links": [],
+            "name": "ExtendedServicesDelete",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_services_delete/api/v2",
+            "updated": "2013-12-10T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-volumes",
+            "description": "Extended Volumes support.",
+            "links": [],
+            "name": "ExtendedVolumes",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1",
+            "updated": "2013-06-07T00:00:00Z"
+        },
+        {
+            "alias": "os-fixed-ips",
+            "description": "Fixed IPs support.",
+            "links": [],
+            "name": "FixedIPs",
+            "namespace": "http://docs.openstack.org/compute/ext/fixed_ips/api/v2",
+            "updated": "2012-10-18T19:25:27Z"
+        },
+        {
+            "alias": "os-flavor-access",
+            "description": "Flavor access support.",
+            "links": [],
+            "name": "FlavorAccess",
+            "namespace": "http://docs.openstack.org/compute/ext/flavor_access/api/v2",
+            "updated": "2012-08-01T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-flavor-manage",
+            "description": "Flavor create/delete API support.",
+            "links": [],
+            "name": "FlavorManage",
+            "namespace": "http://docs.openstack.org/compute/ext/flavor_manage/api/v1.1",
+            "updated": "2012-01-19T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-floating-ips-bulk",
+            "description": "Bulk handling of Floating IPs.",
+            "links": [],
+            "name": "FloatingIpsBulk",
+            "namespace": "http://docs.openstack.org/compute/ext/floating_ips_bulk/api/v2",
+            "updated": "2012-10-29T19:25:27Z"
+        },
+        {
+            "alias": "os-fping",
+            "description": "Fping Management Extension.",
+            "links": [],
+            "name": "Fping",
+            "namespace": "http://docs.openstack.org/compute/ext/fping/api/v1.1",
+            "updated": "2012-07-06T00:00:00Z"
+        },
+        {
+            "alias": "os-hide-server-addresses",
+            "description": "Support hiding server addresses in certain states.",
+            "links": [],
+            "name": "HideServerAddresses",
+            "namespace": "http://docs.openstack.org/compute/ext/hide_server_addresses/api/v1.1",
+            "updated": "2012-12-11T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-instance-actions",
+            "description": "View a log of actions and events taken on an instance.",
+            "links": [],
+            "name": "InstanceActions",
+            "namespace": "http://docs.openstack.org/compute/ext/instance-actions/api/v1.1",
+            "updated": "2013-02-08T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-migrations",
+            "description": "Provide data on migrations.",
+            "links": [],
+            "name": "Migrations",
+            "namespace": "http://docs.openstack.org/compute/ext/migrations/api/v2.0",
+            "updated": "2013-05-30T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-networks",
+            "description": "Admin-only Network Management Extension.",
+            "links": [],
+            "name": "Networks",
+            "namespace": "http://docs.openstack.org/compute/ext/os-networks/api/v1.1",
+            "updated": "2011-12-23T00:00:00Z"
+        },
+        {
+            "alias": "os-networks-associate",
+            "description": "Network association support.",
+            "links": [],
+            "name": "NetworkAssociationSupport",
+            "namespace": "http://docs.openstack.org/compute/ext/networks_associate/api/v2",
+            "updated": "2012-11-19T00:00:00Z"
+        },
+        {
+            "alias": "os-preserve-ephemeral-rebuild",
+            "description": "Allow preservation of the ephemeral partition on rebuild.",
+            "links": [],
+            "name": "PreserveEphemeralOnRebuild",
+            "namespace": "http://docs.openstack.org/compute/ext/preserve_ephemeral_rebuild/api/v2",
+            "updated": "2013-12-17T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-security-group-default-rules",
+            "description": "Default rules for security group support.",
+            "links": [],
+            "name": "SecurityGroupDefaultRules",
+            "namespace": "http://docs.openstack.org/compute/ext/securitygroupdefaultrules/api/v1.1",
+            "updated": "2013-02-05T00:00:00Z"
+        },
+        {
+            "alias": "os-security-groups",
+            "description": "Security group support.",
+            "links": [],
+            "name": "SecurityGroups",
+            "namespace": "http://docs.openstack.org/compute/ext/securitygroups/api/v1.1",
+            "updated": "2013-05-28T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-server-external-events",
+            "description": "Server External Event Triggers.",
+            "links": [],
+            "name": "ServerExternalEvents",
+            "namespace": "http://docs.openstack.org/compute/ext/server-external-events/api/v2",
+            "updated": "2014-02-18T00:00:00Z"
+        },
+        {
+            "alias": "os-server-groups",
+            "description": "Server group support.",
+            "links": [],
+            "name": "ServerGroups",
+            "namespace": "http://docs.openstack.org/compute/ext/servergroups/api/v2",
+            "updated": "2013-06-20T00:00:00Z"
+        },
+        {
+            "alias": "os-server-group-quotas",
+            "description": "Adds quota support to server groups.",
+            "links": [],
+            "name": "ServerGroupQuotas",
+            "namespace": "http://docs.openstack.org/compute/ext/server-group-quotas/api/v2",
+            "updated": "2014-07-25T00:00:00Z"
+        },
+        {
+            "alias": "os-server-list-multi-status",
+            "description": "Allow to filter the servers by a set of status values.",
+            "links": [],
+            "name": "ServerListMultiStatus",
+            "namespace": "http://docs.openstack.org/compute/ext/os-server-list-multi-status/api/v2",
+            "updated": "2014-05-11T00:00:00Z"
+        },
+        {
+            "alias": "os-server-password",
+            "description": "Server password support.",
+            "links": [],
+            "name": "ServerPassword",
+            "namespace": "http://docs.openstack.org/compute/ext/server-password/api/v2",
+            "updated": "2012-11-29T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-services",
+            "description": "Services support.",
+            "links": [],
+            "name": "Services",
+            "namespace": "http://docs.openstack.org/compute/ext/services/api/v2",
+            "updated": "2012-10-28T00:00:00Z"
+        },
+        {
+            "alias": "os-shelve",
+            "description": "Instance shelve mode.",
+            "links": [],
+            "name": "Shelve",
+            "namespace": "http://docs.openstack.org/compute/ext/shelve/api/v1.1",
+            "updated": "2013-04-06T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-tenant-networks",
+            "description": "Tenant-based Network Management Extension.",
+            "links": [],
+            "name": "OSTenantNetworks",
+            "namespace": "http://docs.openstack.org/compute/ext/os-tenant-networks/api/v2",
+            "updated": "2012-03-07T14:46:43Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-used-limits-for-admin",
+            "description": "Provide data to admin on limited resources used by other tenants.",
+            "links": [],
+            "name": "UsedLimitsForAdmin",
+            "namespace": "http://docs.openstack.org/compute/ext/used_limits_for_admin/api/v1.1",
+            "updated": "2013-05-02T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-user-quotas",
+            "description": "Project user quota support.",
+            "links": [],
+            "name": "UserQuotas",
+            "namespace": "http://docs.openstack.org/compute/ext/user_quotas/api/v1.1",
+            "updated": "2013-07-18T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-volume-attachment-update",
+            "description": "Support for updating a volume attachment.",
+            "links": [],
+            "name": "VolumeAttachmentUpdate",
+            "namespace": "http://docs.openstack.org/compute/ext/os-volume-attachment-update/api/v2",
+            "updated": "2013-06-20T00:00:00Z"
+        },
+        {
+            "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:00Z"
+        },
+        {
+            "alias": "os-server-sort-keys",
+            "description": "Add sorting support in get Server v2 API.",
+            "links": [],
+            "name": "ServerSortKeys",
+            "namespace": "http://docs.openstack.org/compute/ext/server_sort_keys/api/v2",
+            "updated": "2014-05-22T00:00:00Z"
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/extensions/extensions-list-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/extensions/extensions-list-response.json
index 601fed783..0b2afb608 100755
--- a/api-ref/src/wadls/compute-api/src/v2.1/samples/extensions/extensions-list-response.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/extensions/extensions-list-response.json
@@ -1,796 +1,804 @@
 {
     "extensions": [
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Multinic",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "NMN",
-            "description": "Multiple network support."
+            "description": "Multiple network support.",
+            "links": [],
+            "name": "Multinic",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "DiskConfig",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "OS-DCF",
-            "description": "Disk Management Extension."
+            "description": "Disk Management Extension.",
+            "links": [],
+            "name": "DiskConfig",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedAvailabilityZone",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "OS-EXT-AZ",
-            "description": "Extended Availability Zone support."
+            "description": "Extended Availability Zone support.",
+            "links": [],
+            "name": "ExtendedAvailabilityZone",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ImageSize",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "OS-EXT-IMG-SIZE",
-            "description": "Adds image size to image listings."
+            "description": "Adds image size to image listings.",
+            "links": [],
+            "name": "ImageSize",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedIps",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "OS-EXT-IPS",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "ExtendedIps",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedIpsMac",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "OS-EXT-IPS-MAC",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "ExtendedIpsMac",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedServerAttributes",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "OS-EXT-SRV-ATTR",
-            "description": "Extended Server Attributes support."
+            "description": "Extended Server Attributes support.",
+            "links": [],
+            "name": "ExtendedServerAttributes",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedStatus",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "OS-EXT-STS",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FlavorDisabled",
+            "description": "",
             "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "OS-FLV-DISABLED",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FlavorExtraData",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "OS-FLV-EXT-DATA",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "SchedulerHints",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "OS-SCH-HNT",
-            "description": "Pass arbitrary key/value pairs to the scheduler."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ServerUsage",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "OS-SRV-USG",
-            "description": "Adds launched_at and terminated_at on Servers."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "AccessIPs",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-access-ips",
-            "description": "Access IPs support."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "AdminActions",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-admin-actions",
-            "description": "Enable admin-only server actions\n\n    Actions include: resetNetwork, injectNetworkInfo, os-resetState\n    "
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "AdminPassword",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-admin-password",
-            "description": "Admin password management support."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Agents",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-agents",
-            "description": "Agents support."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Aggregates",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-aggregates",
-            "description": "Admin-only aggregate administration."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "AssistedVolumeSnapshots",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-assisted-volume-snapshots",
-            "description": "Assisted volume snapshots."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "AttachInterfaces",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-attach-interfaces",
-            "description": "Attach interface support."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "AvailabilityZone",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-availability-zone",
-            "description": "1. Add availability_zone to the Create Server API.\n       2. Add availability zones describing.\n    "
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "BareMetalExtStatus",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-baremetal-ext-status",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "BareMetalNodes",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-baremetal-nodes",
-            "description": "Admin-only bare-metal node administration."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "BlockDeviceMapping",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-block-device-mapping",
-            "description": "Block device mapping boot support."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "BlockDeviceMappingV2Boot",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-block-device-mapping-v2-boot",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "CellCapacities",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-cell-capacities",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Cells",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-cells",
-            "description": "Enables cells-related functionality such as adding neighbor cells,\n    listing neighbor cells, and getting the capabilities of the local cell.\n    "
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Certificates",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-certificates",
-            "description": "Certificates support."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Cloudpipe",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-cloudpipe",
-            "description": "Adds actions to create cloudpipe instances.\n\n    When running with the Vlan network mode, you need a mechanism to route\n    from the public Internet to your vlans.  This mechanism is known as a\n    cloudpipe.\n\n    At the time of creating this class, only OpenVPN is supported.  Support for\n    a SSH Bastion host is forthcoming.\n    "
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "CloudpipeUpdate",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-cloudpipe-update",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ConfigDrive",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-config-drive",
-            "description": "Config Drive Extension."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ConsoleAuthTokens",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-console-auth-tokens",
-            "description": "Console token authentication support."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ConsoleOutput",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-console-output",
-            "description": "Console log output support, with tailing ability."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Consoles",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-consoles",
-            "description": "Interactive Console support."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "CreateBackup",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-create-backup",
-            "description": "Create a backup of a server."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Createserverext",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-create-server-ext",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "DeferredDelete",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-deferred-delete",
-            "description": "Instance deferred delete."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Evacuate",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-evacuate",
-            "description": "Enables server evacuation."
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedEvacuateFindHost",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-extended-evacuate-find-host",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedFloatingIps",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-extended-floating-ips",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedHypervisors",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-extended-hypervisors",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedNetworks",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-extended-networks",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedQuotas",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-extended-quotas",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedRescueWithImage",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-extended-rescue-with-image",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedServices",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-extended-services",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedServicesDelete",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
-            "alias": "os-extended-services-delete",
-            "description": ""
-        },
-        {
-            "updated": "2014-12-03T00:00:00Z",
             "name": "ExtendedStatus",
-            "links": [],
             "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "OS-EXT-VIF-NET",
+            "description": "",
+            "links": [],
+            "name": "ExtendedVIFNet",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "OS-FLV-DISABLED",
+            "description": "",
+            "links": [],
+            "name": "FlavorDisabled",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "OS-FLV-EXT-DATA",
+            "description": "",
+            "links": [],
+            "name": "FlavorExtraData",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "OS-SCH-HNT",
+            "description": "Pass arbitrary key/value pairs to the scheduler.",
+            "links": [],
+            "name": "SchedulerHints",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "OS-SRV-USG",
+            "description": "Adds launched_at and terminated_at on Servers.",
+            "links": [],
+            "name": "ServerUsage",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-access-ips",
+            "description": "Access IPs support.",
+            "links": [],
+            "name": "AccessIPs",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-admin-actions",
+            "description": "Enable admin-only server actions\n\n    Actions include: resetNetwork, injectNetworkInfo, os-resetState\n    ",
+            "links": [],
+            "name": "AdminActions",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-admin-password",
+            "description": "Admin password management support.",
+            "links": [],
+            "name": "AdminPassword",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-agents",
+            "description": "Agents support.",
+            "links": [],
+            "name": "Agents",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-aggregates",
+            "description": "Admin-only aggregate administration.",
+            "links": [],
+            "name": "Aggregates",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-assisted-volume-snapshots",
+            "description": "Assisted volume snapshots.",
+            "links": [],
+            "name": "AssistedVolumeSnapshots",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-attach-interfaces",
+            "description": "Attach interface support.",
+            "links": [],
+            "name": "AttachInterfaces",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-availability-zone",
+            "description": "1. Add availability_zone to the Create Server API.\n       2. Add availability zones describing.\n    ",
+            "links": [],
+            "name": "AvailabilityZone",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-baremetal-ext-status",
+            "description": "",
+            "links": [],
+            "name": "BareMetalExtStatus",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-baremetal-nodes",
+            "description": "Admin-only bare-metal node administration.",
+            "links": [],
+            "name": "BareMetalNodes",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-block-device-mapping",
+            "description": "Block device mapping boot support.",
+            "links": [],
+            "name": "BlockDeviceMapping",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-block-device-mapping-v2-boot",
+            "description": "",
+            "links": [],
+            "name": "BlockDeviceMappingV2Boot",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-cell-capacities",
+            "description": "",
+            "links": [],
+            "name": "CellCapacities",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-cells",
+            "description": "Enables cells-related functionality such as adding neighbor cells,\n    listing neighbor cells, and getting the capabilities of the local cell.\n    ",
+            "links": [],
+            "name": "Cells",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-certificates",
+            "description": "Certificates support.",
+            "links": [],
+            "name": "Certificates",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "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/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-cloudpipe-update",
+            "description": "",
+            "links": [],
+            "name": "CloudpipeUpdate",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-config-drive",
+            "description": "Config Drive Extension.",
+            "links": [],
+            "name": "ConfigDrive",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-console-auth-tokens",
+            "description": "Console token authentication support.",
+            "links": [],
+            "name": "ConsoleAuthTokens",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-console-output",
+            "description": "Console log output support, with tailing ability.",
+            "links": [],
+            "name": "ConsoleOutput",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-consoles",
+            "description": "Interactive Console support.",
+            "links": [],
+            "name": "Consoles",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-create-backup",
+            "description": "Create a backup of a server.",
+            "links": [],
+            "name": "CreateBackup",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-create-server-ext",
+            "description": "",
+            "links": [],
+            "name": "Createserverext",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-deferred-delete",
+            "description": "Instance deferred delete.",
+            "links": [],
+            "name": "DeferredDelete",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-evacuate",
+            "description": "Enables server evacuation.",
+            "links": [],
+            "name": "Evacuate",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-evacuate-find-host",
+            "description": "",
+            "links": [],
+            "name": "ExtendedEvacuateFindHost",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-floating-ips",
+            "description": "",
+            "links": [],
+            "name": "ExtendedFloatingIps",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-hypervisors",
+            "description": "",
+            "links": [],
+            "name": "ExtendedHypervisors",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-networks",
+            "description": "",
+            "links": [],
+            "name": "ExtendedNetworks",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-quotas",
+            "description": "",
+            "links": [],
+            "name": "ExtendedQuotas",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-rescue-with-image",
+            "description": "",
+            "links": [],
+            "name": "ExtendedRescueWithImage",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-services",
+            "description": "",
+            "links": [],
+            "name": "ExtendedServices",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
+            "alias": "os-extended-services-delete",
+            "description": "",
+            "links": [],
+            "name": "ExtendedServicesDelete",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
+        },
+        {
             "alias": "os-extended-status",
-            "description": "Extended Status support."
+            "description": "Extended Status support.",
+            "links": [],
+            "name": "ExtendedStatus",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ExtendedVolumes",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-extended-volumes",
-            "description": "Extended Volumes support."
+            "description": "Extended Volumes support.",
+            "links": [],
+            "name": "ExtendedVolumes",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FixedIPs",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-fixed-ips",
-            "description": "Fixed IPs support."
+            "description": "Fixed IPs support.",
+            "links": [],
+            "name": "FixedIPs",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FlavorAccess",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-flavor-access",
-            "description": "Flavor access support."
+            "description": "Flavor access support.",
+            "links": [],
+            "name": "FlavorAccess",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FlavorExtraSpecs",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-flavor-extra-specs",
-            "description": "Flavors extra specs support."
+            "description": "Flavors extra specs support.",
+            "links": [],
+            "name": "FlavorExtraSpecs",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FlavorManage",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-flavor-manage",
-            "description": "Flavor create/delete API support."
+            "description": "Flavor create/delete API support.",
+            "links": [],
+            "name": "FlavorManage",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FlavorRxtx",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-flavor-rxtx",
-            "description": "Support to show the rxtx status of a flavor."
+            "description": "Support to show the rxtx status of a flavor.",
+            "links": [],
+            "name": "FlavorRxtx",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FlavorSwap",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-flavor-swap",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "FlavorSwap",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FloatingIpDns",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-floating-ip-dns",
-            "description": "Floating IP DNS support."
+            "description": "Floating IP DNS support.",
+            "links": [],
+            "name": "FloatingIpDns",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FloatingIpPools",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-floating-ip-pools",
-            "description": "Floating IPs support."
+            "description": "Floating IPs support.",
+            "links": [],
+            "name": "FloatingIpPools",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FloatingIps",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-floating-ips",
-            "description": "Floating IPs support."
+            "description": "Floating IPs support.",
+            "links": [],
+            "name": "FloatingIps",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "FloatingIpsBulk",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-floating-ips-bulk",
-            "description": "Bulk handling of Floating IPs."
+            "description": "Bulk handling of Floating IPs.",
+            "links": [],
+            "name": "FloatingIpsBulk",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Fping",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-fping",
-            "description": "Fping Management Extension."
+            "description": "Fping Management Extension.",
+            "links": [],
+            "name": "Fping",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "HideServerAddresses",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-hide-server-addresses",
-            "description": "Support hiding server addresses in certain states."
+            "description": "Support hiding server addresses in certain states.",
+            "links": [],
+            "name": "HideServerAddresses",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Hosts",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-hosts",
-            "description": "Admin-only host administration."
+            "description": "Admin-only host administration.",
+            "links": [],
+            "name": "Hosts",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "HypervisorStatus",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-hypervisor-status",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "HypervisorStatus",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Hypervisors",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-hypervisors",
-            "description": "Admin-only hypervisor administration."
+            "description": "Admin-only hypervisor administration.",
+            "links": [],
+            "name": "Hypervisors",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "InstanceActions",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-instance-actions",
-            "description": "View a log of actions and events taken on an instance."
+            "description": "View a log of actions and events taken on an instance.",
+            "links": [],
+            "name": "InstanceActions",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "OSInstanceUsageAuditLog",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-instance_usage_audit_log",
-            "description": "Admin-only Task Log Monitoring."
+            "description": "Admin-only Task Log Monitoring.",
+            "links": [],
+            "name": "OSInstanceUsageAuditLog",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Keypairs",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-keypairs",
-            "description": "Keypair Support."
+            "description": "Keypair Support.",
+            "links": [],
+            "name": "Keypairs",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "LockServer",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-lock-server",
-            "description": "Enable lock/unlock server actions."
+            "description": "Enable lock/unlock server actions.",
+            "links": [],
+            "name": "LockServer",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "MigrateServer",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-migrate-server",
-            "description": "Enable migrate and live-migrate server actions."
+            "description": "Enable migrate and live-migrate server actions.",
+            "links": [],
+            "name": "MigrateServer",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Migrations",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-migrations",
-            "description": "Provide data on migrations."
+            "description": "Provide data on migrations.",
+            "links": [],
+            "name": "Migrations",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "MultipleCreate",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-multiple-create",
-            "description": "Allow multiple create in the Create Server v2.1 API."
+            "description": "Allow multiple create in the Create Server v2.1 API.",
+            "links": [],
+            "name": "MultipleCreate",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Networks",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-networks",
-            "description": "Admin-only Network Management Extension."
+            "description": "Admin-only Network Management Extension.",
+            "links": [],
+            "name": "Networks",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "NetworkAssociationSupport",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-networks-associate",
-            "description": "Network association support."
+            "description": "Network association support.",
+            "links": [],
+            "name": "NetworkAssociationSupport",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "PauseServer",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-pause-server",
-            "description": "Enable pause/unpause server actions."
+            "description": "Enable pause/unpause server actions.",
+            "links": [],
+            "name": "PauseServer",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Personality",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-personality",
-            "description": "Personality support."
+            "description": "Personality support.",
+            "links": [],
+            "name": "Personality",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "PreserveEphemeralOnRebuild",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-preserve-ephemeral-rebuild",
-            "description": "Allow preservation of the ephemeral partition on rebuild."
+            "description": "Allow preservation of the ephemeral partition on rebuild.",
+            "links": [],
+            "name": "PreserveEphemeralOnRebuild",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "QuotaClasses",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-quota-class-sets",
-            "description": "Quota classes management support."
+            "description": "Quota classes management support.",
+            "links": [],
+            "name": "QuotaClasses",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Quotas",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-quota-sets",
-            "description": "Quotas management support."
+            "description": "Quotas management support.",
+            "links": [],
+            "name": "Quotas",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Rescue",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-rescue",
-            "description": "Instance rescue mode."
+            "description": "Instance rescue mode.",
+            "links": [],
+            "name": "Rescue",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "SecurityGroupDefaultRules",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-security-group-default-rules",
-            "description": "Default rules for security group support."
+            "description": "Default rules for security group support.",
+            "links": [],
+            "name": "SecurityGroupDefaultRules",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "SecurityGroups",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-security-groups",
-            "description": "Security group support."
+            "description": "Security group support.",
+            "links": [],
+            "name": "SecurityGroups",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ServerDiagnostics",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-server-diagnostics",
-            "description": "Allow Admins to view server diagnostics through server action."
+            "description": "Allow Admins to view server diagnostics through server action.",
+            "links": [],
+            "name": "ServerDiagnostics",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ServerExternalEvents",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-server-external-events",
-            "description": "Server External Event Triggers."
+            "description": "Server External Event Triggers.",
+            "links": [],
+            "name": "ServerExternalEvents",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ServerGroupQuotas",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-server-group-quotas",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "ServerGroupQuotas",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ServerGroups",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-server-groups",
-            "description": "Server group support."
+            "description": "Server group support.",
+            "links": [],
+            "name": "ServerGroups",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ServerListMultiStatus",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-server-list-multi-status",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "ServerListMultiStatus",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ServerPassword",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-server-password",
-            "description": "Server password support."
+            "description": "Server password support.",
+            "links": [],
+            "name": "ServerPassword",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ServerSortKeys",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-server-sort-keys",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "ServerSortKeys",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "ServerStartStop",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-server-start-stop",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "ServerStartStop",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Services",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-services",
-            "description": "Services support."
+            "description": "Services support.",
+            "links": [],
+            "name": "Services",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Shelve",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-shelve",
-            "description": "Instance shelve mode."
+            "description": "Instance shelve mode.",
+            "links": [],
+            "name": "Shelve",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "SimpleTenantUsage",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-simple-tenant-usage",
-            "description": "Simple tenant usage extension."
+            "description": "Simple tenant usage extension.",
+            "links": [],
+            "name": "SimpleTenantUsage",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "SuspendServer",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-suspend-server",
-            "description": "Enable suspend/resume server actions."
+            "description": "Enable suspend/resume server actions.",
+            "links": [],
+            "name": "SuspendServer",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "OSTenantNetworks",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-tenant-networks",
-            "description": "Tenant-based Network Management Extension."
+            "description": "Tenant-based Network Management Extension.",
+            "links": [],
+            "name": "OSTenantNetworks",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "UsedLimits",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-used-limits",
-            "description": "Provide data on limited resources that are being used."
+            "description": "Provide data on limited resources that are being used.",
+            "links": [],
+            "name": "UsedLimits",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "UsedLimitsForAdmin",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-used-limits-for-admin",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "UsedLimitsForAdmin",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "UserData",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-user-data",
-            "description": "Add user_data to the Create Server API."
+            "description": "Add user_data to the Create Server API.",
+            "links": [],
+            "name": "UserData",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "UserQuotas",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-user-quotas",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "UserQuotas",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "VirtualInterfaces",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-virtual-interfaces",
-            "description": "Virtual interface support."
+            "description": "Virtual interface support.",
+            "links": [],
+            "name": "VirtualInterfaces",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "VolumeAttachmentUpdate",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-volume-attachment-update",
-            "description": ""
+            "description": "",
+            "links": [],
+            "name": "VolumeAttachmentUpdate",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         },
         {
-            "updated": "2014-12-03T00:00:00Z",
-            "name": "Volumes",
-            "links": [],
-            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "alias": "os-volumes",
-            "description": "Volumes support."
+            "description": "Volumes support.",
+            "links": [],
+            "name": "Volumes",
+            "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
+            "updated": "2014-12-03T00:00:00Z"
         }
     ]
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-log-request.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-log-request.json
new file mode 100644
index 000000000..6ccc5524e
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-log-request.json
@@ -0,0 +1,5 @@
+{
+    "host": "host1",
+    "binary": "nova-compute",
+    "disabled_reason": "test2"
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-log-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-log-response.json
new file mode 100644
index 000000000..841d71ca2
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-log-response.json
@@ -0,0 +1,8 @@
+{
+    "service": {
+        "binary": "nova-compute",
+        "disabled_reason": "test2",
+        "host": "host1",
+        "status": "disabled"
+    }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-request.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-request.json
new file mode 100644
index 000000000..f96d34536
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-request.json
@@ -0,0 +1,4 @@
+{
+    "host": "host1",
+    "binary": "nova-compute"
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-response.json
new file mode 100644
index 000000000..0c639ec12
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-disable-response.json
@@ -0,0 +1,7 @@
+{
+    "service": {
+        "binary": "nova-compute",
+        "host": "host1",
+        "status": "disabled"
+    }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-enable-request.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-enable-request.json
new file mode 100644
index 000000000..f96d34536
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-enable-request.json
@@ -0,0 +1,4 @@
+{
+    "host": "host1",
+    "binary": "nova-compute"
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-enable-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-enable-response.json
new file mode 100644
index 000000000..c54738669
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/service-enable-response.json
@@ -0,0 +1,7 @@
+{
+    "service": {
+        "binary": "nova-compute",
+        "host": "host1",
+        "status": "enabled"
+    }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/services-list-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/services-list-response.json
new file mode 100644
index 000000000..f51808c15
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/services-list-response.json
@@ -0,0 +1,54 @@
+{
+    "services": [
+        {
+            "status": "enabled",
+            "binary": "nova-conductor",
+            "host": "dflem-srv",
+            "zone": "internal",
+            "state": "up",
+            "disabled_reason": null,
+            "id": 1,
+            "updated_at": "2016-01-07T01:45:31.000000"
+        },
+        {
+            "status": "enabled",
+            "binary": "nova-cert",
+            "host": "dflem-srv",
+            "zone": "internal",
+            "state": "up",
+            "disabled_reason": null,
+            "id": 2,
+            "updated_at": "2016-01-07T01:45:24.000000"
+        },
+        {
+            "status": "enabled",
+            "binary": "nova-scheduler",
+            "host": "dflem-srv",
+            "zone": "internal",
+            "state": "up",
+            "disabled_reason": null,
+            "id": 3,
+            "updated_at": "2016-01-07T01:45:31.000000"
+        },
+        {
+            "status": "enabled",
+            "binary": "nova-consoleauth",
+            "host": "dflem-srv",
+            "zone": "internal",
+            "state": "up",
+            "disabled_reason": null,
+            "id": 4,
+            "updated_at": "2016-01-07T01:45:27.000000"
+        },
+        {
+            "status": "enabled",
+            "binary": "nova-compute",
+            "host": "dflem-srv",
+            "zone": "nova",
+            "state": "up",
+            "disabled_reason": null,
+            "id": 5,
+            "updated_at": "2016-01-07T01:45:27.000000"
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-log-request.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-log-request.json
new file mode 100644
index 000000000..6ccc5524e
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-log-request.json
@@ -0,0 +1,5 @@
+{
+    "host": "host1",
+    "binary": "nova-compute",
+    "disabled_reason": "test2"
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-log-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-log-response.json
new file mode 100644
index 000000000..841d71ca2
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-log-response.json
@@ -0,0 +1,8 @@
+{
+    "service": {
+        "binary": "nova-compute",
+        "disabled_reason": "test2",
+        "host": "host1",
+        "status": "disabled"
+    }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-request.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-request.json
new file mode 100644
index 000000000..f96d34536
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-request.json
@@ -0,0 +1,4 @@
+{
+    "host": "host1",
+    "binary": "nova-compute"
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-response.json
new file mode 100644
index 000000000..0c639ec12
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-disable-response.json
@@ -0,0 +1,7 @@
+{
+    "service": {
+        "binary": "nova-compute",
+        "host": "host1",
+        "status": "disabled"
+    }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-enable-request.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-enable-request.json
new file mode 100644
index 000000000..f96d34536
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-enable-request.json
@@ -0,0 +1,4 @@
+{
+    "host": "host1",
+    "binary": "nova-compute"
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-enable-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-enable-response.json
new file mode 100644
index 000000000..c54738669
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-enable-response.json
@@ -0,0 +1,7 @@
+{
+    "service": {
+        "binary": "nova-compute",
+        "host": "host1",
+        "status": "enabled"
+    }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-force-down-request.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-force-down-request.json
new file mode 100644
index 000000000..904ae6504
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-force-down-request.json
@@ -0,0 +1,5 @@
+{
+    "host": "host1",
+    "binary": "nova-compute",
+    "forced_down": true
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-force-down-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-force-down-response.json
new file mode 100644
index 000000000..4cdba98d2
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/service-force-down-response.json
@@ -0,0 +1,7 @@
+{
+    "service": {
+        "binary": "nova-compute",
+        "host": "host1",
+        "forced_down": true
+    }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/services-list-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/services-list-response.json
new file mode 100644
index 000000000..ebef3e1b4
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-services/v2.11/services-list-response.json
@@ -0,0 +1,48 @@
+{
+    "services": [
+        {
+            "id": 1,
+            "binary": "nova-scheduler",
+            "disabled_reason": "test1",
+            "host": "host1",
+            "state": "up",
+            "status": "disabled",
+            "updated_at": "2012-10-29T13:42:02.000000",
+            "forced_down": false,
+            "zone": "internal"
+        },
+        {
+            "id": 2,
+            "binary": "nova-compute",
+            "disabled_reason": "test2",
+            "host": "host1",
+            "state": "up",
+            "status": "disabled",
+            "updated_at": "2012-10-29T13:42:05.000000",
+            "forced_down": false,
+            "zone": "nova"
+        },
+        {
+            "id": 3,
+            "binary": "nova-scheduler",
+            "disabled_reason": null,
+            "host": "host2",
+            "state": "down",
+            "status": "enabled",
+            "updated_at": "2012-09-19T06:55:34.000000",
+            "forced_down": false,
+            "zone": "internal"
+        },
+        {
+            "id": 4,
+            "binary": "nova-compute",
+            "disabled_reason": "test4",
+            "host": "host2",
+            "state": "down",
+            "status": "disabled",
+            "updated_at": "2012-09-18T08:03:38.000000",
+            "forced_down": false,
+            "zone": "nova"
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-services-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-services-v2.1.wadl
index eb72b5b82..56c910c78 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-services-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-services-v2.1.wadl
@@ -28,17 +28,23 @@
                     <resource path="disable-log-reason" id="disable-log-reason">
                         <method href="#disableLogReason"/>
                     </resource>
-                    <method href="#deleteService"/>
+                    <resource id="service_id" path="{service_id}">
+                        &service_idTemplateParameter;
+                        <method href="#deleteService"/>
+                    </resource>
                 </resource>
             </resource>
         </resource>
     </resources>
     <method name="GET" id="listServices">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
-            title="List services">
+            title="List Compute services">
             <para role="shortdesc">
-                Lists all services for a tenant. Includes reasons, if
-                available, for why any services were disabled.
+                Lists all running Compute services for a tenant.
+            </para>
+            <para>
+                Includes reasons, if available, for why any services were
+                disabled.
             </para>
         </wadl:doc>
         <response status="200">
@@ -46,27 +52,27 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../samples/os-services/services-list-get-response.json"
+                        href="../samples/os-services/v2.11/services-list-response.json"
                     />
                 </wadl:doc>
-                &servicesResponseParameter;
-                &serviceIdResponseParameter;
-                &binaryRequestParameter;
-                &disabled_reasonRequestParameter;
-                &hostRequestParameter;
-                &serviceStateResponseParameter;
-                &forced_downResponseParameter;
-                &serviceStatusResponseParameter;
+                &servicesObjectParameter;
+                &service-idResponseParameter;
+                &service-binaryResponseParameter;
+                &service-disabled_reasonResponseParameter;
+                &service-hostResponseParameter;
+                &service-stateResponseParameter;
+                &service-statusResponseParameter;
                 &service-updated_at-ResponseParameter;
-                &zoneResponseParameter;
+                &service-forced_downResponseParameter;
+                &service-zoneResponseParameter;
             </representation>
         </response>
     </method>
     <method name="PUT" id="enableScheduling">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
-            title="Enable scheduling for a service">
+            title="Enable scheduling for a Compute service">
             <para role="shortdesc">
-                Enables scheduling for a service.
+                Enables scheduling for a Compute service.
             </para>
             <para>
                 Specify the service by its host name and binary name.
@@ -77,11 +83,11 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../samples/os-services/service-enable-put-request.json"
+                        href="../samples/os-services/v2.11/service-enable-request.json"
                     />
                 </wadl:doc>
-                &hostRequestParameter;
-                &binaryRequestParameter;
+                &service-hostRequestParameter;
+                &service-binaryRequestParameter;
             </representation>
         </request>
         <response status="200">
@@ -89,21 +95,21 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../samples/os-services/service-enable-update-response.json"
+                        href="../samples/os-services/v2.11/service-enable-response.json"
                     />
                 </wadl:doc>
-                &serviceResponseParameter;
-                &binaryRequestParameter;
-                &hostRequestParameter;
-                &serviceStatusResponseParameter;
+                &serviceObjectParameter;
+                &service-binaryResponseParameter;
+                &service-hostResponseParameter;
+                &service-statusResponseParameter;
             </representation>
         </response>
     </method>
     <method name="PUT" id="disableScheduling">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
-            title="Disable scheduling for a service">
+            title="Disable scheduling for a Compute service">
             <para role="shortdesc">
-                Disables scheduling for a service.
+                Disables scheduling for a Compute service.
             </para>
             <para>
                 Specify the service by its host name and binary name.
@@ -114,11 +120,11 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../samples/os-services/service-disable-put-request.json"
+                        href="../samples/os-services/service-disable-request.json"
                     />
                 </wadl:doc>
-                &hostRequestParameter;
-                &binaryRequestParameter;
+                &service-hostRequestParameter;
+                &service-binaryRequestParameter;
             </representation>
         </request>
         <response status="200">
@@ -126,22 +132,22 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../samples/os-services/service-disable-update-response.json"
+                        href="../samples/os-services/service-disable-response.json"
                     />
                 </wadl:doc>
-                &serviceResponseParameter;
-                &binaryRequestParameter;
-                &hostRequestParameter;
-                &serviceStatusResponseParameter;
+                &serviceObjectParameter;
+                &service-binaryResponseParameter;
+                &service-hostResponseParameter;
+                &service-statusResponseParameter;
             </representation>
         </response>
     </method>
     <method name="PUT" id="disableLogReason">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
-            title="Log disabled service information">
+            title="Log disabled Compute service information">
             <para role="shortdesc">
-                Logs information to the service table about why a
-                service was disabled.
+                Logs information to the Compute service table about why a
+                Compute service was disabled.
             </para>
             <para>
                 Specify the service by its host name and binary name.
@@ -152,12 +158,12 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../samples/os-services/service-disable-log-put-request.json"
+                        href="../samples/os-services/service-disable-log-request.json"
                     />
                 </wadl:doc>
-                &hostRequestParameter;
-                &binaryRequestParameter;
-                &disabled_reasonRequestParameter;
+                &service-hostRequestParameter;
+                &service-binaryRequestParameter;
+                &service-disabled_reasonRequestParameter;
             </representation>
         </request>
         <response status="200">
@@ -165,22 +171,22 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../samples/os-services/service-disable-log-update-response.json"
+                        href="../samples/os-services/service-disable-log-response.json"
                     />
                 </wadl:doc>
-                &serviceResponseParameter;
-                &binaryRequestParameter;
-                &disabled_reasonRequestParameter;
-                &hostRequestParameter;
-                &serviceStatusResponseParameter;
+                &serviceObjectParameter;
+                &service-binaryResponseParameter;
+                &service-disabled_reasonResponseParameter;
+                &service-hostResponseParameter;
+                &service-statusResponseParameter;
             </representation>
         </response>
     </method>
     <method name="DELETE" id="deleteService">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
-            title="Delete service">
+            title="Delete Compute service">
             <para role="shortdesc">
-                Deletes a service.
+                Deletes a Compute service.
             </para>
             <para>
                 Specify the service by its host name and binary name.
@@ -191,11 +197,11 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../samples/os-services/service-enable-put-request.json"
+                        href="../samples/os-services/service-enable-request.json"
                     />
                 </wadl:doc>
-                &hostRequestParameter;
-                &binaryRequestParameter;
+                &service-hostRequestParameter;
+                &service-binaryRequestParameter;
             </representation>
         </request>
         <response status="204"/>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/servers-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/servers-v2.1.wadl
index f99c2dbe3..d025f8d3a 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/servers-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/servers-v2.1.wadl
@@ -154,7 +154,8 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                <xsdxt:code href="../samples/servers/server-create-request.json"/>
             </wadl:doc>
-            &serverCreateParameters; &diskConfigRequestParameter;
+            &serverCreateParameters;
+            &diskConfigRequestParameter;
          </representation>
       </request>
       <response status="202">
@@ -166,7 +167,8 @@
          </representation>
       </response>
       <!-- All other common faults except build in progress -->
-      &commonFaults; &getFaults;
+      &commonFaults;
+      &getFaults;
    </method>
    <method name="GET" id="listServers">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List servers">
@@ -311,7 +313,8 @@
             &serverListResponseParameters;
          </representation>
       </response>
-      <!-- Common Faults and Header --> &commonFaults;
+      <!-- Common Faults and Header -->
+      &commonFaults;
    </method>
    <method name="GET" id="listServersDetailed">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@@ -420,7 +423,8 @@
             &serverResponseParameters;
          </representation>
       </response>
-      <!-- Common and GET Faults--> &commonFaults; &getFaults;
+      <!-- Common and GET Faults-->
+      &commonFaults; &getFaults;
    </method>
    <method name="PUT" id="updateServer">
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Update server">
@@ -471,7 +475,8 @@
          </representation>
       </response>
       <!-- Common, GET, inProgress Faults-->
-      &commonFaults; &getFaults;
+      &commonFaults;
+      &getFaults;
       &inProgressFault;
    </method>
    <method name="DELETE" id="deleteServer">
@@ -549,6 +554,7 @@
       </wadl:doc>
       <response status="204"/>
       <!-- Common, GET, inProgress Faults-->
-      &commonFaults; &getFaults;
+      &commonFaults;
+      &getFaults;
    </method>
 </application>