projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return DTS error instead of exception for failures
[osm/SO.git]
/
rwcm
/
plugins
/
rwconman
/
rift
/
tasklets
/
rwconmantasklet
/
rwconman_config.py
diff --git
a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
index
7a24d70
..
c3ef3e7
100644
(file)
--- a/
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
+++ b/
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
@@
-732,11
+732,11
@@
class ConfigManagerConfig(object):
vdu_data = []
for vdu in vnfr['vdur']:
d = {}
vdu_data = []
for vdu in vnfr['vdur']:
d = {}
- for k in ['name','management_ip', 'vm_management_ip', 'id']:
+ for k in ['name','management_ip', 'vm_management_ip', 'id'
, 'vdu_id_ref'
]:
if k in vdu:
d[k] = vdu[k]
vdu_data.append(d)
if k in vdu:
d[k] = vdu[k]
vdu_data.append(d)
- v['vdur']
.append(vdu_data)
+ v['vdur']
= vdu_data
inp['vnfr'][vnfr['member_vnf_index_ref']] = v
inp['vnfr'][vnfr['member_vnf_index_ref']] = v
@@
-1360,11
+1360,13
@@
class XPaths(object):
@staticmethod
def nsr_config(k=None):
@staticmethod
def nsr_config(k=None):
- return ("C,/nsr:ns-instance-config/nsr:nsr[nsr:id='{}']".format(k) if k is not None else "")
+ return ("C,/nsr:ns-instance-config/nsr:nsr" +
+ ("[nsr:id='{}']".format(k) if k is not None else ""))
@staticmethod
def vlr(k=None):
@staticmethod
def vlr(k=None):
- return ("D,/vlr:vlr-catalog/vlr:vlr[vlr:id='{}']".format(k) if k is not None else "")
+ return ("D,/vlr:vlr-catalog/vlr:vlr" +
+ ("[vlr:id='{}']".format(k) if k is not None else ""))
class ConfigManagerDTS(object):
''' This class either reads from DTS or publishes to DTS '''
class ConfigManagerDTS(object):
''' This class either reads from DTS or publishes to DTS '''