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

Fix outlet_temp_control config parameter

Browse Source 
'datasource' should be 'datasources'

Change-Id: Iad337313f5d03b2fef34902950a4b5e41b3e980f
Depends-On: I2bd183e020298a93029f38008619a5bebaed3de4
This commit is contained in:
licanwei
2019-02-20 09:53:11 +08:00
parent e74ab79e81
commit dd3c4d5507
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
watcher/decision_engine/strategy/strategies/outlet_temp_control.py
View File

@@ -144,11 +144,14 @@ class OutletTempControl(base.ThermalOptimizationBaseStrategy):
@classmethod @classmethod
def get_config_opts(cls): def get_config_opts(cls):
return [ return [
cfg.StrOpt( cfg.ListOpt(
"datasource", "datasources",
help="Data source to use in order to query the needed metrics", help="Datasources to use in order to query the needed metrics."
default="gnocchi", " If one of strategy metric isn't available in the first"
choices=["ceilometer", "gnocchi"]) " datasource, the next datasource will be chosen.",
item_type=cfg.types.String(choices=['gnocchi', 'ceilometer',
'monasca']),
default=['gnocchi', 'ceilometer', 'monasca']),
] ]
def get_available_compute_nodes(self): def get_available_compute_nodes(self):
@@ -181,7 +184,7 @@ class OutletTempControl(base.ThermalOptimizationBaseStrategy):
hosts_need_release = [] hosts_need_release = []
hosts_target = [] hosts_target = []
metric_name = self.METRIC_NAMES[ metric_name = self.METRIC_NAMES[
self.config.datasource]['host_outlet_temp'] self.datasource_backend.NAME]['host_outlet_temp']
for node in nodes.values(): for node in nodes.values():
resource_id = node.uuid resource_id = node.uuid
outlet_temp = None outlet_temp = None

3
watcher/tests/decision_engine/strategy/strategies/test_outlet_temp_control.py
View File

@@ -72,7 +72,8 @@ class TestOutletTempControl(base.TestCase):
self.m_model.return_value = model_root.ModelRoot() self.m_model.return_value = model_root.ModelRoot()
self.m_datasource.return_value = mock.Mock( self.m_datasource.return_value = mock.Mock(
statistic_aggregation=self.fake_metrics.mock_get_statistics) statistic_aggregation=self.fake_metrics.mock_get_statistics,
NAME=self.fake_metrics.NAME)
self.strategy = strategies.OutletTempControl( self.strategy = strategies.OutletTempControl(
config=mock.Mock(datasource=self.datasource)) config=mock.Mock(datasource=self.datasource))