Merge "Network v2.0 API network-show response confusing"

This commit is contained in:
Jenkins 2015-07-15 13:17:27 +00:00 committed by Gerrit Code Review
commit dc3fbef3b9
3 changed files with 17 additions and 18 deletions

View File

@ -5,13 +5,9 @@
"54d6f61d-db07-451c-9ab3-b9609b6b6f0b"
],
"name": "private-network",
"provider:physical_network": null,
"admin_state_up": true,
"tenant_id": "4fd44f30292945e481c7b8a0c8908869",
"provider:network_type": "local",
"router:external": true,
"shared": true,
"id": "d32019d3-bc6e-4319-9c1d-6722fc136a22",
"provider:segmentation_id": null
"id": "d32019d3-bc6e-4319-9c1d-6722fc136a22"
}
}
}

View File

@ -9,12 +9,8 @@
<subnet>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</subnet>
</subnets>
<name>private-network</name>
<provider:physical_network xsi:nil="true"/>
<admin_state_up quantum:type="bool">True</admin_state_up>
<tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
<provider:network_type>local</provider:network_type>
<router:external quantum:type="bool">True</router:external>
<shared quantum:type="bool">True</shared>
<id>d32019d3-bc6e-4319-9c1d-6722fc136a22</id>
<provider:segmentation_id xsi:nil="true"/>
</network>

View File

@ -209,10 +209,10 @@
title="List networks">
<para role="shortdesc">Lists networks to which the
specified tenant has access.</para>
<para>You can control which attributes are returned by
<para>You can control which response parameters are returned by
using the fields query parameter. For information, see <link
xlink:href="http://specs.openstack.org/openstack/neutron-specs/specs/api/networking_general_api_information.html#filtering-and-column-selection"
>Filtering and Column Selection</link>.</para>
>Filtering and column selection</link>.</para>
</wadl:doc>
<response status="200">
<param required="true" name="admin_state_up" style="plain"
@ -514,19 +514,26 @@
title="Show network">
<para role="shortdesc">Shows information for a specified
network.</para>
<para>You can control which attributes are returned by
<para>You can control which response parameters are returned by
using the fields query parameter. For information, see <link
xlink:href="http://specs.openstack.org/openstack/neutron-specs/specs/api/networking_general_api_information.html#filtering-and-column-selection"
>Filtering and Column Selection</link>.</para>
>Filtering and column selection</link>.</para>
<para>
In addition to the following response parameters, the response
might show extension response parameters. For information, see <link
xlink:href="http://developer.openstack.org/api-ref-networking-v2-ext.html#showProviderNetwork">Networks multiple provider extension (networks)</link>.
</para>
</wadl:doc>
<response status="200">
<param required="true" name="admin_state_up" style="plain"
type="xsd:bool">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"><para>The administrative state of
the network, which is up (<code>true</code>)
or down
(<code>false</code>).</para></wadl:doc>
xml:lang="EN">
<para>
The administrative state of the network, which is up
(<code>true</code>) or down (<code>false</code>).
</para>
</wadl:doc>
</param>
<param required="true" name="id" style="plain"
type="csapi:uuid">