projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 2215 fixed
[osm/MON.git]
/
osm_mon
/
tests
/
unit
/
evaluator
/
test_evaluator_service.py
diff --git
a/osm_mon/tests/unit/evaluator/test_evaluator_service.py
b/osm_mon/tests/unit/evaluator/test_evaluator_service.py
index
15af5b6
..
54368dd
100644
(file)
--- a/
osm_mon/tests/unit/evaluator/test_evaluator_service.py
+++ b/
osm_mon/tests/unit/evaluator/test_evaluator_service.py
@@
-20,6
+20,7
@@
# For those usages not covered by the Apache License, Version 2.0 please
# contact: bdiaz@whitestack.com or glavado@whitestack.com
##
# For those usages not covered by the Apache License, Version 2.0 please
# contact: bdiaz@whitestack.com or glavado@whitestack.com
##
+
from unittest import TestCase, mock
from osm_mon.core.common_db import CommonDbClient
from unittest import TestCase, mock
from osm_mon.core.common_db import CommonDbClient
@@
-132,13
+133,23
@@
class EvaluatorTest(TestCase):
super().setUp()
self.config = Config()
super().setUp()
self.config = Config()
- @mock.patch.object(EvaluatorService, "_get_metric_
value
")
- def test_evaluate_metric(self, get_metric_
value
):
+ @mock.patch.object(EvaluatorService, "_get_metric_
data
")
+ def test_evaluate_metric(self, get_metric_
data
):
mock_alarm = mock.Mock()
mock_alarm.operation = "gt"
mock_alarm.threshold = 50.0
mock_alarm.metric = "metric_name"
mock_alarm = mock.Mock()
mock_alarm.operation = "gt"
mock_alarm.threshold = 50.0
mock_alarm.metric = "metric_name"
- get_metric_value.return_value = 100.0
+ get_metric_data.return_value = [
+ {
+ "labels": {
+ "vdu_name": "cirros_vnfd-VM",
+ "ns_id": "87776f33-b67c-417a-8119-cb08e4098951",
+ "vnf_member_index": "1",
+ "extra_label": "run_time_added_label",
+ },
+ "value": 100.0,
+ }
+ ]
service = EvaluatorService(self.config)
service.queue = mock.Mock()
service = EvaluatorService(self.config)
service.queue = mock.Mock()
@@
-151,7
+162,7
@@
class EvaluatorTest(TestCase):
service.queue.put.assert_called_with((mock_alarm, AlarmStatus.OK))
service.queue.reset_mock()
service.queue.put.assert_called_with((mock_alarm, AlarmStatus.OK))
service.queue.reset_mock()
- get_metric_
value
.return_value = None
+ get_metric_
data
.return_value = None
service._evaluate_metric(mock_alarm)
service.queue.put.assert_called_with((mock_alarm, AlarmStatus.INSUFFICIENT))
service._evaluate_metric(mock_alarm)
service.queue.put.assert_called_with((mock_alarm, AlarmStatus.INSUFFICIENT))
@@
-176,10
+187,10
@@
class EvaluatorTest(TestCase):
process.assert_called_with(target=evaluate_metric, args=(mock_alarm,))
process.assert_called_with(target=evaluate_metric, args=(mock_alarm,))
- @mock.patch.object(PrometheusBackend, "get_metric_
value
")
- def test_get_metric_
value_prometheus(self, get_metric_value
):
+ @mock.patch.object(PrometheusBackend, "get_metric_
data
")
+ def test_get_metric_
data_prometheus(self, get_metric_data
):
self.config.set("evaluator", "backend", "prometheus")
evaluator = EvaluatorService(self.config)
self.config.set("evaluator", "backend", "prometheus")
evaluator = EvaluatorService(self.config)
- evaluator._get_metric_
value
("test", {})
+ evaluator._get_metric_
data
("test", {})
- get_metric_
value
.assert_called_with("test", {})
+ get_metric_
data
.assert_called_with("test", {})