Move 'launchpad' directory to 'RIFT_VAR_ROOT' from 'RIFT_ARTIFACTS'

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

diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
index 5f33024..3b28fba 100644 (file)
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
@@ -55,7 +55,7 @@ class RiftCMRPCHandler(object):
         self.job_manager = rift.mano.config_agent.ConfigAgentJobManager(dts, log, loop, nsm)
 
         self._rift_install_dir = os.environ['RIFT_INSTALL']
-        self._rift_artif_dir = os.environ['RIFT_ARTIFACTS']
+        self._rift_var_root_dir = os.environ['RIFT_VAR_ROOT']
 
     @property
     def reghs(self):
@@ -164,11 +164,11 @@ class RiftCMRPCHandler(object):
 
                 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
@@ -240,7 +240,7 @@ class RiftCMRPCHandler(object):
             # The script has full path, use as is
             script = rpc_ip.user_defined_script
         else:
-            script = os.path.join(self._rift_artif_dir, 'launchpad/packages/nsd',
+            script = os.path.join(self._rift_var_root_dir, 'launchpad/packages/nsd',
                                   agent_nsr.id, 'scripts',
                                   rpc_ip.user_defined_script)
             self._log.debug("CA-RPC: Checking for script in %s", script)