Merge "Update load balancer samples"

This commit is contained in:
Jenkins 2015-12-01 06:37:22 +00:00 committed by Gerrit Code Review
commit 61df8e621a
4 changed files with 101 additions and 78 deletions

View File

@ -1,12 +1,14 @@
{
"loadbalancer":{
"id":"8992a43f-83af-4b49-9afd-c2bfbd82d7d7",
"name":"Example LB",
"description":"A very simple example load balancer.",
"vip_address":"1.2.3.4",
"vip_subnet_id":"SUBNET_ID",
"tenant_id":"7725fe12-1c14-4f45-ba8e-44bf01763578",
"admin_state_up":true,
"status":"ACTIVE"
}
}
"loadbalancer": {
"description": "simple lb",
"admin_state_up": true,
"tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
"provisioning_status": "ACTIVE",
"listeners": [],
"vip_address": "10.0.0.2",
"vip_subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2",
"id": "a9729389-6147-41a3-ab22-a24aed8692b2",
"operating_status": "ONLINE",
"name": "loadbalancer1"
}
}

View File

@ -1,20 +1,16 @@
{
"loadbalancers": [
{
"id": "3b98602c-3cfe-4f91-bfa4-c3a11c9e7fe0",
"name": "Example LB",
"description": "A very simple example load balancer.",
"tenant_id": "783b31af-6635-48b2-a807-091d9973e3a9",
"description": "simple lb",
"admin_state_up": true,
"status": "ACTIVE"
},
{
"id": "c617c538-daa5-4ead-be88-59521d8745a7",
"name": "Example LB",
"description": "A very simple example load balancer.",
"tenant_id": "783b31af-6635-48b2-a807-091d9973e3a9",
"admin_state_up": true,
"status": "ACTIVE"
"tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
"provisioning_status": "ACTIVE",
"listeners": [],
"vip_address": "10.0.0.2",
"vip_subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2",
"id": "a9729389-6147-41a3-ab22-a24aed8692b2",
"operating_status": "ONLINE",
"name": "loadbalancer1"
}
]
}

View File

@ -2169,26 +2169,6 @@
</wadl:doc>
</param>'>
<!ENTITY lbResponseParams '
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="id" style="plain" type="csapi:uuid">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The UUID for the load balancer.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="name" style="plain" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The load balancer name.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="description" style="plain" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
@ -2199,36 +2179,6 @@
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="vip_address" style="plain" type="xsd:ip">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The IP address of the VIP.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="vip_subnet_id" style="plain" type="csapi:uuid">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The UUID of the subnet on which to allocate the virtual IP (VIP) address.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="status" style="plain" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>
The status of the load balancer. Indicates whether the load balancer
is operational.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="admin_state_up" style="plain" type="xsd:boolean">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
@ -2249,6 +2199,81 @@
specify a tenant UUID other than their own.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="provisioning_status" style="plain" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>
The provisioning status of the load balancer.
</para>
<para>
This value is <code>ACTIVE</code>, <code>PENDING_CREATE</code> or
<code>ERROR</code>.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="listeners" style="plain" type="xsd:dict">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>
The associated listeners, if any.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="vip_address" style="plain" type="xsd:ip">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The IP address of the VIP.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="vip_subnet_id" style="plain" type="csapi:uuid">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The UUID of the subnet on which to allocate the virtual IP (VIP)
address.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="id" style="plain" type="csapi:uuid">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The UUID for the load balancer.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="operating_status" style="plain" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>
The operating status of the load balancer.
</para>
<para>
This value is <code>ONLINE</code> or <code>OFFLINE</code>.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
name="name" style="plain" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The load balancer name.
</para>
</wadl:doc>
</param>'>
<!ENTITY lbCreateRequestParams '
<param xmlns="http://wadl.dev.java.net/2009/02" required="false"

View File

@ -108,8 +108,9 @@
<method name="GET" id="showLoadBalancerv2">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
title="Show load balancer details">
<para role="shortdesc">Shows details for a load
balancer.</para>
<para role="shortdesc">
Shows details for a load balancer.
</para>
<para>
This operation returns a load balancer object identified by
<code>loadbalancer_id</code>. If the user is not an
@ -174,8 +175,7 @@
</listitem>
</itemizedlist>
<para>
<emphasis role="bold">Example: Show load
balancer details</emphasis>
<emphasis role="bold">Example: Show load balancer details</emphasis>
</para>
</wadl:doc>
<response status="200">