Merge "Fix validation problems for compute-api"

This commit is contained in:
Jenkins 2013-12-23 18:54:03 +00:00 committed by Gerrit Code Review
commit ecc6c1763a
10 changed files with 24 additions and 18 deletions

View File

@ -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

View File

@ -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>

View File

@ -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>

View File

@ -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/">

View File

@ -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

View File

@ -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">

View File

@ -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">

View File

@ -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>

View File

@ -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"

View File

@ -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/">