X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwcm%2Fplugins%2Frwconman%2Frift%2Ftasklets%2Frwconmantasklet%2Frwconman_config.py;h=c3ef3e751f4c051a9682a461a86122a6aba8d0a0;hb=f098a5e0a0c61a3baf0d6270e4da74440904c220;hp=7a24d7026afa4f1b93cc48bf72bdc525809b19dd;hpb=3f1ff0e426e6838e5b089805582dfd4a396e4b7e;p=osm%2FSO.git diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py index 7a24d702..c3ef3e75 100644 --- 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 = {} - 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) - v['vdur'].append(vdu_data) + v['vdur'] = vdu_data inp['vnfr'][vnfr['member_vnf_index_ref']] = v @@ -1360,11 +1360,13 @@ class XPaths(object): @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): - 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 '''