From: Benjamin, Max (mb388a) <mb388a@us.att.com>
Date: Mon, 11 Feb 2019 20:06:33 +0000 (-0500)
Subject: Fix for asdc service.
X-Git-Tag: 1.4.1~307^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F50%2F78250%2F1;p=so.git

Fix for asdc service.

Removed exception statements and added assert statements
Updated to make sure duplicate config resources aren't getting added
to the service.

Change-Id: Ic05421711622492e09bc83d8cc126300362ea119
Issue-ID: SO-1496
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---

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 2f4d5ea6a1..90b705c019 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
@@ -554,8 +554,14 @@ public class ToscaResourceInstaller {
 						for (RequirementAssignment requirement :  requirementsList) {
 							if (requirement.getNodeTemplateName().equals(spNode.getName())) {
 								ConfigurationResourceCustomization configurationResource = createConfiguration(configNode, toscaResourceStruct, serviceProxy);
-																
-								configurationResourceList.add(configurationResource);
+								
+								Optional<ConfigurationResourceCustomization> matchingObject = configurationResourceList.stream()
+									    .filter(configurationResourceCustomization -> configNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID).equals(configurationResource.getModelCustomizationUUID()))
+									    .findFirst();
+								if(!matchingObject.isPresent()){																	
+									configurationResourceList.add(configurationResource);
+								}
+								
 								break;
 							}
 						}