X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwcm%2Fplugins%2Frwconman%2Frift%2Ftasklets%2Frwconmantasklet%2FRiftCM_rpc.py;h=4a8dab8d824a6f4cf857e6bb5d161c789e46aff7;hb=d9b07ee6de209f55f151b6857d4f5c4909f36e95;hp=03756d87578ef6326bc27e136555df83aef176cd;hpb=1ada8dbd934164c007c5b81ea4273b4438350545;p=osm%2FSO.git

diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
index 03756d87..4a8dab8d 100644
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/RiftCM_rpc.py
@@ -146,7 +146,7 @@ class RiftCMRPCHandler(object):
 
             for vnfr_id in agent_nsr.vnfr_ids:
                 vnfr = agent_vnfrs[vnfr_id]
-                self._log.debug("CA_RPC: VNFR metadata: {}".format(vnfr))
+                self._log.debug("CA-RPC: VNFR metadata: {}".format(vnfr))
 
                 # index->vnfr ref
                 vnfr_index_map[vnfr.member_vnf_index] = vnfr_id
@@ -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
@@ -189,8 +189,12 @@ class RiftCMRPCHandler(object):
                     for primitive in vnfr.vnf_configuration['initial_config_primitive']:
                         if 'parameter' in primitive:
                             for parameter in primitive['parameter']:
-                               value = xlate(parameter['value'], vnfr.tags)
-                               param_data[parameter.name] = value
+                                try:
+                                    value = xlate(parameter['value'], vnfr.tags)
+                                    param_data[parameter['name']] = value
+                                except KeyError as e:
+                                    self._log.warn("Unable to parse the parameter{}:  {}".
+                                                   format(parameter))
 
                 initial_params[vnfr_id] = param_data
 
@@ -207,7 +211,7 @@ class RiftCMRPCHandler(object):
                     return config_plugin.agent_data
             return ret
 
-        unit_names, init_data, vnfr_index_map, vnf_data_map = get_meta(agent_nsr, agent_vnfrs)
+        unit_names, init_data, vnfr_index_map, vnfr_data_map = get_meta(agent_nsr, agent_vnfrs)
 
         # The data consists of 4 sections
         # 1. Account data
@@ -227,7 +231,7 @@ class RiftCMRPCHandler(object):
             tmp_file.write(yaml.dump(data, default_flow_style=True)
                     .encode("UTF-8"))
 
-        self._log.debug("CA_RPC: Creating a temp file {} with input data: {}".
+        self._log.debug("CA-RPC: Creating a temp file {} with input data: {}".
                         format(tmp_file.name, data))
 
         # Get the full path to the script
@@ -236,22 +240,20 @@ 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/libs', agent_nsr.id, 'scripts',
+            script = os.path.join(self._rift_artif_dir, 'launchpad/packages/nsd',
+                                  agent_nsr.id, 'scripts',
                                   rpc_ip.user_defined_script)
-            self.log.debug("CA_RPC: Checking for script in %s", script)
+            self._log.debug("CA-RPC: Checking for script in %s", script)
             if not os.path.exists(script):
                 script = os.path.join(self._rift_install_dir, 'usr/bin', rpc_ip.user_defined_script)
 
-        cmd = "{} {}".format(rpc_ip.user_defined_script, tmp_file.name)
-        self._log.debug("CA_RPC: Running the CMD: {}".format(cmd))
+        cmd = "{} {}".format(script, tmp_file.name)
+        self._log.debug("CA-RPC: Running the CMD: {}".format(cmd))
 
-        coro = asyncio.create_subprocess_shell(cmd, loop=self._loop,
-                                               stderr=asyncio.subprocess.PIPE)
-        process = yield from coro
-        err = yield from process.stderr.read()
-        task = self._loop.create_task(process.wait())
+        process = asyncio.create_subprocess_shell(cmd, loop=self._loop,
+                                                  stderr=asyncio.subprocess.PIPE)
 
-        return task, err
+        return process
 
     @asyncio.coroutine
     def register(self):
@@ -311,16 +313,12 @@ class RiftCMRPCHandler(object):
                 if nsd_cfg_prim_msg and nsd_cfg_prim_msg.has_field("user_defined_script"):
                     rpc_ip.user_defined_script = nsd_cfg_prim_msg.user_defined_script
 
-                    tasks = []
-                    task, err = yield from self._apply_ns_config(
+                    task = yield from self._apply_ns_config(
                         nsr,
                         vnfrs,
                         rpc_ip)
-                    tasks.append(task)
-                    if err:
-                        rpc_op.job_status_details = err.decode()
 
-                    self.job_manager.add_job(rpc_op, tasks)
+                    self.job_manager.add_job(rpc_op, [task])
                 else:
                     # Otherwise create VNF primitives.
                     for vnf in rpc_ip.vnf_list: