RIFT-16103 : Adding VDU Name field in YAML File.
YAML File generated has vdu name information for manually triggered eventsi
Signed-off-by: Anurag Dwivedi <anurag.dwivedi@riftio.com>
diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py
index 0400a54..267d6df 100644
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py
@@ -197,11 +197,11 @@
vnfr_data_dict['connection_point'].append(cp_dict)
vnfr_data_dict['vdur'] = []
- vdu_data = [(vdu['name'], vdu['management_ip'], vdu['vm_management_ip'], vdu['id'])
+ vdu_data = [(vdu['name'], vdu['management_ip'], vdu['vm_management_ip'], vdu['id'], vdu['vdu_id_ref'])
for vdu in vnfr.vnfr['vdur']]
for data in vdu_data:
- data = dict(zip(['name', 'management_ip', 'vm_management_ip', 'id'] , data))
+ data = dict(zip(['name', 'management_ip', 'vm_management_ip', 'id', 'vdu_id_ref'] , data))
vnfr_data_dict['vdur'].append(data)
vnfr_data_map[vnfr.member_vnf_index] = vnfr_data_dict
@@ -235,7 +235,7 @@
data["init_config"] = init_data
data["vnfr_index_map"] = vnfr_index_map
data["vnfr_data_map"] = vnfr_data_map
-
+
tmp_file = None
with tempfile.NamedTemporaryFile(delete=False) as tmp_file:
tmp_file.write(yaml.dump(data, default_flow_style=True)
diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
index 5f33024..4a8dab8 100644
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
@@ -164,11 +164,11 @@
try:
vnfr_data_dict['vdur'] = []
- vdu_data = [(vdu['name'], vdu['management_ip'], vdu['vm_management_ip'], vdu['id'])
+ vdu_data = [(vdu['name'], vdu['management_ip'], vdu['vm_management_ip'], vdu['id'], vdu['vdu_id_ref'])
for vdu in vnfr.vnfr['vdur']]
for data in vdu_data:
- data = dict(zip(['name', 'management_ip', 'vm_management_ip', 'id'] , data))
+ data = dict(zip(['name', 'management_ip', 'vm_management_ip', 'id', 'vdu_id_ref'] , data))
vnfr_data_dict['vdur'].append(data)
vnfr_data_map[vnfr.member_vnf_index] = vnfr_data_dict