evaluator: remove global conf usage from threshold evaluator
Change-Id: Ie0c9247a7c81da5a902b7b8f0847008392f70c78
This commit is contained in:
Julien Danjou
parent
79eb75223a
commit
e5db4b75f1
@ -50,14 +50,9 @@ class ThresholdEvaluator(evaluator.Evaluator):
|
||||
|
||||
def __init__(self, conf, notifier):
|
||||
super(ThresholdEvaluator, self).__init__(conf, notifier)
|
||||
self.api_client = None
|
||||
|
||||
@property
|
||||
def _client(self):
|
||||
"""Construct or reuse an authenticated API client."""
|
||||
if not self.api_client:
|
||||
auth_config = cfg.CONF.service_credentials
|
||||
creds = dict(
|
||||
auth_config = conf.service_credentials
|
||||
self._client = ceiloclient.get_client(
|
||||
2,
|
||||
os_auth_url=auth_config.os_auth_url,
|
||||
os_region_name=auth_config.os_region_name,
|
||||
os_tenant_name=auth_config.os_tenant_name,
|
||||
@ -66,13 +61,12 @@ class ThresholdEvaluator(evaluator.Evaluator):
|
||||
os_cacert=auth_config.os_cacert,
|
||||
os_endpoint_type=auth_config.os_endpoint_type,
|
||||
insecure=auth_config.insecure,
|
||||
timeout=cfg.CONF.http_timeout,
|
||||
timeout=conf.http_timeout,
|
||||
os_user_domain_id=auth_config.os_user_domain_id,
|
||||
os_project_name=auth_config.os_project_name,
|
||||
os_project_domain_id=auth_config.os_project_domain_id,
|
||||
|
||||
)
|
||||
self.api_client = ceiloclient.get_client(2, **creds)
|
||||
return self.api_client
|
||||
|
||||
@classmethod
|
||||
def _bound_duration(cls, alarm):
|
||||
|
||||
@ -113,9 +113,11 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
for alarm in self.alarms:
|
||||
alarm.rule[field] = value
|
||||
|
||||
def setUp(self):
|
||||
super(TestEvaluate, self).setUp()
|
||||
self.evaluator._client = self.api_client
|
||||
|
||||
def test_retry_transient_api_failure(self):
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
broken = exc.CommunicationError(message='broken')
|
||||
avgs = [self._get_stat('avg', self.alarms[0].rule['threshold'] - v)
|
||||
for v in moves.xrange(5)]
|
||||
@ -132,8 +134,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
|
||||
def test_simple_insufficient(self):
|
||||
self._set_all_alarms('ok')
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
self.api_client.statistics.list.return_value = []
|
||||
self._evaluate_all_alarms()
|
||||
self._assert_all_alarms('insufficient data')
|
||||
@ -153,8 +153,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
|
||||
def test_less_insufficient_data(self):
|
||||
self._set_all_alarms('ok')
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
avgs = [self._get_stat('avg', self.alarms[0].rule['threshold'] - v)
|
||||
for v in moves.xrange(4)]
|
||||
maxs = [self._get_stat('max', self.alarms[1].rule['threshold'] - v)
|
||||
@ -178,8 +176,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
|
||||
def test_simple_alarm_trip(self):
|
||||
self._set_all_alarms('ok')
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
avgs = [self._get_stat('avg', self.alarms[0].rule['threshold'] + v)
|
||||
for v in moves.xrange(1, 6)]
|
||||
maxs = [self._get_stat('max', self.alarms[1].rule['threshold'] - v)
|
||||
@ -203,8 +199,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
|
||||
def test_simple_alarm_clear(self):
|
||||
self._set_all_alarms('alarm')
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
avgs = [self._get_stat('avg', self.alarms[0].rule['threshold'] - v)
|
||||
for v in moves.xrange(5)]
|
||||
maxs = [self._get_stat('max', self.alarms[1].rule['threshold'] + v)
|
||||
@ -281,8 +275,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
|
||||
def test_equivocal_from_known_state(self):
|
||||
self._set_all_alarms('ok')
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
avgs = [self._get_stat('avg', self.alarms[0].rule['threshold'] + v)
|
||||
for v in moves.xrange(5)]
|
||||
maxs = [self._get_stat('max', self.alarms[1].rule['threshold'] - v)
|
||||
@ -298,8 +290,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
def test_equivocal_from_known_state_and_repeat_actions(self):
|
||||
self._set_all_alarms('ok')
|
||||
self.alarms[1].repeat_actions = True
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
avgs = [self._get_stat('avg',
|
||||
self.alarms[0].rule['threshold'] + v)
|
||||
for v in moves.xrange(5)]
|
||||
@ -320,8 +310,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
def test_unequivocal_from_known_state_and_repeat_actions(self):
|
||||
self._set_all_alarms('alarm')
|
||||
self.alarms[1].repeat_actions = True
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
avgs = [self._get_stat('avg',
|
||||
self.alarms[0].rule['threshold'] + v)
|
||||
for v in moves.xrange(1, 6)]
|
||||
@ -344,8 +332,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
self._set_all_alarms('ok')
|
||||
self.alarms[0].repeat_actions = True
|
||||
self.alarms[1].repeat_actions = True
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
avgs = [self._get_stat('avg', self.alarms[0].rule['threshold'] + v)
|
||||
for v in moves.xrange(1, 6)]
|
||||
maxs = [self._get_stat('max', self.alarms[1].rule['threshold'] - v)
|
||||
@ -387,8 +373,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
|
||||
def test_equivocal_from_unknown(self):
|
||||
self._set_all_alarms('insufficient data')
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
avgs = [self._get_stat('avg', self.alarms[0].rule['threshold'] + v)
|
||||
for v in moves.xrange(1, 6)]
|
||||
maxs = [self._get_stat('max', self.alarms[1].rule['threshold'] - v)
|
||||
@ -430,38 +414,9 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
def test_bound_duration_outlier_exclusion_set(self):
|
||||
self._do_test_bound_duration('2012-07-02T10:35:00', True)
|
||||
|
||||
def test_threshold_endpoint_types(self):
|
||||
endpoint_types = ["internalURL", "publicURL"]
|
||||
for endpoint_type in endpoint_types:
|
||||
self.conf.set_override('os_endpoint_type',
|
||||
endpoint_type,
|
||||
group='service_credentials')
|
||||
with mock.patch('ceilometerclient.client.get_client') as client:
|
||||
self.evaluator.api_client = None
|
||||
self._evaluate_all_alarms()
|
||||
conf = self.conf.service_credentials
|
||||
expected = [mock.call(
|
||||
2,
|
||||
os_auth_url=conf.os_auth_url,
|
||||
os_region_name=conf.os_region_name,
|
||||
os_tenant_name=conf.os_tenant_name,
|
||||
os_password=conf.os_password,
|
||||
os_username=conf.os_username,
|
||||
os_cacert=conf.os_cacert,
|
||||
os_endpoint_type=conf.os_endpoint_type,
|
||||
timeout=self.conf.http_timeout,
|
||||
insecure=conf.insecure,
|
||||
os_user_domain_id=conf.os_user_domain_id,
|
||||
os_project_name=conf.os_project_name,
|
||||
os_project_domain_id=conf.os_project_domain_id)]
|
||||
actual = client.call_args_list
|
||||
self.assertEqual(expected, actual)
|
||||
|
||||
def _do_test_simple_alarm_trip_outlier_exclusion(self, exclude_outliers):
|
||||
self._set_all_rules('exclude_outliers', exclude_outliers)
|
||||
self._set_all_alarms('ok')
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
# most recent datapoints inside threshold but with
|
||||
# anomalously low sample count
|
||||
threshold = self.alarms[0].rule['threshold']
|
||||
@ -501,8 +456,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
def _do_test_simple_alarm_clear_outlier_exclusion(self, exclude_outliers):
|
||||
self._set_all_rules('exclude_outliers', exclude_outliers)
|
||||
self._set_all_alarms('alarm')
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
# most recent datapoints outside threshold but with
|
||||
# anomalously low sample count
|
||||
threshold = self.alarms[0].rule['threshold']
|
||||
@ -589,8 +542,6 @@ class TestEvaluate(base.TestEvaluatorBase):
|
||||
dt = datetime.datetime(2014, 1, 1, 15, 0, 0,
|
||||
tzinfo=pytz.timezone('Europe/Ljubljana'))
|
||||
mock_utcnow.return_value = dt.astimezone(pytz.UTC)
|
||||
with mock.patch('ceilometerclient.client.get_client',
|
||||
return_value=self.api_client):
|
||||
self.api_client.statistics.list.return_value = []
|
||||
self._evaluate_all_alarms()
|
||||
self._assert_all_alarms('ok')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user