diff options
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml | 4 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml | 2 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml | 2 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml | 2 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml | 2 | ||||
| -rw-r--r-- | yardstick/benchmark/contexts/heat.py | 4 | ||||
| -rw-r--r-- | yardstick/cmd/commands/task.py | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml index b49019633..5eb477943 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml @@ -16,7 +16,7 @@ scenarios: wait_time: 10 monitors: - monitor_type: "openstack-cmd" - command_name: "nova image-list" + command_name: "openstack image list" monitor_time: 10 sla: max_outage_time: 5 @@ -42,4 +42,4 @@ scenarios: context: type: Node name: LF - file: /root/yardstick/etc/yardstick/nodes/fuel_virtual/pod.yaml + file: etc/yardstick/nodes/fuel_virtual/pod.yaml diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml index 196994544..c6dde5cc5 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml @@ -15,7 +15,7 @@ scenarios: monitors: - monitor_type: "openstack-cmd" - command_name: "neutron agent-list" + command_name: "openstack router list" monitor_time: 10 sla: max_outage_time: 5 diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml index 1af561964..786a1f9a1 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml @@ -15,7 +15,7 @@ scenarios: monitors: - monitor_type: "openstack-cmd" - command_name: "keystone user-list" + command_name: "openstack user list" monitor_time: 10 sla: max_outage_time: 5 diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml index 24c28f5de..3f2e8752e 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml @@ -15,7 +15,7 @@ scenarios: monitors: - monitor_type: "openstack-cmd" - command_name: "glance image-list" + command_name: "openstack image list" monitor_time: 10 sla: max_outage_time: 5 diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml index 190084db9..32be5d976 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml @@ -15,7 +15,7 @@ scenarios: monitors: - monitor_type: "openstack-cmd" - command_name: "cinder list" + command_name: "openstack volume list" monitor_time: 10 sla: max_outage_time: 5 diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py index 0b9a4d294..4c7f05236 100644 --- a/yardstick/benchmark/contexts/heat.py +++ b/yardstick/benchmark/contexts/heat.py @@ -221,9 +221,9 @@ class HeatContext(Context): # copy some vital stack output into server objects for server in self.servers: - if len(server.ports) > 0: + if server.ports: # TODO(hafe) can only handle one internal network for now - port = list(server.ports.values())[0] + port = next(iter(server.ports.values())) server.private_ip = self.stack.outputs[port["stack_name"]] if server.floating_ip: diff --git a/yardstick/cmd/commands/task.py b/yardstick/cmd/commands/task.py index 20ab086e5..57c2b1526 100644 --- a/yardstick/cmd/commands/task.py +++ b/yardstick/cmd/commands/task.py @@ -48,7 +48,7 @@ class TaskCommands(object): self._init_result_file() try: - Task().start(param) + Task().start(param, **kwargs) except Exception as e: self._write_error_data(e) |