diff options
| author |   tjuyinkanglin <14_ykl@tongji.edu.cn> | 2016-07-15 16:26:49 +0800 |
|---|---|---|
| committer | tjuyinkanglin <14_ykl@tongji.edu.cn> | 2016-07-18 13:00:55 +0800 |
| commit | 79e7edbb7dd0e8aed4cea42d4d2a996ef32b4237 (patch) | |
| tree | 85eedce5af124d3b10e28a7129e369539545189b /tests/unit/benchmark/scenarios/availability/test_director.py | |
| parent | 3a3ccbd79d47333ce7626674c68a4cdfac44020d (diff) | |
code clean up
JIRA: YARDSTICK-272
Change-Id: Id2f1b3d1beff8843700cdfcaaa1e8f496f445ed9
Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>
Diffstat (limited to 'tests/unit/benchmark/scenarios/availability/test_director.py')
| -rw-r--r-- | tests/unit/benchmark/scenarios/availability/test_director.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/unit/benchmark/scenarios/availability/test_director.py b/tests/unit/benchmark/scenarios/availability/test_director.py index 887ddd631..06116725d 100644 --- a/tests/unit/benchmark/scenarios/availability/test_director.py +++ b/tests/unit/benchmark/scenarios/availability/test_director.py @@ -33,16 +33,16 @@ class DirectorTestCase(unittest.TestCase): 'key': "kill-process"}], 'monitors': [{ 'monitor_type': "general-monitor", - 'key': "service_status"}], + 'key': "service-status"}], 'operations': [{ 'operation_type': 'general-operation', - 'key' : 'service_status'}], + 'key' : 'service-status'}], 'resultCheckers': [{ 'checker_type': 'general-result-checker', 'key' : 'process-checker',}], 'steps':[ { - 'actionKey': "service_status", + 'actionKey': "service-status", 'actionType': "operation", 'index': 1}, { @@ -54,7 +54,7 @@ class DirectorTestCase(unittest.TestCase): 'actionType': "resultchecker", 'index': 3}, { - 'actionKey': "service_status", + 'actionKey': "service-status", 'actionType': "monitor", 'index': 4}, ] @@ -69,12 +69,12 @@ class DirectorTestCase(unittest.TestCase): def test_director_all_successful(self, mock_checer, mock_opertion, mock_attacker, mock_monitor): ins = Director(self.scenario_cfg, self.ctx) - opertion_action = ins.createActionPlayer("operation", "service_status") + opertion_action = ins.createActionPlayer("operation", "service-status") attacker_action = ins.createActionPlayer("attacker", "kill-process") checker_action = ins.createActionPlayer("resultchecker", "process-checker") - monitor_action = ins.createActionPlayer("monitor", "service_status") + monitor_action = ins.createActionPlayer("monitor", "service-status") - opertion_rollback = ins.createActionRollbacker("operation", "service_status") + opertion_rollback = ins.createActionRollbacker("operation", "service-status") attacker_rollback = ins.createActionRollbacker("attacker", "kill-process") ins.executionSteps.append(opertion_rollback) ins.executionSteps.append(attacker_rollback) |