openstack/api-site
Code Issues Proposed changes

Merge "Correct some issues with L3 extension"

Browse Source
This commit is contained in:
Jenkins
2014-05-08 14:24:17 +00:00
committed by Gerrit Code Review
parent 3850b12322 1ccbb9e556
commit 264fa7de5d
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api-ref/src/wadls/netconn-api/src/api_samples/router-post-req.json
View File

@@ -1,6 +1,9 @@
{
"router":{
"name":"another_router",
"external_gateway_info":{
"network_id":"8ca37218-28ff-41cb-9b10-039601ea7e6b"
},
"admin_state_up":true
}
}

4
api-ref/src/wadls/netconn-api/src/api_samples/router-post-resp.json
View File

@@ -1,7 +1,9 @@
{
"router":{
"status":"ACTIVE",
"external_gateway_info":null,
"external_gateway_info":{
"network_id":"8ca37218-28ff-41cb-9b10-039601ea7e6b"
},
"name":"another_router",
"admin_state_up":true,
"tenant_id":"6b96ff0cb17a4b859e1e575d221683d3",

2
api-ref/src/wadls/netconn-api/src/common.ent
View File

@@ -1579,7 +1579,7 @@
</wadl:doc>
</param>
' >
<!-- Useful for describing APIs -->
<!-- Useful for describing APIs -->
<!ENTITY GET '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
<!ENTITY PUT '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
<!ENTITY POST '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>

12
api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl
View File

@@ -128,9 +128,12 @@ Accept: application/json</programlisting>
external network must be passed in the
<code>external_gateway_info</code> attribute in
the request body, as follows:</para>
<programlisting language="json">"external_gateway_info" :
{
"network_id": &lt;external_network_uuid&gt;
<programlisting language="json">{
"router":{
"external_gateway_info":{
"network_id":"8ca37218-28ff-41cb-9b10-039601ea7e6b"
}
}
}</programlisting>
</wadl:doc>
<request> &routerParameter; &nameParameter;
@@ -300,7 +303,8 @@ Accept: application/json</programlisting></wadl:doc>
],
"id":"3a44f4e5-1694-493a-a1fb-393881c673a4",
"device_id":"7177abc4-5ae9-4bb7-b0d4-89e94a4abf3b"
}</programlisting>
}
}</programlisting>
</wadl:doc>
<request> &routerParameter; &nameParameter;
&admin-state-upParameter; <representation