RIFT-16103 : Adding VDU Name field in YAML File.

[osm/SO.git] / rwcm / plugins / rwconman / rift / tasklets / rwconmantasklet / RiftCA.py

diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py
index 4a95a7d..267d6df 100644 (file)
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCA.py
@@ -52,6 +52,28 @@ class RiftCAConfigPlugin(riftcm_config_plugin.RiftCMConfigPluginBase):
     def agent_type(self):
         return self._type
 
+    @property
+    def agent_data(self):
+        return dict(
+            type=self.agent_type,
+            name=self.name,
+        )
+
+    def vnfr(self, vnfr_id):
+        try:
+            vnfr = self._rift_vnfs[vnfr_id].vnfr
+        except KeyError:
+            self._log.debug("RiftCA: Did not find VNFR %s in Rift plugin", vnfr_id)
+            return None
+
+        return vnfr
+
+    def get_service_name(self, vnfr_id):
+        vnfr = self.vnfr(vnfr_id)
+        if vnfr:
+            return vnfr['name']
+        return None
+
     @asyncio.coroutine
     def notify_create_vlr(self, agent_nsr, agent_vnfr, vld, vlr):
         """
@@ -175,11 +197,11 @@ class RiftCAConfigPlugin(riftcm_config_plugin.RiftCMConfigPluginBase):
                         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
@@ -213,7 +235,7 @@ class RiftCAConfigPlugin(riftcm_config_plugin.RiftCMConfigPluginBase):
         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)