projects
/
osm
/
POL.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes discrepancies with IM related to monitoring params
[osm/POL.git]
/
osm_policy_module
/
core
/
agent.py
diff --git
a/osm_policy_module/core/agent.py
b/osm_policy_module/core/agent.py
index
1e81141
..
24f1004
100644
(file)
--- a/
osm_policy_module/core/agent.py
+++ b/
osm_policy_module/core/agent.py
@@
-223,10
+223,13
@@
class PolicyModuleAgent:
vnf_monitoring_param = next(
filter(
lambda param: param['id'] == scaling_criteria[
vnf_monitoring_param = next(
filter(
lambda param: param['id'] == scaling_criteria[
- 'vnf-monitoring-param-ref'],
+ 'vnf-monitoring-param-ref'
+ ],
vnf_monitoring_params)
)
vnf_monitoring_params)
)
- if not vdu_ref['vdu-id-ref'] == vnf_monitoring_param['vdu-ref']:
+ if vdu_ref['vdu-id-ref'] != vnf_monitoring_param['vdu-monitoring-param'][
+ 'vdu-ref'
+ ]:
continue
vdu = next(
filter(lambda vdu: vdu['id'] == vdu_ref['vdu-id-ref'], vnfd['vdu'])
continue
vdu = next(
filter(lambda vdu: vdu['id'] == vdu_ref['vdu-id-ref'], vnfd['vdu'])
@@
-235,11
+238,17
@@
class PolicyModuleAgent:
vdu_monitoring_param = next(
filter(
lambda param: param['id'] == vnf_monitoring_param[
vdu_monitoring_param = next(
filter(
lambda param: param['id'] == vnf_monitoring_param[
- 'vdu-monitoring-param-ref'],
+ 'vdu-monitoring-param'
+ ][
+ 'vdu-monitoring-param-ref'
+ ],
vdu_monitoring_params))
vdurs = list(
vdu_monitoring_params))
vdurs = list(
- filter(lambda vdur: vdur['vdu-id-ref'] == vnf_monitoring_param['vdu-ref'],
- vnfr['vdur']))
+ filter(lambda vdur: vdur['vdu-id-ref'] == vnf_monitoring_param[
+ 'vdu-monitoring-param'
+ ][
+ 'vdu-ref'
+ ], vnfr['vdur']))
for vdur in vdurs:
try:
(ScalingAlarm.select()
for vdur in vdurs:
try:
(ScalingAlarm.select()