From 961d8e3cd3b8be1424559180144e7ce0ad5cfe43 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Thu, 11 Apr 2013 10:58:54 -0500
Subject: [PATCH] Updated description of availability zones extension

bug: #1107419

Change-Id: Ice456a9c822ea84a21bf5e49bd19e04cfac77d69
author: Diane Fleming
---
 api-ref/src/docbkx/api-ref.xml                |  3 ++-
 .../compute-api/src/ext/os-aggregates.wadl    | 22 +++++++++----------
 .../wadls/compute-api/src/ext/os-ext-az.wadl  |  2 +-
 .../wadls/compute-api/src/ext/os-hosts.wadl   |  5 +++--
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/api-ref/src/docbkx/api-ref.xml b/api-ref/src/docbkx/api-ref.xml
index 20412bcb0..f099d1479 100644
--- a/api-ref/src/docbkx/api-ref.xml
+++ b/api-ref/src/docbkx/api-ref.xml
@@ -109,7 +109,8 @@
     </section>
     <section xml:id="ext-availability-zone">
       <title>Extended Availability Zones</title>
-      <para>Shows the instance availability zone. </para>
+      <para>Shows the instance availability zone for compute nodes (nova-compute). 
+        Internal services appear in their own <emphasis role="italic">internal</emphasis> availability zone.</para>
       <wadl:resources
         href="../wadls/compute-api/src/ext/os-ext-az.wadl"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-aggregates.wadl b/api-ref/src/wadls/compute-api/src/ext/os-aggregates.wadl
index 102856443..fa1249e9c 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-aggregates.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-aggregates.wadl
@@ -10,7 +10,7 @@
     <resources base="https://servers.api.openstack.com">
         <resource id="version" path="v2/">
             <resource id="tenantID" path="{tenant_id}">
-                <param name="tenant_id" style="template">
+                <param name="tenant_id" style="template" type="csapi:UUID">
                     <doc><p xmlns="http://www.w3.org/1999/xhtml">
                       The ID for the tenant or account in a multi-tenancy cloud.
                     </p></doc>
@@ -20,7 +20,7 @@
                     <method href="#list_aggregates"/>
                     <method href="#create_aggregate"/>
                     <resource path="{aggregate_id}">
-                        <param name="aggregate_id" style="template">
+                        <param name="aggregate_id" style="template" type="csapi:UUID">
                             <doc><p xmlns="http://www.w3.org/1999/xhtml">
                               The ID associated with an aggregate.
                             </p>
@@ -66,12 +66,12 @@
             </p>
         </wadl:doc>
         <request>
-            <param name="name" style="plain" required="true">
+            <param name="name" style="plain" required="true" type="csapi:string">
                 <doc><p xmlns="http://www.w3.org/1999/xhtml">
                   Name of aggregate
                 </p></doc>
             </param>
-            <param name="availability_zone" style="plain" required="true">
+            <param name="availability_zone" style="plain" required="true" type="csapi:string">
                 <doc><p xmlns="http://www.w3.org/1999/xhtml">
                  Availability zone of aggregate
                 </p></doc>
@@ -133,14 +133,14 @@
             </p>
         </wadl:doc>
         <request>
-            <param name="name" style="plain" required="true">
+            <param name="name" style="plain" required="true" type="csapi:string">
                 <doc><p xmlns="http://www.w3.org/1999/xhtml">
-                  Name of aggregate
+                  Name of aggregate.
                 </p></doc>
             </param>
-            <param name="availability_zone" style="plain" required="true">
+            <param name="availability_zone" style="plain" required="true" type="csapi:string">
                 <doc><p xmlns="http://www.w3.org/1999/xhtml">
-                 Availability zone of aggregate
+                 Availability zone of aggregate.
                 </p></doc>
             </param>
             <representation mediaType="application/xml">
@@ -186,7 +186,7 @@
             </p>
         </wadl:doc>
         <request>
-            <param name="metadata" style="plain" required="true">
+            <param name="metadata" style="plain" required="true" type="csapi:string">
                 <doc><p xmlns="http://www.w3.org/1999/xhtml">
                   Metadata value to be set.
                 </p></doc>
@@ -222,7 +222,7 @@
             </p>
         </wadl:doc>
         <request>
-            <param name="host" style="plain" required="true">
+            <param name="host" style="plain" required="true" type="csapi:UUID">
                 <doc><p xmlns="http://www.w3.org/1999/xhtml">
                     Host ID to add to an aggregate, which is a collection of multiple groups of hosts that share common resources like storage and network.
                 </p></doc>
@@ -259,7 +259,7 @@
             </p>
         </wadl:doc>
         <request>
-            <param name="host" style="plain" required="true">
+            <param name="host" style="plain" required="true" type="csapi:UUID">
                 <doc><p xmlns="http://www.w3.org/1999/xhtml">
                   Host ID to add to an aggregate.
                 </p></doc>
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-ext-az.wadl b/api-ref/src/wadls/compute-api/src/ext/os-ext-az.wadl
index 0a92a4a76..633a07a61 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-ext-az.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-ext-az.wadl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- (C) 2012 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2012-2013 OpenStack Foundation, All Rights Reserved -->
 
 <application xmlns="http://wadl.dev.java.net/2009/02"
              xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-hosts.wadl b/api-ref/src/wadls/compute-api/src/ext/os-hosts.wadl
index 018383805..601bca78b 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-hosts.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-hosts.wadl
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- (C) 2012 OpenStack LLC., All Rights Reserved -->
+<!-- (C) 2012-2013 OpenStack Foundation, All Rights Reserved -->
 
 <application xmlns="http://wadl.dev.java.net/2009/02"
              xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
-             xmlns:wadl="http://wadl.dev.java.net/2009/02">
+             xmlns:wadl="http://wadl.dev.java.net/2009/02"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
     <resources base="https://servers.api.openstack.com">
         <resource id="version" type="#VersionDetails" path="v2/">