Merge "Adding availability_zone attributes"

This commit is contained in:
Jenkins 2015-12-28 20:54:29 +00:00 committed by Gerrit Code Review
commit 5c8154c56e
6 changed files with 84 additions and 16 deletions

View File

@ -549,6 +549,26 @@
</para>
</wadl:doc>
</param>'>
<!ENTITY availability_zone_hintsResponseParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="availability_zone_hints" style="plain" type="xsd:list">
<wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para>
The availability zone candidate for the network.
</para>
</wadl:doc>
</param>'>
<!ENTITY availability_zonesResponseParameter '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="availability_zones" style="plain" type="xsd:list">
<wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para>
The availability zone for the network.
</para>
</wadl:doc>
</param>'>
<!ENTITY portObject '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="port" style="plain" type="xsd:dict">

View File

@ -2,6 +2,7 @@
"network": {
"status": "ACTIVE",
"subnets": [],
"availability_zone_hints": [],
"name": "net1",
"provider:physical_network": "8bab8453-1bc9-45af-8c70-f83aa9b50453",
"admin_state_up": true,

View File

@ -4,6 +4,10 @@
"subnets": [
"54d6f61d-db07-451c-9ab3-b9609b6b6f0b"
],
"availability_zone_hints": [],
"availability_zones": [
"nova"
],
"name": "private-network",
"provider:physical_network": null,
"router:external": false,

View File

@ -2,6 +2,10 @@
"network": {
"status": "ACTIVE",
"subnets": [],
"availability_zone_hints": [],
"availability_zones": [
"nova"
],
"name": "sample_network_5_updated",
"provider:physical_network": null,
"admin_state_up": true,

View File

@ -5,6 +5,10 @@
"subnets": [
"54d6f61d-db07-451c-9ab3-b9609b6b6f0b"
],
"availability_zone_hints": [],
"availability_zones": [
"nova"
],
"name": "private-network",
"provider:physical_network": null,
"admin_state_up": true,
@ -21,6 +25,10 @@
"subnets": [
"08eae331-0402-425a-923c-34f7cfe39c1b"
],
"availability_zone_hints": [],
"availability_zones": [
"nova"
],
"name": "private",
"provider:physical_network": null,
"admin_state_up": true,

View File

@ -58,14 +58,18 @@
multiple provider extension</link> at the same time.
</para>
</wadl:doc>
<response status="200"> &networkProviderListResponseParams;
&networkProviderParameters; <representation
<response status="200">
<representation
mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../samples/networks/networks-provider-list-response.json"/>
</wadl:doc>
&networkProviderListResponseParams;
&availability_zone_hintsResponseParameter;
&availability_zonesResponseParameter;
&networkProviderParameters;
</representation>
</response> &fault401;
</method>
@ -76,26 +80,34 @@
Creates a network.
</para>
</wadl:doc>
<request> &networkObject; &networkCommonRequestParams;
&networkProviderParameters; <representation
<request>
<representation
mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../samples/networks/network-create-request.json"/>
</wadl:doc>
&networkObject;
&networkCommonRequestParams;
&networkProviderParameters;
</representation>
</request>
<response status="201"> &networkCreateResponseParams;
&networkProviderParameters; <representation
<response status="201">
<representation
mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../samples/networks/network-provider-create-response.json"/>
</wadl:doc>
&networkCreateResponseParams;
&availability_zone_hintsResponseParameter;
&networkProviderParameters;
</representation>
</response> &fault400; &fault401;
</response>
&fault400;
&fault401;
</method>
<method name="GET" id="showProviderNetwork">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
@ -114,8 +126,8 @@
multiple provider extension</link> at the same time.
</para>
</wadl:doc>
<response status="200"> &networkShowResponseParams;
&networkProviderParameters; <representation
<response status="200">
<representation
mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -123,8 +135,14 @@
href="../samples/networks/network-provider-show-response.json"
/>
</wadl:doc>
&networkShowResponseParams;
&availability_zone_hintsResponseParameter;
&availability_zonesResponseParameter;
&networkProviderParameters;
</representation>
</response> &fault401; &fault404;
</response>
&fault401;
&fault404;
</method>
<method name="PUT" id="updateProviderNetwork">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
@ -133,8 +151,8 @@
Updates a network.
</para>
</wadl:doc>
<request> &networkObject; &networkCommonRequestParams;
&networkProviderParameters; <representation
<request>
<representation
mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -142,10 +160,15 @@
href="../samples/networks/network-update-request.json"
/>
</wadl:doc>
&networkObject;
&networkCommonRequestParams;
&availability_zone_hintsResponseParameter;
&availability_zonesResponseParameter;
&networkProviderParameters;
</representation>
</request>
<response status="200"> &networkUpdateResponseParams;
&networkProviderParameters; <representation
<response status="200">
<representation
mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
@ -153,8 +176,13 @@
href="../samples/networks/network-provider-update-response.json"
/>
</wadl:doc>
&networkUpdateResponseParams;
&networkProviderParameters;
</representation>
</response> &fault400; &fault401; &fault404;
</response>
&fault400;
&fault401;
&fault404;
</method>
<method name="DELETE" id="deleteProviderNetwork">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
@ -163,6 +191,9 @@
Deletes a network.
</para>
</wadl:doc>
<response status="204"></response> &fault401; &fault404; &fault409;
<response status="204"/>
&fault401;
&fault404;
&fault409;
</method>
</application>