From 814961c44cbd8123f92860f1b2095b2c3dcaf181 Mon Sep 17 00:00:00 2001
From: ojasdubey <ojas.dubey@amdocs.com>
Date: Tue, 24 Apr 2018 16:51:01 +0530
Subject: Fixed create VF for vOTA and vmstore heats

Updated code for handling identical value
property 'ip_requirements' from list of list
to list of identical value

Change-Id: I1c3571f218fcc18ecfb22dd62112e1496109e3fa
Issue-ID: SDC-1255
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
---
 .../heattotosca/UnifiedCompositionService.java     | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp')

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
index c4aea2b6a4..57f3d7351b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
@@ -2819,19 +2819,17 @@ public class UnifiedCompositionService {
       UnifiedCompositionEntity inputUnifiedCompositionEntity =
               getInputCompositionEntity(substitutionTemplateInputName);
 
-      if (!inputType.equalsIgnoreCase(PropertyType.LIST.getDisplayName())) {
-        if (isIdenticalValueProperty(
-                substitutionTemplateInputName, inputUnifiedCompositionEntity)) {
-          //Handle identical value properties
-          Optional<String> identicalValuePropertyName =
-                  getIdenticalValuePropertyName(substitutionTemplateInputName,
-                          inputUnifiedCompositionEntity);
-
-          identicalValuePropertyName.ifPresent(propertyName -> updateIdenticalPropertyValue(propertyName,
-                  substitutionTemplateInputName, inputUnifiedCompositionEntity,
-                  unifiedCompositionDataList.get(0), serviceTemplate, abstractSubstituteProperties,
-                  context));
-        }
+      if (isIdenticalValueProperty(substitutionTemplateInputName, inputUnifiedCompositionEntity)
+          || !inputType.equalsIgnoreCase(PropertyType.LIST.getDisplayName())) {
+        //Handle identical value properties
+        Optional<String> identicalValuePropertyName =
+            getIdenticalValuePropertyName(substitutionTemplateInputName,
+                inputUnifiedCompositionEntity);
+
+        identicalValuePropertyName.ifPresent(propertyName -> updateIdenticalPropertyValue(propertyName,
+            substitutionTemplateInputName, inputUnifiedCompositionEntity,
+            unifiedCompositionDataList.get(0), serviceTemplate, abstractSubstituteProperties,
+            context));
         continue;
       }
 
@@ -3663,7 +3661,7 @@ public class UnifiedCompositionService {
   private Optional<String> getPortPropertyNameFromInput(String inputName,
                                                         List<String> identicalValuePropertyList) {
     for (String identicalProperty : identicalValuePropertyList) {
-      if (inputName.contains(identicalProperty)) {
+      if (inputName.endsWith(identicalProperty)) {
         return Optional.of(identicalProperty);
       }
     }
-- 
cgit 1.2.3-korg