Merge "Modify 'id' to 'network_id'"

This commit is contained in:
Jenkins 2016-02-13 18:13:04 +00:00 committed by Gerrit Code Review
commit 25a3788f24
3 changed files with 6 additions and 6 deletions

View File

@ -313,8 +313,8 @@
</para> </para>
</wadl:doc> </wadl:doc>
</param>'> </param>'>
<!ENTITY network-idTemplateParameter ' <!ENTITY network_idTemplateParameter '
<param name="id" style="template" type="csapi:UUID" <param name="network_id" style="template" type="csapi:UUID"
xmlns="http://wadl.dev.java.net/2009/02"> xmlns="http://wadl.dev.java.net/2009/02">
<wadl:doc xmlns="http://docbook.org/ns/docbook" <wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN" xml:lang="EN"

View File

@ -22,8 +22,8 @@
<resource path="add" id="add"> <resource path="add" id="add">
<method href="#addNetwork"/> <method href="#addNetwork"/>
</resource> </resource>
<resource path="{id}" id="id"> <resource id="network_id" path="{network_id}">
&network-idTemplateParameter; &network_idTemplateParameter;
<method href="#showNetwork"/> <method href="#showNetwork"/>
<method href="#deleteNetwork"/> <method href="#deleteNetwork"/>
<resource path="action" id="action"> <resource path="action" id="action">

View File

@ -19,8 +19,8 @@
<resource id="os-tenant-networks" path="os-tenant-networks"> <resource id="os-tenant-networks" path="os-tenant-networks">
<method href="#createProjectNetwork"/> <method href="#createProjectNetwork"/>
<method href="#listProjectNetworks"/> <method href="#listProjectNetworks"/>
<resource path="{id}" id="id"> <resource id="network_id" path="{network_id}">
&network-idTemplateParameter; &network_idTemplateParameter;
<method href="#showProjectNetwork"/> <method href="#showProjectNetwork"/>
<method href="#deleteProjectNetwork"/> <method href="#deleteProjectNetwork"/>
<resource path="action" id="action"> <resource path="action" id="action">