aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2016-12-13 18:07:54 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-13 18:07:54 +0000
commit9f7bd1be53c6d5d184fcc9b510d49902c8df9013 (patch)
tree6c0c33c4323f548f0a00a927da8e61bd717328bd
parent320c67f6a67e21c60d4afca204c7d00bafd2c353 (diff)
parent91e01cd5f5579d6abcd134955e7a6be54ee1921f (diff)
Merge "Rename add_floating_ip arg to floatingip_addr"
-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 15dc87c38..8f698d73d 100755
--- a/functest/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py
@@ -473,13 +473,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