Merge "Add existing vnf customization for service"

1 files changed, 15 insertions, 1 deletions

diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
index 50a555882d..aba70f33e3 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
@@ -984,7 +984,8 @@ public class ToscaResourceInstaller {
                 }
 
 
-                service.getVnfCustomizations().add(vnfResource);
+                // add this vnfResource with existing vnfResource for this service
+                addVnfCustomization(service, vnfResource);
             } else {
                 logger.debug("Notification VF ResourceCustomizationUUID: "
                         + vfNotificationResource.getResourceCustomizationUUID() + " doesn't match "
@@ -2440,6 +2441,19 @@ public class ToscaResourceInstaller {
         return inputName;
     }
 
+    // this method add provided vnfCustomization to service with
+    // existing customization available in db.
+    private void addVnfCustomization(Service service, VnfResourceCustomization vnfResourceCustomization) {
+        List<Service> services = serviceRepo.findByModelUUID(service.getModelUUID());
+        if (services.size() > 0) {
+            // service exist in db
+            Service existingService = services.get(0);
+            List<VnfResourceCustomization> vnfCustomizations = existingService.getVnfCustomizations();
+            vnfCustomizations.forEach(e -> service.getVnfCustomizations().add(e));
+        }
+        service.getVnfCustomizations().add(vnfResourceCustomization);
+    }
+
 
     protected static Timestamp getCurrentTimeStamp() {