From: Romanos Skiadas <rski@intracom-telecom.com>
Date: Tue, 13 Dec 2016 08:28:01 +0000 (+0200)
Subject: Rename add_floating_ip arg to floatingip_addr
X-Git-Tag: danube.1.RC1~255^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F25833%2F1;p=functest.git

Rename add_floating_ip arg to floatingip_addr

nova_client.servers.add_floating_ip takes a Floating IP address as a second
argument, not an id. Naming the argument floatingip_id is misleading.

Change-Id: I39919fa305a46b58878c8b4f83e40c78390cfc07
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
---

diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py
index 10aaf5034..c304ae382 100755
--- a/functest/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py
@@ -393,13 +393,13 @@ def create_floating_ip(neutron_client):
     return {'fip_addr': fip_addr, 'fip_id': fip_id}
 
 
-def add_floating_ip(nova_client, server_id, floatingip_id):
+def add_floating_ip(nova_client, server_id, floatingip_addr):
     try:
-        nova_client.servers.add_floating_ip(server_id, floatingip_id)
+        nova_client.servers.add_floating_ip(server_id, floatingip_addr)
         return True
     except Exception, e:
         logger.error("Error [add_floating_ip(nova_client, '%s', '%s')]: %s"
-                     % (server_id, floatingip_id, e))
+                     % (server_id, floatingip_addr, e))
         return False