summaryrefslogtreecommitdiffstats
path: root/asdc-controller/src/main/java/org
diff options
context:
space:
mode:
authorBenjamin, Max (mb388a) <mb388a@us.att.com>2019-02-01 18:01:32 -0500
committerBenjamin, Max (mb388a) <mb388a@us.att.com>2019-02-01 18:01:54 -0500
commit0d15f2695791b59637101db3c6e64b2aa847016e (patch)
treead209881f4370fd9364a0ffdd0bf7ad9d84f6f4e /asdc-controller/src/main/java/org
parentcd0963d829a73dc22b345be12379a2f8dd3a83e8 (diff)
make sure the NetworkResourceUUID are correct.
- Added test asserts to show that the NetworkResourceUUID was updated correctly. - Added a NetworkResourceCustomization Audit to make sure the NetworkResourceUUID are correct. Change-Id: Id4fbf224aa00d6bd34481bab6a907af12fba56dd Issue-ID: SO-1455 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'asdc-controller/src/main/java/org')
-rw-r--r--asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java19
1 files changed, 17 insertions, 2 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 7951e9be76..6c92224909 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
@@ -1055,7 +1055,21 @@ public class ToscaResourceInstaller {
ToscaResourceStructure toscaResourceStructure, HeatTemplate heatTemplate, String aicMax, String aicMin,Service service) {
NetworkResourceCustomization networkResourceCustomization=networkCustomizationRepo.findOneByModelCustomizationUUID(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
- if(networkResourceCustomization==null){
+
+ boolean networkUUIDsMatch = true;
+ // Check to make sure the NetworkResourceUUID on the Customization record matches the NetworkResourceUUID from the distribution.
+ // If not we'll update the Customization record with latest from the distribution
+ if(networkResourceCustomization != null){
+ String existingNetworkModelUUID = networkResourceCustomization.getNetworkResource().getModelUUID();
+ String latestNetworkModelUUID = networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID);
+
+ if(!existingNetworkModelUUID.equals(latestNetworkModelUUID)){
+ networkUUIDsMatch = false;
+ }
+
+ }
+
+ if(networkResourceCustomization==null || !networkUUIDsMatch){
networkResourceCustomization = createNetworkResourceCustomization(networkNodeTemplate,
toscaResourceStructure);
@@ -1067,7 +1081,8 @@ public class ToscaResourceInstaller {
networkResource.addNetworkResourceCustomization(networkResourceCustomization);
networkResourceCustomization.setNetworkResource(networkResource);
- }
+ }
+
return networkResourceCustomization;
}