From 01ef3196202897ee18b58c1a2a454a1fa738a925 Mon Sep 17 00:00:00 2001
From: Yushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com>
Date: Sat, 13 Feb 2016 19:01:08 +0900
Subject: [PATCH] Modify 'id' to 'network_id'

'id' should be changed 'network_id' for following APIs:

  * os-networks-v2.1
  * os-tenant-networks-v2.1

Change-Id: I16bec0d1558efa0b98f4a04f097d40db3c13a37a
Closes-Bug:1544869
---
 api-ref/src/wadls/compute-api/src/v2.1/common.ent             | 4 ++--
 .../src/wadls/compute-api/src/v2.1/wadl/os-networks-v2.1.wadl | 4 ++--
 .../compute-api/src/v2.1/wadl/os-tenant-networks-v2.1.wadl    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api-ref/src/wadls/compute-api/src/v2.1/common.ent b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
index e53eefe53..9cbc1aa78 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/common.ent
+++ b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
@@ -313,8 +313,8 @@
       </para>
    </wadl:doc>
 </param>'>
-<!ENTITY network-idTemplateParameter '
-<param name="id" style="template" type="csapi:UUID"
+<!ENTITY network_idTemplateParameter '
+<param name="network_id" style="template" type="csapi:UUID"
   xmlns="http://wadl.dev.java.net/2009/02">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
    xml:lang="EN"
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-networks-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-networks-v2.1.wadl
index ff98e5737..51f226299 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-networks-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-networks-v2.1.wadl
@@ -22,8 +22,8 @@
                     <resource path="add" id="add">
                         <method href="#addNetwork"/>
                     </resource>
-                    <resource path="{id}" id="id">
-                        &network-idTemplateParameter;
+                    <resource id="network_id" path="{network_id}">
+                        &network_idTemplateParameter;
                         <method href="#showNetwork"/>
                         <method href="#deleteNetwork"/>
                         <resource path="action" id="action">
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-tenant-networks-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-tenant-networks-v2.1.wadl
index bf685ba2f..45cedb9b6 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-tenant-networks-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-tenant-networks-v2.1.wadl
@@ -19,8 +19,8 @@
                 <resource id="os-tenant-networks" path="os-tenant-networks">
                     <method href="#createProjectNetwork"/>
                     <method href="#listProjectNetworks"/>
-                    <resource path="{id}" id="id">
-                        &network-idTemplateParameter;
+                    <resource id="network_id" path="{network_id}">
+                        &network_idTemplateParameter;
                         <method href="#showProjectNetwork"/>
                         <method href="#deleteProjectNetwork"/>
                         <resource path="action" id="action">