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

Backwards compatibility for node parameter

Browse Source 
Adds backwards compatibility for node parameter used by strategies. If
the node value is set by the user configuration it will override the
value for compute_node which is the value used by the strategies now.

This change was introduced in: https://review.opendev.org/#/c/656622/
Resolution discussed in the meeting on the 5th of June 2019
https://eavesdrop.openstack.org/meetings/watcher/2019/watcher.2019-06-05-08.00.log.html

Change-Id: Idaea062789a6b169e64f556fecc34cfbaaee5076
This commit is contained in:
Dantali0n
2019-06-11 11:31:37 +02:00
committed by Matt Riedemann
parent 8000dd650f
commit dd119ca1f8
5 changed files with 133 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
watcher/tests/decision_engine/strategy/strategies/test_basic_consolidation.py
View File

@@ -235,3 +235,18 @@ class TestBasicConsolidation(TestBaseStrategy):
loaded_action = loader.load(action['action_type'])
loaded_action.input_parameters = action['input_parameters']
loaded_action.validate_parameters()
def test_parameter_backwards_compat(self):
# Set the deprecated node values to a none default value
self.strategy.input_parameters.update(
{'aggregation_method': {
"instance": "mean",
"compute_node": "mean",
"node": 'min'}})
# Pre execute method handles backwards compatibility of parameters
self.strategy.pre_execute()
# assert that the compute_node values are updated to the those of node
self.assertEqual(
'min', self.strategy.aggregation_method['compute_node'])

47
watcher/tests/decision_engine/strategy/strategies/test_workload_stabilization.py
View File

@@ -85,9 +85,14 @@ class TestWorkloadStabilization(TestBaseStrategy):
"instance_ram_usage": "host_ram_usage"},
'host_choice': 'retry',
'retry_count': 1,
'periods': {"instance": 720, "compute_node": 600},
'aggregation_method': {"instance": "mean",
"compute_node": "mean"}})
'periods': {
"instance": 720,
"compute_node": 600,
"node": 0},
'aggregation_method': {
"instance": "mean",
"compute_node": "mean",
"node": ''}})
self.strategy.metrics = ["instance_cpu_usage", "instance_ram_usage"]
self.strategy.thresholds = {"instance_cpu_usage": 0.2,
"instance_ram_usage": 0.2}
@@ -98,9 +103,18 @@ class TestWorkloadStabilization(TestBaseStrategy):
"instance_ram_usage": "host_ram_usage"}
self.strategy.host_choice = 'retry'
self.strategy.retry_count = 1
self.strategy.periods = {"instance": 720, "compute_node": 600}
self.strategy.aggregation_method = {"instance": "mean",
"compute_node": "mean"}
self.strategy.periods = {
"instance": 720,
"compute_node": 600,
# node is deprecated
"node": 0,
}
self.strategy.aggregation_method = {
"instance": "mean",
"compute_node": "mean",
# node is deprecated
"node": '',
}
def test_get_instance_load(self):
model = self.fake_c_cluster.generate_scenario_1()
@@ -246,3 +260,24 @@ class TestWorkloadStabilization(TestBaseStrategy):
with mock.patch.object(self.strategy, 'migrate') as mock_migrate:
self.strategy.execute()
mock_migrate.assert_not_called()
def test_parameter_backwards_compat(self):
# Set the deprecated node values to a none default value
self.strategy.input_parameters.update(
{'periods': {
"instance": 720,
"compute_node": 600,
"node": 500
}, 'aggregation_method': {
"instance": "mean",
"compute_node": "mean",
"node": 'min'}})
# Pre execute method handles backwards compatibility of parameters
self.strategy.pre_execute()
# assert that the compute_node values are updated to the those of node
self.assertEqual(
'min', self.strategy.aggregation_method['compute_node'])
self.assertEqual(
500, self.strategy.periods['compute_node'])