projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed breakage in function proto-types due to scaling changes
[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
..
6dc3a25
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)