X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=yardstick%2Forchestrator%2Fheat.py;h=f3a19150345bf5bba132da0e64116a371a93c8b6;hb=b6caa35981fc35fa43def537931bb6b685da2a28;hp=294eebbcaf06cf6165b78a5fa8b5b4d05ac5d9fb;hpb=c3949144ecd32e7152ba89a45795d7ca401d5d50;p=yardstick.git

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}
             }
         }