diff options
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml | 4 | ||||
| -rw-r--r-- | yardstick/benchmark/contexts/model.py | 2 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/ping.py | 4 | ||||
| -rw-r--r-- | yardstick/orchestrator/heat.py | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml index b45e41ebf..6f2952f97 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml @@ -9,8 +9,8 @@ scenarios: type: Ping options: packetsize: 100 - host: node1.LF - target: node2.LF + host: node4.LF + target: node5.LF runner: type: Duration 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/benchmark/scenarios/networking/ping.py b/yardstick/benchmark/scenarios/networking/ping.py index aa1a500cf..ae2166687 100644 --- a/yardstick/benchmark/scenarios/networking/ping.py +++ b/yardstick/benchmark/scenarios/networking/ping.py @@ -40,10 +40,10 @@ class Ping(base.Scenario): host = self.context_cfg['host'] user = host.get('user', 'ubuntu') ip = host.get('ip', None) - key_filename = host.get('key_filename', '~/.ssh/id_rsa') + key_filename = host.get('key_filename', '/root/.ssh/id_rsa') password = host.get('password', 'root') - LOG.info("user:%s, host:%s", user, ip) + LOG.info("user:%s, host:%s, key_filename:%s", user, ip, key_filename) self.connection = ssh.SSH(user, ip, key_filename=key_filename, password=password) self.connection.wait() 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} } } |