openstack/watcher
Code Issues Proposed changes

Fix strategy state

Browse Source 
Change-Id: I003bb3b41aac69cc40a847f52a50c7bc4cc8d020
This commit is contained in:
Alexander Chadin 2018-01-25 15:41:31 +03:00
parent 9138b7bacb
commit 0c8c32e69e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
watcher/decision_engine/strategy/strategies/base.py
View File

@ -66,7 +66,7 @@ class StrategyEndpoint(object):
ds_metrics = datasource.list_metrics()
if ds_metrics is None:
raise exception.DataSourceNotAvailable(
datasource=strategy.config.datasource)
datasource=datasource.NAME)
else:
for metric in strategy.DATASOURCE_METRICS:
original_metric_name = datasource.METRIC_MAP.get(metric)
@ -81,7 +81,7 @@ class StrategyEndpoint(object):
if not datasource:
state = "Datasource is not presented for this strategy"
else:
state = "%s: %s" % (strategy.config.datasource,
state = "%s: %s" % (datasource.NAME,
datasource.check_availability())
return {'type': 'Datasource',
'state': state,
@ -104,7 +104,7 @@ class StrategyEndpoint(object):
try:
is_datasources = getattr(strategy.config, 'datasources', None)
if is_datasources:
datasource = is_datasources[0]
datasource = getattr(strategy, 'datasource_backend')
else:
datasource = getattr(strategy, strategy.config.datasource)
except (AttributeError, IndexError):

2
watcher/tests/decision_engine/strategy/strategies/test_strategy_endpoint.py
View File

@ -42,7 +42,7 @@ class TestStrategyEndpoint(base.BaseTestCase):
def test_get_datasource_status(self):
strategy = mock.MagicMock()
datasource = mock.MagicMock()
strategy.config.datasource = "gnocchi"
datasource.NAME = 'gnocchi'
datasource.check_availability.return_value = "available"
se = strategy_base.StrategyEndpoint(mock.MagicMock())
result = se._get_datasource_status(strategy, datasource)