Merge "Update unitaty tests to verify strategy and goal name"

setup.cfg

@@ -56,7 +56,7 @@ watcher_goals =
 watcher_strategies =
     dummy = watcher.decision_engine.strategy.strategies.dummy_strategy:DummyStrategy
     basic = watcher.decision_engine.strategy.strategies.basic_consolidation:BasicConsolidation
-    outlet_temp_control = watcher.decision_engine.strategy.strategies.outlet_temp_control:OutletTempControl
+    outlet_temperature = watcher.decision_engine.strategy.strategies.outlet_temp_control:OutletTempControl
     vm_workload_consolidation = watcher.decision_engine.strategy.strategies.vm_workload_consolidation:VMWorkloadConsolidation
     workload_stabilization = watcher.decision_engine.strategy.strategies.workload_stabilization:WorkloadStabilization
     workload_balance = watcher.decision_engine.strategy.strategies.workload_balance:WorkloadBalance

watcher/common/loader/default.py

@@ -70,7 +70,6 @@ class DefaultLoader(base.BaseLoader):
         """Load the config of the plugin"""
         config = utils.Struct()
         config_opts = driver_cls.get_config_opts()
-
         if not config_opts:
             return config
 

watcher/tests/decision_engine/goal/test_goal_loader.py

@@ -75,4 +75,4 @@ class TestLoadGoalsWithDefaultGoalLoader(base.TestCase):
     def test_load_goals(self):
         goal = self.goal_loader.load(self.goal_name)
         self.assertIsNotNone(goal)
-        self.assertEqual(self.goal_cls.get_name(), goal.name)
+        self.assertEqual(self.goal_name, goal.name)

watcher/tests/decision_engine/strategy/loading/test_default_strategy_loader.py

@@ -75,4 +75,4 @@ class TestLoadStrategiesWithDefaultStrategyLoader(base.TestCase):
     def test_load_strategies(self):
         strategy = self.strategy_loader.load(self.strategy_name)
         self.assertIsNotNone(strategy)
-        self.assertEqual(self.strategy_cls.get_name(), strategy.name)
+        self.assertEqual(self.strategy_name, strategy.name)