From 1bd6e1e2f978abbab4b924288a72ff6b2657d1e4 Mon Sep 17 00:00:00 2001
From: kuldipr <kuldip.rai@amdocs.com>
Date: Tue, 16 Mar 2021 15:27:00 -0400
Subject: [PATCH] Fixed sdc-controller ingestion logic for cds values

sdc controller was not picking the cds values because
logic expected the values in the 'metadata' block however
the cds values exist in the 'input' block. Logic is modified
to look for values at the correct location.

Issue-ID: SO-3591
Signed-off-by: kuldipr <kuldip.rai@amdocs.com>
Change-Id: I59778fde00025e22446446df560b5f85bfda7469
Signed-off-by: kuldipr <kuldip.rai@amdocs.com>
---
 .../installer/heat/ToscaResourceInstaller.java     |  29 +++++++++++++++----
 .../installer/heat/ToscaResourceInstallerTest.java |  31 +++++++++++++++++++++
 .../resources/download/service-pnfservice.csar     | Bin 27525 -> 27126 bytes
 .../resources/download/service-vnfservice.csar     | Bin 27602 -> 27206 bytes
 4 files changed, 54 insertions(+), 6 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 da7aad4319..bc4434a70a 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
@@ -1471,13 +1471,30 @@ public class ToscaResourceInstaller {
                 generateNamingValue = "true".equalsIgnoreCase(generateNaming);
             }
             service.setOnapGeneratedNaming(generateNamingValue);
-            service.setBlueprintName(serviceMetadata.getValue(CDS_MODEL_NAME));
-            service.setBlueprintVersion(serviceMetadata.getValue(CDS_MODEL_VERSION));
-            service.setSkipPostInstConf(Boolean.valueOf(serviceMetadata.getValue(SKIP_POST_INST_CONF)));
-            service.setControllerActor(serviceMetadata.getValue(CONTROLLER_ACTOR));
-        }
-
 
+            List<Input> serviceInputs = toscaResourceStructure.getSdcCsarHelper().getServiceInputs();
+            logger.debug("serviceInputs: {} " + serviceInputs);
+            if (!serviceInputs.isEmpty()) {
+                serviceInputs.forEach(input -> {
+                    if (CDS_MODEL_NAME.equalsIgnoreCase(input.getName())) {
+                        String value = input.getDefault() != null ? input.getDefault().toString() : null;
+                        service.setBlueprintName(value);
+                    }
+                    if (CDS_MODEL_VERSION.equalsIgnoreCase(input.getName())) {
+                        String value = input.getDefault() != null ? input.getDefault().toString() : null;
+                        service.setBlueprintVersion(value);
+                    }
+                    if (CONTROLLER_ACTOR.equalsIgnoreCase(input.getName())) {
+                        String value = input.getDefault() != null ? input.getDefault().toString() : null;
+                        service.setControllerActor(value);
+                    }
+                    if (SKIP_POST_INST_CONF.equalsIgnoreCase(input.getName())) {
+                        String value = input.getDefault() != null ? input.getDefault().toString() : "false";
+                        service.setSkipPostInstConf(Boolean.valueOf(value));
+                    }
+                });
+            }
+        }
         toscaResourceStructure.setCatalogService(service);
         return service;
     }
diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java
index e4882119ab..bf327f5bb1 100644
--- a/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java
+++ b/asdc-controller/src/test/java/org/onap/so/asdc/installer/heat/ToscaResourceInstallerTest.java
@@ -36,6 +36,7 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -571,6 +572,36 @@ public class ToscaResourceInstallerTest extends BaseTest {
         doReturn(namingPolicy).when(metadata).getValue("namingPolicy");
         doReturn(ecompGeneratedNaming).when(metadata).getValue("ecompGeneratedNaming");
 
+        ISdcCsarHelper iSdcCsarHelper = mock(ISdcCsarHelper.class);
+        List<Input> serviceInputs = new ArrayList<Input>();
+
+        LinkedHashMap<String, Object> value = new LinkedHashMap<String, Object>();
+        value.put("controller_actor", "SO-REF-DATA");
+        value.put("type", "string");
+        Input input = new Input("controller_actor", value, null);
+        serviceInputs.add(0, input);
+
+        value = new LinkedHashMap<String, Object>();
+        value.put("cds_model_version", "v1.4.0");
+        value.put("type", "string");
+        input = new Input("cds_model_version", value, null);
+        serviceInputs.add(1, input);
+
+        value = new LinkedHashMap<String, Object>();
+        value.put("cds_model_name", "Blueprint140");
+        value.put("type", "string");
+        input = new Input("cds_model_name", value, null);
+        serviceInputs.add(2, input);
+
+        value = new LinkedHashMap<String, Object>();
+        value.put("skip_post_instantiation_configuration", "false");
+        value.put("type", "boolean");
+        input = new Input("skip_post_instantiation_configuration", value, null);
+        serviceInputs.add(3, input);
+
+        doReturn(iSdcCsarHelper).when(toscaResourceStructure).getSdcCsarHelper();
+        doReturn(serviceInputs).when(iSdcCsarHelper).getServiceInputs();
+
         Service service = toscaInstaller.createService(toscaResourceStructure, resourceStructure);
 
         assertNotNull(service);
diff --git a/asdc-controller/src/test/resources/download/service-pnfservice.csar b/asdc-controller/src/test/resources/download/service-pnfservice.csar
index 89d24a18ee075f284a2c7f8614261aed0e5b8aa6..a026c7aebe3b46cc8e339ad571045dd234675bc5 100644
GIT binary patch
delta 3325
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
C?*It^

delta 3688
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

diff --git a/asdc-controller/src/test/resources/download/service-vnfservice.csar b/asdc-controller/src/test/resources/download/service-vnfservice.csar
index 25d2ebd6c678abcac3ecdd55f10d181a877a980c..1dcfb594426c4d47f7dcdfd866a5849aebcd8a4e 100644
GIT binary patch
delta 3271
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

delta 3773
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

-- 
2.16.6