Merge "Fix for when Customization already exists"
authorSteve Smokowski <ss835w@att.com>
Fri, 22 Feb 2019 15:14:20 +0000 (15:14 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 22 Feb 2019 15:14:20 +0000 (15:14 +0000)
asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java

index d13fff4..10b8ba7 100644 (file)
@@ -1060,7 +1060,17 @@ public class ToscaResourceInstaller {
                
                }
 
-               if(networkResourceCustomization==null || !networkUUIDsMatch){
+               if (networkResourceCustomization!=null && !networkUUIDsMatch){
+                       
+                       NetworkResource networkResource = createNetworkResource(networkNodeTemplate, toscaResourceStructure, heatTemplate,
+                                       aicMax, aicMin);
+                       
+                       networkResourceCustomization.setNetworkResource(networkResource);                       
+                                       
+                       networkCustomizationRepo.saveAndFlush(networkResourceCustomization);
+                       
+               }
+               else if(networkResourceCustomization==null){
                        networkResourceCustomization = createNetworkResourceCustomization(networkNodeTemplate,
                                        toscaResourceStructure);