summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-02-22 15:14:20 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-22 15:14:20 +0000
commitd35a30a42edab60d8801bb3a2060548e2b9d1d35 (patch)
treef1ba7e45adc6b26dbd051683e5282e05cf4a8506
parent92060fb87e64a984fb13c5f9be1cee741ea58637 (diff)
parent15d5534416832bdad9afe3e7d1640f68d64bb9fe (diff)
Merge "Fix for when Customization already exists"
-rw-r--r--asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java12
1 files changed, 11 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 d13fff4801..10b8ba7c16 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
@@ -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);