code clean up

JIRA: YARDSTICK-272

Change-Id: Id2f1b3d1beff8843700cdfcaaa1e8f496f445ed9
Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>

diff --git a/tests/unit/benchmark/scenarios/availability/test_attacker_general.py b/tests/unit/benchmark/scenarios/availability/test_attacker_general.py
index d6488a9..643c1e7 100644 (file)
--- a/tests/unit/benchmark/scenarios/availability/test_attacker_general.py
+++ b/tests/unit/benchmark/scenarios/availability/test_attacker_general.py
@@ -32,7 +32,7 @@ class GeneralAttackerServiceTestCase(unittest.TestCase):
             'fault_type': 'general-attacker',
             'action_parameter':{'process_name':'nova_api'},
             'rollback_parameter':{'process_name':'nova_api'},
-            'key':'stop_service',
+            'key':'stop-service',
             'host': 'node1',
         }
 

diff --git a/tests/unit/benchmark/scenarios/availability/test_basemonitor.py b/tests/unit/benchmark/scenarios/availability/test_basemonitor.py
index 1408410..a20cf81 100644 (file)
--- a/tests/unit/benchmark/scenarios/availability/test_basemonitor.py
+++ b/tests/unit/benchmark/scenarios/availability/test_basemonitor.py
@@ -23,7 +23,7 @@ class MonitorMgrTestCase(unittest.TestCase):
     def setUp(self):
         config = {
             'monitor_type': 'openstack-api',
-            'key' : 'service_status'
+            'key' : 'service-status'
         }
 
         self.monitor_configs = []
@@ -40,7 +40,7 @@ class MonitorMgrTestCase(unittest.TestCase):
     def test_MonitorMgr_getitem(self, mock_monitor):
         monitorMgr = basemonitor.MonitorMgr()
         monitorMgr.init_monitors(self.monitor_configs, None)
-        monitorIns = monitorMgr['service_status']
+        monitorIns = monitorMgr['service-status']
 
 class BaseMonitorTestCase(unittest.TestCase):
 

diff --git a/tests/unit/benchmark/scenarios/availability/test_baseoperation.py b/tests/unit/benchmark/scenarios/availability/test_baseoperation.py
index 8c34191..d85f1e1 100644 (file)
--- a/tests/unit/benchmark/scenarios/availability/test_baseoperation.py
+++ b/tests/unit/benchmark/scenarios/availability/test_baseoperation.py
@@ -22,7 +22,7 @@ class OperationMgrTestCase(unittest.TestCase):
     def setUp(self):
         config = {
             'operation_type': 'general-operation',
-            'key' : 'service_status'
+            'key' : 'service-status'
         }
 
         self.operation_configs = []
@@ -31,7 +31,7 @@ class OperationMgrTestCase(unittest.TestCase):
     def  test_all_successful(self, mock_operation):
         mgr_ins = baseoperation.OperationMgr()
         mgr_ins.init_operations(self.operation_configs, None)
-        operation_ins = mgr_ins["service_status"]
+        operation_ins = mgr_ins["service-status"]
         mgr_ins.rollback()
 
     def test_getitem_fail(self, mock_operation):
@@ -59,7 +59,7 @@ class BaseOperationTestCase(unittest.TestCase):
     def setUp(self):
         self.config = {
             'operation_type': 'general-operation',
-            'key' : 'service_status'
+            'key' : 'service-status'
         }
 
     def test_all_successful(self):

diff --git a/tests/unit/benchmark/scenarios/availability/test_director.py b/tests/unit/benchmark/scenarios/availability/test_director.py
index 887ddd6..0611672 100644 (file)
--- 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)

diff --git a/tests/unit/benchmark/scenarios/availability/test_monitor_general.py b/tests/unit/benchmark/scenarios/availability/test_monitor_general.py
index 85487a5..b48434c 100644 (file)
--- a/tests/unit/benchmark/scenarios/availability/test_monitor_general.py
+++ b/tests/unit/benchmark/scenarios/availability/test_monitor_general.py
@@ -31,18 +31,18 @@ class GeneralMonitorServiceTestCase(unittest.TestCase):
         self.context = {"node1": host}
         self.monitor_cfg = {
             'monitor_type': 'general-monitor',
-            'key': 'service_status',
+            'key': 'service-status',
             'host': 'node1',
             'monitor_time': 3,
             'parameter': {'serviceName': 'haproxy'},
-            'sla': {'max_recover_time': 1}
+            'sla': {'max_outage_time': 1}
         }
         self.monitor_cfg_noparam = {
             'monitor_type': 'general-monitor',
-            'key': 'service_status',
+            'key': 'service-status',
             'host': 'node1',
             'monitor_time': 3,
-            'sla': {'max_recover_time': 1}
+            'sla': {'max_outage_time': 1}
         }
 
     def test__monitor_general_all_successful(self, mock_open, mock_ssh):

diff --git a/tests/unit/benchmark/scenarios/availability/test_scenario_general.py b/tests/unit/benchmark/scenarios/availability/test_scenario_general.py
index c17edea..bab9d62 100644 (file)
--- a/tests/unit/benchmark/scenarios/availability/test_scenario_general.py
+++ b/tests/unit/benchmark/scenarios/availability/test_scenario_general.py
@@ -29,14 +29,14 @@ class ScenarioGeneralTestCase(unittest.TestCase):
                     'key': "kill-process"}],
                 'monitors': [{
                     'monitor_type': "general-monitor",
-                    'key': "service_status"}],
+                    'key': "service-status"}],
                 'steps':[
                     {
                         'actionKey': "kill-process",
                         'actionType': "attacker",
                         'index': 1},
                     {
-                        'actionKey': "service_status",
+                        'actionKey': "service-status",
                         'actionType': "monitor",
                         'index': 2}]
             }
@@ -62,4 +62,4 @@ class ScenarioGeneralTestCase(unittest.TestCase):
         mock_obj.verify.return_value = False
         ins.director = mock_obj
         ins.run(None)
-        ins.teardown()
\ No newline at end of file
+        ins.teardown()

diff --git a/yardstick/benchmark/scenarios/availability/attacker_conf.yaml b/yardstick/benchmark/scenarios/availability/attacker_conf.yaml
index 16b3d73..e5d1b9f 100644 (file)
--- a/yardstick/benchmark/scenarios/availability/attacker_conf.yaml
+++ b/yardstick/benchmark/scenarios/availability/attacker_conf.yaml
@@ -12,6 +12,6 @@ bare-metal-down:
   check_script: ha_tools/check_host_ping.bash
   recovery_script: ha_tools/ipmi_power.bash
 
-stop_service:
+stop-service:
   inject_script: ha_tools/stop_service.bash
   recovery_script: ha_tools/start_service.bash

diff --git a/yardstick/benchmark/scenarios/availability/monitor/monitor_general.py b/yardstick/benchmark/scenarios/availability/monitor/monitor_general.py
index 515514c..e7e4d5b 100644 (file)
--- a/yardstick/benchmark/scenarios/availability/monitor/monitor_general.py
+++ b/yardstick/benchmark/scenarios/availability/monitor/monitor_general.py
@@ -59,7 +59,7 @@ class GeneralMonitor(basemonitor.BaseMonitor):
     def verify_SLA(self):
         LOG.debug("the _result:%s" % self._result)
         outage_time = self._result.get('outage_time', None)
-        max_outage_time = self._config["sla"]["max_recover_time"]
+        max_outage_time = self._config["sla"]["max_outage_time"]
         if outage_time is None:
             LOG.error("There is no outage_time in monitor result.")
             return False

diff --git a/yardstick/benchmark/scenarios/availability/monitor_conf.yaml b/yardstick/benchmark/scenarios/availability/monitor_conf.yaml
index 9efceed..d7bbdfe 100644 (file)
--- a/yardstick/benchmark/scenarios/availability/monitor_conf.yaml
+++ b/yardstick/benchmark/scenarios/availability/monitor_conf.yaml
@@ -3,9 +3,9 @@
 #
 schema: "yardstick:task:0.1"
 
-process_status:
+process-status:
   monitor_script: ha_tools/check_process_python.bash
-nova_image_list:
+nova-image-list:
   monitor_script: ha_tools/nova_image_list.bash
-service_status:
+service-status:
   monitor_script: ha_tools/check_service.bash

diff --git a/yardstick/benchmark/scenarios/availability/operation_conf.yaml b/yardstick/benchmark/scenarios/availability/operation_conf.yaml
index 78c996d..1e67463 100644 (file)
--- a/yardstick/benchmark/scenarios/availability/operation_conf.yaml
+++ b/yardstick/benchmark/scenarios/availability/operation_conf.yaml
@@ -7,10 +7,10 @@ nova-create-instance:
   action_script: ha_tools/nova/create_instance_from_image.bash
   rollback_script: ha_tools/nova/delete_instance.bash
 
-swift_upload_file:
+swift-upload-file:
   action_script: ha_tools/swift/upload.bash
   rollback_script: ha_tools/swift/delete.bash
 
-swift_download_file:
+swift-download-file:
   action_script: ha_tools/swift/download.bash
-  rollback_script: ha_tools/file/remove_file.bash
\ No newline at end of file
+  rollback_script: ha_tools/file/remove_file.bash