projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds support for vnf-metric in mon-evaluator
[osm/MON.git]
/
osm_mon
/
evaluator
/
evaluator.py
diff --git
a/osm_mon/evaluator/evaluator.py
b/osm_mon/evaluator/evaluator.py
index
7613e0b
..
a672cb2
100644
(file)
--- a/
osm_mon/evaluator/evaluator.py
+++ b/
osm_mon/evaluator/evaluator.py
@@
-136,8
+136,15
@@
class Evaluator:
processes.append(p)
p.start()
if 'vnf-metric' in vnf_monitoring_param:
processes.append(p)
p.start()
if 'vnf-metric' in vnf_monitoring_param:
- log.warning("vnf-metric is not currently supported.")
- continue
+ vnf_metric_name = vnf_monitoring_param['vnf-metric']['vnf-metric-name-ref']
+ p = multiprocessing.Process(target=self._evaluate_metric,
+ args=(nsr_id,
+ vnf_member_index,
+ '',
+ vnf_metric_name,
+ alarm))
+ processes.append(p)
+ p.start()
for process in processes:
process.join()
for process in processes:
process.join()
@@
-157,7
+164,7
@@
class Evaluator:
# Generate and send response
resp_message = response.generate_response(
'notify_alarm',
# Generate and send response
resp_message = response.generate_response(
'notify_alarm',
- alarm_id=alarm.id,
+ alarm_id=alarm.
uu
id,
vdu_name=alarm.vdur_name,
vnf_member_index=alarm.vnf_member_index,
ns_id=alarm.nsr_id,
vdu_name=alarm.vdur_name,
vnf_member_index=alarm.vnf_member_index,
ns_id=alarm.nsr_id,