aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomanos Skiadas <rski@intracom-telecom.com>2016-12-13 10:28:01 +0200
committerRomanos Skiadas <rski@intracom-telecom.com>2016-12-13 10:29:37 +0200
commit91e01cd5f5579d6abcd134955e7a6be54ee1921f (patch)
treed8a2e722ab61bd4121392fc79047b97720a2bbc7
parent14f2b4917411bb24a03f04a210627f144873a995 (diff)
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>
-rwxr-xr-xfunctest/utils/openstack_utils.py6
1 files changed, 3 insertions, 3 deletions
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