Merge pull request #387 from tsoenen/v5.1

V5.1

Author: tsoenen

plugins/son-mano-service-lifecycle-management/son_mano_slm/slm.py

@@ -2015,22 +2015,27 @@ def vnfs_generic_envs(self, serv_id):
                             else:
                                 pass
 
-        # Add injected envs, if provided:
-        if self.services[serv_id]['params']:
-            g_envs.update(self.services[serv_id]['params'])
-
-        msg = ': Generic envs: ' + str(g_envs)
-        LOG.info("Service " + serv_id + msg)
-
         for vnf in vnfs:
             vnfd = vnf['vnfd']
             if 'cloudnative_deployment_units' in vnfd:
                 list_g_envs = []
                 for cdu in vnfd['cloudnative_deployment_units']:
+                    copy_g_envs = copy.copy(g_envs)
+                    try:
+                        copy_g_envs.update(cdu['parameters']['env'])
+                    except KeyError:
+                        pass 
+                    try:
+                        copy_g_envs.update(self.services[serv_id]['params'])
+                    except:
+                        pass 
                     list_g_envs.append({'cdu_id': cdu['id'],
-                                       'envs': g_envs})
+                                       'envs': copy_g_envs})
                 vnf['generic_envs'] = list_g_envs
 
+                msg = ': Generic envs per vnf: ' + str(list_g_envs)
+                LOG.info("Service " + serv_id + msg)
+
         return
 
     def vnfs_start(self, serv_id):