From 632f0844a6c60a39f091b3c6bd2e8d1ff189ed0e Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Mon, 23 Dec 2013 17:08:23 +0100
Subject: [PATCH] Fix validation problems for compute-api

Running "xmllint --noent --noout --schema \
http://docs.rackspace.com/rackbook/wadl.xsd *.wadl", I noticed
a couple of errors that I fixed:
* Wrong URLs for docbook
* Missing declarations

Change-Id: Ia5b47c1010e498d16c4c406f49c0664984a5e123
---
 .../compute-api/src/ext/os-console-output.wadl     |  2 +-
 .../src/wadls/compute-api/src/ext/os-consoles.wadl |  2 +-
 .../compute-api/src/ext/os-deferred-delete.wadl    |  4 ++--
 .../src/wadls/compute-api/src/ext/os-ext-az.wadl   |  4 +++-
 .../src/wadls/compute-api/src/ext/os-ext-ips.wadl  |  5 +++--
 .../wadls/compute-api/src/ext/os-floating-ips.wadl |  3 ++-
 .../wadls/compute-api/src/ext/os-quota-sets.wadl   |  2 +-
 .../src/wadls/compute-api/src/ext/os-rescue.wadl   |  5 +++--
 .../compute-api/src/ext/os-server-start-stop.wadl  | 14 +++++++-------
 .../src/ext/os-simple-tenant-usage.wadl            |  1 +
 10 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/api-ref/src/wadls/compute-api/src/ext/os-console-output.wadl b/api-ref/src/wadls/compute-api/src/ext/os-console-output.wadl
index 57a4dbbd5..44cd68a79 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-console-output.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-console-output.wadl
@@ -44,7 +44,7 @@
             <param name="os-getConsoleOutput" style="plain"
                 type="xsd:string" required="true">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Get console output action"
                         ><para>Specify the
                             <code>os-getConsoleOutput</code> action in
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-consoles.wadl b/api-ref/src/wadls/compute-api/src/ext/os-consoles.wadl
index 79b4c4842..0db887345 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-consoles.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-consoles.wadl
@@ -42,7 +42,7 @@
             <param name="getConsole" style="plain" type="xsd:string"
                 required="true">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Get console action"
                         ><para>Specify the <code>getConsole</code>
                         action in the request body.</para></wadl:doc>
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-deferred-delete.wadl b/api-ref/src/wadls/compute-api/src/ext/os-deferred-delete.wadl
index 433320a59..5777d13d0 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-deferred-delete.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-deferred-delete.wadl
@@ -44,7 +44,7 @@
             <param name="forceDelete" style="plain" type="xsd:string"
                 required="true">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Force delete action"
                         ><para>Specify the <code>forceDelete</code>
                         action in the request body.</para></wadl:doc>
@@ -79,7 +79,7 @@
             <param name="restore" style="plain" type="xsd:string"
                 required="true">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Restore action"><para>Specify
                         the <code>restore</code> action in the request
                         body.</para></wadl: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 633a07a61..c55fa9a3c 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
@@ -4,7 +4,9 @@
 
 <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:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
+             xmlns:wadl="http://wadl.dev.java.net/2009/02"
+             xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
 
     <resources base="https://servers.api.openstack.com">
         <resource id="version" type="#VersionDetails" path="v2/">
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-ext-ips.wadl b/api-ref/src/wadls/compute-api/src/ext/os-ext-ips.wadl
index b5e45c1fa..49e8f6e74 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-ext-ips.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-ext-ips.wadl
@@ -4,7 +4,8 @@
 
 <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:csapi="http://docs.openstack.org/compute/api/v1.1">
 
     <resources base="https://servers.api.openstack.com">
         <resource id="version" type="#VersionDetails" path="v2">
@@ -19,7 +20,7 @@
                 <resource id="Servers" path="servers">
                     <resource path="{server_id}">
                         <param name="server_id" style="template"
-                            type="csapi:UUID">
+                               type="csapi:UUID">
                             <doc><p
                                    xmlns="http://www.w3.org/1999/xhtml"
                                    > The UUID for the server of
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-floating-ips.wadl b/api-ref/src/wadls/compute-api/src/ext/os-floating-ips.wadl
index 34822d2b0..3ec6d662c 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-floating-ips.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-floating-ips.wadl
@@ -4,7 +4,8 @@
 
 <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:csapi="http://docs.openstack.org/compute/api/v1.1">
 
     <resources base="https://servers.api.openstack.com">
         <resource id="version" type="#VersionDetails" path="v2">
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-quota-sets.wadl b/api-ref/src/wadls/compute-api/src/ext/os-quota-sets.wadl
index 0e3557ae9..a1d97f732 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-quota-sets.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-quota-sets.wadl
@@ -4,7 +4,7 @@
 %common;]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:csapi="http://docs.openstack.org/compute/api/v2"
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com">
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-rescue.wadl b/api-ref/src/wadls/compute-api/src/ext/os-rescue.wadl
index 67bd639dd..988097a73 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-rescue.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-rescue.wadl
@@ -2,6 +2,7 @@
 <!-- (C) 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:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com">
@@ -43,7 +44,7 @@
             <param name="rescue" style="plain" type="xsd:string"
                 required="true">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Rescue action"><para>Specify
                         the <code>rescue</code> action in the request
                         body.</para></wadl:doc>
@@ -101,7 +102,7 @@
             <param name="unrescue" style="plain" type="xsd:string"
                 required="true">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Unrescue action"
                         ><para>Specify the <code>unrescue</code>
                         action in the request body.</para></wadl:doc>
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-server-start-stop.wadl b/api-ref/src/wadls/compute-api/src/ext/os-server-start-stop.wadl
index a9f187a51..4ba2ab8c5 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-server-start-stop.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-server-start-stop.wadl
@@ -11,7 +11,7 @@
                 <param name="tenant_id" style="template"
                     type="xsd:string">
                     <wadl:doc
-                        xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                        xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN" title="Tenant ID"><para>The ID
                             for the tenant or account in a
                             multi-tenancy cloud.</para></wadl:doc>
@@ -46,14 +46,14 @@
             <param name="os-stop" style="plain" type="xsd:string"
                 required="true">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Stop action"><para>Specify
                         the <code>os-stop</code> action in the request
                         body.</para></wadl:doc>
             </param>
             <representation mediaType="application/json">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Stop server: JSON request">
                     <xsdxt:code
                         href="../api_samples/os-server-start-stop/server-stop-req.json"
@@ -62,7 +62,7 @@
             </representation>
             <representation mediaType="application/xml">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Stop server: XML request">
                     <xsdxt:code
                         href="../api_samples/os-server-start-stop/server-stop-req.xml"
@@ -81,14 +81,14 @@
             <param name="os-start" style="plain" type="xsd:string"
                 required="true">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Start action"><para>Specify
                         the <code>os-start</code> action in the
                         request body.</para></wadl:doc>
             </param>
             <representation mediaType="application/json">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Start server: JSON request">
                     <xsdxt:code
                         href="../api_samples/os-server-start-stop/server-start-req.json"
@@ -97,7 +97,7 @@
             </representation>
             <representation mediaType="application/xml">
                 <wadl:doc
-                    xmlns="http://wadl:docbook.org/ns/wadl:docbook"
+                    xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Start server: XML request">
                     <xsdxt:code
                         href="../api_samples/os-server-start-stop/server-stop-req.xml"
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-simple-tenant-usage.wadl b/api-ref/src/wadls/compute-api/src/ext/os-simple-tenant-usage.wadl
index ee02dcc79..ae9bbdee9 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-simple-tenant-usage.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-simple-tenant-usage.wadl
@@ -2,6 +2,7 @@
 <!-- (C) 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:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com">
         <resource id="version" type="#VersionDetails" path="v2/">