Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored Strategy selector to select from DB

Browse Source 
In this changeset, I refactored the strategy selector to now
look into the Watcher DB instead of looking into the configuration
file.

Partially Implements: blueprint get-goal-from-strategy

Change-Id: I2bcb63542f6237f26796a3e5a781c8b62820cf6f
This commit is contained in:
Vincent Françoise
2016-04-12 10:26:06 +02:00
parent 81765b9aa5
commit e67b532110
10 changed files with 111 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
watcher/tests/decision_engine/audit/test_default_audit_handler.py
View File

@@ -28,11 +28,12 @@ from watcher.tests.objects import utils as obj_utils
class TestDefaultAuditHandler(base.DbTestCase):
def setUp(self):
super(TestDefaultAuditHandler, self).setUp()
self.audit_template = obj_utils.create_test_audit_template(
obj_utils.create_test_goal(self.context, id=1, name="DUMMY")
audit_template = obj_utils.create_test_audit_template(
self.context)
self.audit = obj_utils.create_test_audit(
self.context,
audit_template_id=self.audit_template.id)
audit_template_id=audit_template.id)
@mock.patch.object(manager.CollectorManager, "get_cluster_model_collector")
def test_trigger_audit_without_errors(self, mock_collector):

16
watcher/tests/decision_engine/strategy/context/test_strategy_context.py
View File

@@ -31,19 +31,19 @@ from watcher.tests.objects import utils as obj_utils
class TestStrategyContext(base.DbTestCase):
def setUp(self):
super(TestStrategyContext, self).setUp()
self.audit_template = obj_utils. \
create_test_audit_template(self.context)
self.audit = obj_utils. \
create_test_audit(self.context,
audit_template_id=self.audit_template.id)
obj_utils.create_test_goal(self.context, id=1, name="DUMMY")
audit_template = obj_utils.create_test_audit_template(
self.context)
self.audit = obj_utils.create_test_audit(
self.context, audit_template_id=audit_template.id)
strategy_context = DefaultStrategyContext()
@mock.patch.object(DefaultStrategySelector, 'define_from_goal')
@mock.patch.object(DefaultStrategySelector, 'select')
@mock.patch.object(CollectorManager, "get_cluster_model_collector",
mock.Mock())
def test_execute_strategy(self, mock_call):
mock_call.return_value = DummyStrategy()
solution = self.strategy_context.execute_strategy(self.audit.uuid,
self.context)
solution = self.strategy_context.execute_strategy(
self.audit.uuid, self.context)
self.assertIsInstance(solution, DefaultSolution)

67
watcher/tests/decision_engine/strategy/selector/test_strategy_selector.py
View File

@@ -13,37 +13,54 @@
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from mock import patch
import mock
from oslo_config import cfg
from watcher.common.exception import WatcherException
from watcher.decision_engine.strategy.loading.default import \
DefaultStrategyLoader
from watcher.decision_engine.strategy.selection.default import \
DefaultStrategySelector
from watcher.tests.base import TestCase
from watcher.common import exception
from watcher.decision_engine.strategy.loading import default as default_loader
from watcher.decision_engine.strategy.selection import (
default as default_selector)
from watcher.decision_engine.strategy import strategies
from watcher.tests import base
CONF = cfg.CONF
class TestStrategySelector(TestCase):
strategy_selector = DefaultStrategySelector()
class TestStrategySelector(base.TestCase):
@patch.object(DefaultStrategyLoader, 'load')
def test_define_from_goal(self, mock_call):
cfg.CONF.set_override('goals',
{"DUMMY": "fake"}, group='watcher_goals',
enforce_type=True)
def setUp(self):
super(TestStrategySelector, self).setUp()
@mock.patch.object(default_loader.DefaultStrategyLoader, 'load')
def test_select_with_strategy_name(self, m_load):
expected_goal = 'DUMMY'
expected_strategy = CONF.watcher_goals.goals[expected_goal]
self.strategy_selector.define_from_goal(expected_goal, osc=None)
mock_call.assert_called_once_with(expected_strategy, osc=None)
expected_strategy = "dummy"
strategy_selector = default_selector.DefaultStrategySelector(
expected_goal, expected_strategy, osc=None)
strategy_selector.select()
m_load.assert_called_once_with(expected_strategy, osc=None)
@patch.object(DefaultStrategyLoader, 'load')
def test_define_from_goal_with_incorrect_mapping(self, mock_call):
cfg.CONF.set_override('goals', {}, group='watcher_goals',
enforce_type=True)
self.assertRaises(WatcherException,
self.strategy_selector.define_from_goal,
"DUMMY")
self.assertEqual(0, mock_call.call_count)
@mock.patch.object(default_loader.DefaultStrategyLoader, 'load')
@mock.patch.object(default_loader.DefaultStrategyLoader, 'list_available')
def test_select_with_goal_name_only(self, m_list_available, m_load):
m_list_available.return_value = {"dummy": strategies.DummyStrategy}
expected_goal = 'DUMMY'
expected_strategy = "dummy"
strategy_selector = default_selector.DefaultStrategySelector(
expected_goal, osc=None)
strategy_selector.select()
m_load.assert_called_once_with(expected_strategy, osc=None)
def test_select_non_existing_strategy(self):
strategy_selector = default_selector.DefaultStrategySelector(
"DUMMY", "NOT_FOUND")
self.assertRaises(exception.LoadingError, strategy_selector.select)
@mock.patch.object(default_loader.DefaultStrategyLoader, 'list_available')
def test_select_no_available_strategy_for_goal(self, m_list_available):
m_list_available.return_value = {}
strategy_selector = default_selector.DefaultStrategySelector(
"DUMMY")
self.assertRaises(exception.NoAvailableStrategyForGoal,
strategy_selector.select)