openstack/api-site
Code Issues Proposed changes

Merge "Change neutron -> OpenStack Networking"

Browse Source
This commit is contained in:
Jenkins 2015-05-26 14:27:32 +00:00 committed by Gerrit Code Review
commit 3de97c46af
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api-ref/src/docbkx/ch_compute-v2.1.xml
View File

@ -88,8 +88,8 @@
Shows server usage for a specified server. Shows server usage for a specified server.
</para> </para>
<para> <para>
Shows <code>os-server-usage:launched_at</code> and <code>os-server- Shows <code>os-server-usage:launched_at</code> and
usage:terminated_at</code> attributes in server responses. <code>os-server-usage:terminated_at</code> attributes in server responses.
</para> </para>
<wadl:resources <wadl:resources
href="../wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl" href="../wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl"
@ -249,8 +249,9 @@
(servers, os-extended-availability-zones) (servers, os-extended-availability-zones)
</title> </title>
<para> <para>
Shows the instance availability zone for compute nodes (nova-compute). Shows the instance availability zone for compute nodes (nova-
Internal services appear in their own internal availability zone. compute). Internal services appear in their own internal availability
zone.
</para> </para>
<wadl:resources <wadl:resources
href="../wadls/compute-api/src/v2.1/wadl/os-extended-availability-zone-v2.1.wadl" href="../wadls/compute-api/src/v2.1/wadl/os-extended-availability-zone-v2.1.wadl"
@ -462,9 +463,8 @@
<section xml:id="os-floating-ips-bulk-v2.1"> <section xml:id="os-floating-ips-bulk-v2.1">
<title>Floating IPs bulk (os-floating-ips-bulk)</title> <title>Floating IPs bulk (os-floating-ips-bulk)</title>
<para> <para>
Bulk-creates, deletes, and lists floating IPs. By default, the pool Bulk-creates, deletes, and lists floating IPs. Default pool name is
is named nova. Use the <code>os-floating-ip- pools</code> extension <code>nova</code>. To view available pools, use the <code>os-floating-ip-pools</code> extension.
to view available pools.
</para> </para>
<wadl:resources <wadl:resources
href="../wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl" href="../wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl"

4
api-ref/src/wadls/compute-api/src/v2/ext/os-interface.wadl
View File

@ -84,7 +84,7 @@
</para> </para>
<para> <para>
If you do not specify the <code>port_id</code> If you do not specify the <code>port_id</code>
parameter, the Networking (neutron) API v2.0 parameter, the OpenStack Networking API v2.0
allocates a port on the specified network. allocates a port on the specified network.
</para> </para>
</wadl:doc> </wadl:doc>
@ -101,7 +101,7 @@
</para> </para>
<para> <para>
If you do not specify the <code>net_id</code> If you do not specify the <code>net_id</code>
parameter, the Networking (neutron) API v2.0 uses parameter, the OpenStack Networking API v2.0 uses
the network information cache that is associated the network information cache that is associated
with the instance. with the instance.
</para> </para>

2
api-ref/src/wadls/netconn-api/src/metering-labels.wadl
View File

@ -5,7 +5,7 @@
<!ENTITY % common_project SYSTEM "../../common_project.ent"> <!ENTITY % common_project SYSTEM "../../common_project.ent">
%common_project; %common_project;
]> ]>
<!-- (C) 2013-2014 OpenStack Foundation, All Rights Reserved --> <!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
<application xmlns="http://wadl.dev.java.net/2009/02" <application xmlns="http://wadl.dev.java.net/2009/02"
xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0" 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"