projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from OSM SO master
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwmonparam
/
rift
/
tasklets
/
rwmonparam
/
nsr_core.py
diff --git
a/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/nsr_core.py
b/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/nsr_core.py
index
31b7647
..
ce19580
100644
(file)
--- a/
rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/nsr_core.py
+++ b/
rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/nsr_core.py
@@
-42,22
+42,22
@@
class VnfrMonitoringParamSubscriber(mano_dts.AbstractOpdataSubscriber):
monp_id (str): Monitoring Param ID
vnfr_id (str): VNFR ID
"""
monp_id (str): Monitoring Param ID
vnfr_id (str): VNFR ID
"""
- def __init__(self, log, dts, loop, vnfr_id, monp_id, callback=None):
- super().__init__(log, dts, loop, callback)
+ def __init__(self, log, dts, loop,
project,
vnfr_id, monp_id, callback=None):
+ super().__init__(log, dts, loop,
project,
callback)
self.vnfr_id = vnfr_id
self.monp_id = monp_id
def get_xpath(self):
self.vnfr_id = vnfr_id
self.monp_id = monp_id
def get_xpath(self):
- return("D,/vnfr:vnfr-catalog" +
+ return
self.project.add_project(
("D,/vnfr:vnfr-catalog" +
"/vnfr:vnfr[vnfr:id='{}']".format(self.vnfr_id) +
"/vnfr:monitoring-param" +
"/vnfr:vnfr[vnfr:id='{}']".format(self.vnfr_id) +
"/vnfr:monitoring-param" +
- "[vnfr:id='{}']".format(self.monp_id))
+ "[vnfr:id='{}']".format(self.monp_id))
)
class NsrMonitoringParam():
"""Class that handles NS Mon-param data.
"""
class NsrMonitoringParam():
"""Class that handles NS Mon-param data.
"""
- MonParamMsg = NsrYang.YangData_
Nsr
_NsInstanceOpdata_Nsr_MonitoringParam
+ MonParamMsg = NsrYang.YangData_
RwProject_Project
_NsInstanceOpdata_Nsr_MonitoringParam
MISSING = None
DEFAULT_AGGREGATION_TYPE = "AVERAGE"
MISSING = None
DEFAULT_AGGREGATION_TYPE = "AVERAGE"
@@
-66,7
+66,7
@@
class NsrMonitoringParam():
"""Convenience class that constructs NSMonitoringParam objects
Args:
"""Convenience class that constructs NSMonitoringParam objects
Args:
- nsd (RwNsdYang.YangData_
Nsd
_NsdCatalog_Nsd): Nsd object
+ nsd (RwNsdYang.YangData_
RwProject_Project
_NsdCatalog_Nsd): Nsd object
constituent_vnfrs (list): List of constituent vnfr objects of NSR
store (SubscriberStore): Store object instance
constituent_vnfrs (list): List of constituent vnfr objects of NSR
store (SubscriberStore): Store object instance
@@
-76,8
+76,6
@@
class NsrMonitoringParam():
Also handles legacy NSD descriptor which has no mon-param defines. In
such cases the mon-params are created from VNFD's mon-param config.
"""
Also handles legacy NSD descriptor which has no mon-param defines. In
such cases the mon-params are created from VNFD's mon-param config.
"""
- MonParamMsg = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_MonitoringParam
-
mon_params = []
for mon_param_msg in nsd.monitoring_param:
mon_params.append(NsrMonitoringParam(
mon_params = []
for mon_param_msg in nsd.monitoring_param:
mon_params.append(NsrMonitoringParam(
@@
-89,7
+87,7
@@
class NsrMonitoringParam():
# This indicates that the NSD had no mon-param config.
if not nsd.monitoring_param:
for vnfr in constituent_vnfrs:
# This indicates that the NSD had no mon-param config.
if not nsd.monitoring_param:
for vnfr in constituent_vnfrs:
- vnfd = store.get_vnfd(vnfr.vnfd
_ref
)
+ vnfd = store.get_vnfd(vnfr.vnfd
.id
)
for monp in vnfd.monitoring_param:
mon_params.append(NsrMonitoringParam(
monp,
for monp in vnfd.monitoring_param:
mon_params.append(NsrMonitoringParam(
monp,
@@
-193,7
+191,7
@@
class NsrMonitoringParam():
def _convert_nsd_msg(self, nsd_monp):
"""Create initial msg without values"""
def _convert_nsd_msg(self, nsd_monp):
"""Create initial msg without values"""
- vnfd_to_vnfr = {vnfr.vnfd
_ref
: vnfr_id
+ vnfd_to_vnfr = {vnfr.vnfd
.id
: vnfr_id
for vnfr_id, vnfr in self._constituent_vnfr_map.items()}
# First, convert the monp param ref from vnfd to vnfr terms.
for vnfr_id, vnfr in self._constituent_vnfr_map.items()}
# First, convert the monp param ref from vnfd to vnfr terms.
@@
-278,16
+276,17
@@
class NsrMonitoringParamPoller(mano_dts.DtsHandler):
def from_handler(cls, handler, monp, callback):
"""Convenience class to build NsrMonitoringParamPoller object.
"""
def from_handler(cls, handler, monp, callback):
"""Convenience class to build NsrMonitoringParamPoller object.
"""
- return cls(handler.log, handler.dts, handler.loop, monp, callback)
+ return cls(handler.log, handler.dts, handler.loop, handler.project,
+ monp, callback)
- def __init__(self, log, dts, loop, monp, callback=None):
+ def __init__(self, log, dts, loop,
project,
monp, callback=None):
"""
Args:
monp (NsrMonitoringParam): Param object
callback (None, optional): Callback to be triggered after value has
been aggregated.
"""
"""
Args:
monp (NsrMonitoringParam): Param object
callback (None, optional): Callback to be triggered after value has
been aggregated.
"""
- super().__init__(log, dts, loop)
+ super().__init__(log, dts, loop
, project
)
self.monp = monp
self.subscribers = []
self.monp = monp
self.subscribers = []
@@
-341,7
+340,8
@@
class NsrMonitoringParamPoller(mano_dts.DtsHandler):
for vnfr_id, monp_id in self.monp.vnfr_ids:
callback = functools.partial(self.update_value, vnfr_id=vnfr_id)
self.subscribers.append(VnfrMonitoringParamSubscriber(
for vnfr_id, monp_id in self.monp.vnfr_ids:
callback = functools.partial(self.update_value, vnfr_id=vnfr_id)
self.subscribers.append(VnfrMonitoringParamSubscriber(
- self.loop, self.dts, self.loop, vnfr_id, monp_id, callback=callback))
+ self.loop, self.dts, self.loop, self.project,
+ vnfr_id, monp_id, callback=callback))
@asyncio.coroutine
def start(self):
@asyncio.coroutine
def start(self):
@@
-356,14
+356,14
@@
class NsrMonitoringParamPoller(mano_dts.DtsHandler):
class NsrMonitorDtsHandler(mano_dts.DtsHandler):
""" NSR monitoring class """
class NsrMonitorDtsHandler(mano_dts.DtsHandler):
""" NSR monitoring class """
- def __init__(self, log, dts, loop, nsr, constituent_vnfrs, store):
+ def __init__(self, log, dts, loop,
project,
nsr, constituent_vnfrs, store):
"""
Args:
"""
Args:
- nsr (RwNsrYang.YangData_
Nsr
_NsInstanceOpdata_Nsr): NSR object
+ nsr (RwNsrYang.YangData_
RwProject_Project
_NsInstanceOpdata_Nsr): NSR object
constituent_vnfrs (list): list of VNFRs in NSR
store (SubscriberStore): Store instance
"""
constituent_vnfrs (list): list of VNFRs in NSR
store (SubscriberStore): Store instance
"""
- super().__init__(log, dts, loop)
+ super().__init__(log, dts, loop
, project
)
self.nsr = nsr
self.store = store
self.nsr = nsr
self.store = store
@@
-371,7
+371,7
@@
class NsrMonitorDtsHandler(mano_dts.DtsHandler):
self.mon_params_pollers = []
def xpath(self, param_id=None):
self.mon_params_pollers = []
def xpath(self, param_id=None):
- return ("D,/nsr:ns-instance-opdata/nsr:nsr" +
+ return
self.project.add_project
("D,/nsr:ns-instance-opdata/nsr:nsr" +
"[nsr:ns-instance-config-ref='{}']".format(self.nsr.ns_instance_config_ref) +
"/nsr:monitoring-param" +
("[nsr:id='{}']".format(param_id) if param_id else ""))
"[nsr:ns-instance-config-ref='{}']".format(self.nsr.ns_instance_config_ref) +
"/nsr:monitoring-param" +
("[nsr:id='{}']".format(param_id) if param_id else ""))