diff options
| author |   rexlee8776 <limingjiang@huawei.com> | 2017-08-03 12:39:44 +0000 |
|---|---|---|
| committer | rexlee8776 <limingjiang@huawei.com> | 2017-08-09 03:43:19 +0000 |
| commit | 7c5a6396aaf939a5e566c7e86a96672251627af2 (patch) | |
| tree | 1acc001d25c80cc2f8b53ea963396aec35a8c5e9 /yardstick | |
| parent | 5ce3b6f8c8b3217091e51a6041455738603d90b8 (diff) | |
bugfix: tc025 and tc054 fail
also modify tc025 an tc054 to be able to pass paras
JIRA: YARDSTICK-772
Change-Id: Ibeba931804cccfd74fc70fcf4fdb6af9d5c8ab77
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
Diffstat (limited to 'yardstick')
| -rw-r--r-- | yardstick/benchmark/core/task.py | 5 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/availability/monitor/monitor_command.py | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py index 2b10c61b3..703bb6d95 100644 --- a/yardstick/benchmark/core/task.py +++ b/yardstick/benchmark/core/task.py @@ -123,7 +123,7 @@ class Task(object): # pragma: no cover except KeyboardInterrupt: raise except Exception: - LOG.exception('') + LOG.exception("Running test case %s failed!", case_name) testcases[case_name] = {'criteria': 'FAIL', 'tc_data': []} else: testcases[case_name] = {'criteria': 'PASS', 'tc_data': data} @@ -605,7 +605,8 @@ def get_networks_from_nodes(nodes): for node in nodes.values(): if not node: continue - for interface in node['interfaces'].values(): + interfaces = node.get('interfaces', {}) + for interface in interfaces.values(): vld_id = interface.get('vld_id') # mgmt network doesn't have vld_id if not vld_id: diff --git a/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py b/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py index a9488cc30..d0551bf03 100644 --- a/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py +++ b/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py @@ -63,6 +63,7 @@ class MonitorOpenstackCmd(basemonitor.BaseMonitor): def monitor_func(self): exit_status = 0 exit_status, stdout = _execute_shell_command(self.cmd) + LOG.debug("Execute command '%s' and the stdout is:\n%s", self.cmd, stdout) if exit_status: return False return True |