Fix for when Customization already exists 81/78881/1
authorBenjamin, Max (mb388a) <mb388a@us.att.com>
Wed, 20 Feb 2019 21:50:13 +0000 (16:50 -0500)
committerBenjamin, Max (mb388a) <mb388a@us.att.com>
Wed, 20 Feb 2019 21:50:29 +0000 (16:50 -0500)
- When the Customization already exists associate the new
NetworkResource with it.

Change-Id: Ia4d89a04d020dd2f2ba4a2f2d330bda9bff6da14
Issue-ID: SO-1540
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
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);