From 4416de1c9638f58ba74e636ddac4498699d6ab72 Mon Sep 17 00:00:00 2001
From: tjuyinkanglin <14_ykl@tongji.edu.cn>
Date: Mon, 25 Jul 2016 12:24:18 +0800
Subject: Code Clean for HA Testing Framework

JIRA: YARDSTICK-272

Change-Id: Icf41642fe0c31584f92c68cc9f97fa3f1e90b66e
Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>
---
 tests/unit/benchmark/scenarios/availability/test_attacker_general.py    | 1 +
 tests/unit/benchmark/scenarios/availability/test_monitor_general.py     | 2 ++
 tests/unit/benchmark/scenarios/availability/test_operation_general.py   | 2 ++
 .../benchmark/scenarios/availability/test_result_checker_general.py     | 1 +
 4 files changed, 6 insertions(+)

(limited to 'tests/unit/benchmark/scenarios')

diff --git a/tests/unit/benchmark/scenarios/availability/test_attacker_general.py b/tests/unit/benchmark/scenarios/availability/test_attacker_general.py
index 643c1e7ac..aa2e0cc4d 100644
--- a/tests/unit/benchmark/scenarios/availability/test_attacker_general.py
+++ b/tests/unit/benchmark/scenarios/availability/test_attacker_general.py
@@ -33,6 +33,7 @@ class GeneralAttackerServiceTestCase(unittest.TestCase):
             'action_parameter':{'process_name':'nova_api'},
             'rollback_parameter':{'process_name':'nova_api'},
             'key':'stop-service',
+            'attack_key':'stop-service',
             'host': 'node1',
         }
 
diff --git a/tests/unit/benchmark/scenarios/availability/test_monitor_general.py b/tests/unit/benchmark/scenarios/availability/test_monitor_general.py
index b48434c99..de7d26cbf 100644
--- a/tests/unit/benchmark/scenarios/availability/test_monitor_general.py
+++ b/tests/unit/benchmark/scenarios/availability/test_monitor_general.py
@@ -32,6 +32,7 @@ class GeneralMonitorServiceTestCase(unittest.TestCase):
         self.monitor_cfg = {
             'monitor_type': 'general-monitor',
             'key': 'service-status',
+            'monitor_key': 'service-status',
             'host': 'node1',
             'monitor_time': 3,
             'parameter': {'serviceName': 'haproxy'},
@@ -40,6 +41,7 @@ class GeneralMonitorServiceTestCase(unittest.TestCase):
         self.monitor_cfg_noparam = {
             'monitor_type': 'general-monitor',
             'key': 'service-status',
+            'monitor_key': 'service-status',
             'host': 'node1',
             'monitor_time': 3,
             'sla': {'max_outage_time': 1}
diff --git a/tests/unit/benchmark/scenarios/availability/test_operation_general.py b/tests/unit/benchmark/scenarios/availability/test_operation_general.py
index 6713733a8..26cd3f7c4 100644
--- a/tests/unit/benchmark/scenarios/availability/test_operation_general.py
+++ b/tests/unit/benchmark/scenarios/availability/test_operation_general.py
@@ -34,11 +34,13 @@ class GeneralOperaionTestCase(unittest.TestCase):
             'action_parameter': {'ins_cup': 2},
             'rollback_parameter': {'ins_id': 'id123456'},
             'key': 'nova-create-instance',
+            'operation_key': 'nova-create-instance',
             'host': 'node1',
         }
         self.operation_cfg_noparam = {
             'operation_type': 'general-operation',
             'key': 'nova-create-instance',
+            'operation_key': 'nova-create-instance',
             'host': 'node1',
         }
 
diff --git a/tests/unit/benchmark/scenarios/availability/test_result_checker_general.py b/tests/unit/benchmark/scenarios/availability/test_result_checker_general.py
index 88a9b9d20..bbadf0ac3 100644
--- a/tests/unit/benchmark/scenarios/availability/test_result_checker_general.py
+++ b/tests/unit/benchmark/scenarios/availability/test_result_checker_general.py
@@ -38,6 +38,7 @@ class GeneralResultCheckerTestCase(unittest.TestCase):
             'condition' : 'eq',
             'expectedValue' : 1,
             'key' : 'process-checker',
+            'checker_key' : 'process-checker',
             'host': 'node1'
         }
 
-- 
cgit 1.2.3-korg