summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-06-30 02:17:16 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-30 02:17:17 +0000
commit41dde94d0a4e575317c297e124ba0624e64c8552 (patch)
tree8e81abfb6ffcc8ea8fa2bf3dd2e0c4c472f5980f
parent8a4f8df64b8897bf38e77399099099f92266048b (diff)
parent54eae8aa5db86a983d721f08dd12d7f187af1a09 (diff)
Merge "Change floating ip association method"
-rw-r--r--yardstick/benchmark/contexts/model.py2
-rw-r--r--yardstick/orchestrator/heat.py12
2 files changed, 7 insertions, 7 deletions
diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py
index 80abb9df3..2cf31f6ea 100644
--- a/yardstick/benchmark/contexts/model.py
+++ b/yardstick/benchmark/contexts/model.py
@@ -206,7 +206,7 @@ class Server(Object):
template.add_floating_ip_association(
self.floating_ip_assoc["stack_name"],
self.floating_ip["stack_name"],
- server_name)
+ port_name)
template.add_server(server_name, self.image, self.flavor,
ports=port_name_list,
diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py
index 294eebbca..f3a191503 100644
--- a/yardstick/orchestrator/heat.py
+++ b/yardstick/orchestrator/heat.py
@@ -297,18 +297,18 @@ class HeatTemplate(HeatObject):
'value': {'get_attr': [name, 'ip']}
}
- def add_floating_ip_association(self, name, floating_ip_name, server_name):
+ def add_floating_ip_association(self, name, floating_ip_name, port_name):
'''add to the template a Nova FloatingIP Association resource
'''
log.debug("adding Nova::FloatingIPAssociation '%s', server '%s', "
- "floating_ip '%s'", name, server_name, floating_ip_name)
+ "floating_ip '%s'", name, port_name, floating_ip_name)
self.resources[name] = {
- 'type': 'OS::Nova::FloatingIPAssociation',
- 'depends_on': [server_name],
+ 'type': 'OS::Neutron::FloatingIPAssociation',
+ 'depends_on': [port_name],
'properties': {
- 'floating_ip': {'get_resource': floating_ip_name},
- 'server_id': {'get_resource': server_name}
+ 'floatingip_id': {'get_resource': floating_ip_name},
+ 'port_id': {'get_resource': port_name}
}
}