From 3fb3b473508590df2f285e775dc1268990f9f409 Mon Sep 17 00:00:00 2001
From: jichenjc <jichenjc@cn.ibm.com>
Date: Sun, 22 Nov 2015 12:24:15 +0800
Subject: [PATCH] Request id is not uuid, it's a int

Change request id of floating ip from uuid to int.

Change-Id: I54f816766dcdc39078386fc6c45dc30d7ab05dbf
Partial-Bug: #1515222
---
 api-ref/src/wadls/compute-api/src/v2.1/common.ent         | 8 +++++---
 .../compute-api/src/v2.1/wadl/os-floating-ips-v2.1.wadl   | 4 ++--
 2 files changed, 7 insertions(+), 5 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 a65144edf..7aee27296 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
@@ -1652,13 +1652,15 @@
     <para>The IP address.</para>
   </wadl:doc>
 </param>'>
-<!ENTITY floating-ip-idRequestParameter '
-<param name="floating_ip_id" style="template" type="csapi:UUID"
+<!ENTITY floating_ip_idRequestParameter '
+<param name="floating_ip_id" style="template" type="xsd:int"
   xmlns="http://wadl.dev.java.net/2009/02">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
    xml:lang="EN"
    xmlns:wadl="http://wadl.dev.java.net/2009/02">
-    <para>The UUID of the floating IP address.</para>
+    <para>
+      The ID of the floating IP address.
+   </para>
   </wadl:doc>
 </param>'>
 <!ENTITY instanceIdRequestParameter '
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-v2.1.wadl
index 59fa63650..94bdb90f7 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-v2.1.wadl
@@ -19,8 +19,8 @@
                 <resource id="os-floating-ips" path="os-floating-ips">
                     <method href="#listFloatingIPs"/>
                     <method href="#createFloatingIP"/>
-                    <resource id="floating-ip-id" path="{floating-ip-id}">
-                        &floating-ip-idRequestParameter;
+                    <resource id="floating_ip_id" path="{floating_ip_id}">
+                        &floating_ip_idRequestParameter;
                         <method href="#showFloatingIP"/>
                         <method href="#deleteFloatingIP"/>
                     </resource>