projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New feature: Code changes for project support
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwmonparam
/
rift
/
tasklets
/
rwmonparam
/
vnfr_core.py
diff --git
a/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/vnfr_core.py
b/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/vnfr_core.py
index
e798376
..
335e957
100644
(file)
--- a/
rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/vnfr_core.py
+++ b/
rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/vnfr_core.py
@@
-36,7
+36,7
@@
from gi.repository import (
)
import rift.mano.dts as mano_dts
import rwlogger
)
import rift.mano.dts as mano_dts
import rwlogger
-
+import xmltodict, json
class MonitoringParamError(Exception):
"""Monitoring Parameter error"""
class MonitoringParamError(Exception):
"""Monitoring Parameter error"""
@@
-436,6
+436,13
@@
class MonitoringParam(object):
self._log.warning("json querier is not created. Cannot extract value form response.")
return
self._log.warning("json querier is not created. Cannot extract value form response.")
return
+ try:
+ xml_data = xmltodict.parse(response_msg)
+ json_msg=json.dumps(xml_data)
+ response_msg = json_msg
+ except Exception as e:
+ pass
+
try:
value = self._json_querier.query(response_msg)
converted_value = self._value_converter.convert(value)
try:
value = self._json_querier.query(response_msg)
converted_value = self._value_converter.convert(value)
@@
-609,29
+616,29
@@
class VnfMonitorDtsHandler(mano_dts.DtsHandler):
XPATH = "D,/vnfr:vnfr-catalog/vnfr:vnfr/vnfr:monitoring-param"
@classmethod
XPATH = "D,/vnfr:vnfr-catalog/vnfr:vnfr/vnfr:monitoring-param"
@classmethod
- def from_vnf_data(cls,
taskle
t, vnfr_msg, vnfd_msg):
- handler = cls(
tasklet.log, tasklet.dts, tasklet.loop
,
+ def from_vnf_data(cls,
projec
t, vnfr_msg, vnfd_msg):
+ handler = cls(
project.log, project.dts, project.loop, project
,
vnfr_msg.id, vnfr_msg.mgmt_interface.ip_address,
vnfd_msg.monitoring_param, vnfd_msg.http_endpoint)
return handler
vnfr_msg.id, vnfr_msg.mgmt_interface.ip_address,
vnfd_msg.monitoring_param, vnfd_msg.http_endpoint)
return handler
- def __init__(self, log, dts, loop, vnfr_id, mgmt_ip, params, endpoints):
- super().__init__(log, dts, loop)
+ def __init__(self, log, dts, loop,
project,
vnfr_id, mgmt_ip, params, endpoints):
+ super().__init__(log, dts, loop
, project
)
self._mgmt_ip = mgmt_ip
self._vnfr_id = vnfr_id
mon_params = []
for mon_param in params:
self._mgmt_ip = mgmt_ip
self._vnfr_id = vnfr_id
mon_params = []
for mon_param in params:
- param = VnfrYang.YangData_
Vnfr
_VnfrCatalog_Vnfr_MonitoringParam.from_dict(
+ param = VnfrYang.YangData_
RwProject_Project
_VnfrCatalog_Vnfr_MonitoringParam.from_dict(
mon_param.as_dict()
)
mon_params.append(param)
http_endpoints = []
for endpoint in endpoints:
mon_param.as_dict()
)
mon_params.append(param)
http_endpoints = []
for endpoint in endpoints:
- endpoint = VnfrYang.YangData_
Vnfr
_VnfrCatalog_Vnfr_HttpEndpoint.from_dict(
+ endpoint = VnfrYang.YangData_
RwProject_Project
_VnfrCatalog_Vnfr_HttpEndpoint.from_dict(
endpoint.as_dict()
)
http_endpoints.append(endpoint)
endpoint.as_dict()
)
http_endpoints.append(endpoint)
@@
-667,10
+674,10
@@
class VnfMonitorDtsHandler(mano_dts.DtsHandler):
def xpath(self, param_id=None):
""" Monitoring params xpath """
def xpath(self, param_id=None):
""" Monitoring params xpath """
- 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(param_id) if param_id else ""))
+ ("[vnfr:id='{}']".format(param_id) if param_id else ""))
)
@property
def msg(self):
@property
def msg(self):