Enhanced logic for multilevel list input reading from UUI

Logic modified to support VF and VFC/group level user input reading
from the list and automatically incrementing/maintaining index of
list for fetching data from User input and map to service inputs.

Change-Id: I9faa7e9a689324e80c1e5123e0d4c2ebedd1bf76
Issue-ID: SO-1393
Signed-off-by: sarada prasad sahoo <sarada.prasad.sahoo@huawei.com>

1 files changed, 110 insertions, 6 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilderTest.java
index c7c181744f..adfee796f2 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilderTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilderTest.java
@@ -19,19 +19,53 @@
  */
 package org.onap.so.bpmn.common.resource;
 
+import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.onap.so.BaseTest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.onap.so.bpmn.mock.FileUtil;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.ok;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static org.junit.Assert.assertEquals;
-
+import static org.junit.Assert.assertTrue;
 
 public class ResourceRequestBuilderTest extends BaseTest {
 
+    private Map<String, Object> userInputMap = null;
+
+    private String serviceInput = null;
+
+    @Before
+    public void initializeMockObjects() {
+
+        if (null == this.userInputMap) {
+            ObjectMapper mapper = new ObjectMapper();
+
+            try {
+                String serviceInputRequest = FileUtil.readResourceFile("__files/UUI-SO-REQ.json");
+                this.userInputMap = mapper.readValue(serviceInputRequest, new TypeReference<Map<String, Object>>() {});
+            } catch (Exception e) {
+                Assert.fail(e.getMessage());
+            }
+        }
+
+        if (null == this.serviceInput) {
+
+            try {
+                this.serviceInput = FileUtil.readResourceFile("__files/SERVICE-SO-REQ-INPUT.json");
+            } catch (Exception e) {
+                Assert.fail(e.getMessage());
+            }
+        }
+
+    }
+
     @Test
     public void getResourceInputTest() throws Exception {
 
@@ -102,7 +136,7 @@ public class ResourceRequestBuilderTest extends BaseTest {
         HashMap serviceInput = new HashMap();
         serviceInput.put("key", "value");
         Map<String, Object> stringObjectMap = ResourceRequestBuilder.buildResouceRequest(
-                "c3954379-4efe-431c-8258-f84905b158e5", "e776449e-2b10-45c5-9217-2775c88ca1a0", serviceInput);
+                "c3954379-4efe-431c-8258-f84905b158e5", "e776449e-2b10-45c5-9217-2775c88ca1a0", serviceInput, null);
         assertEquals(stringObjectMap.get("a"), "value");
     }
 
@@ -173,7 +207,7 @@ public class ResourceRequestBuilderTest extends BaseTest {
         HashMap serviceInput = new HashMap();
         serviceInput.put("key1", "value");
         Map<String, Object> stringObjectMap = ResourceRequestBuilder.buildResouceRequest(
-                "c3954379-4efe-431c-8258-f84905b158e5", "e776449e-2b10-45c5-9217-2775c88ca1a0", serviceInput);
+                "c3954379-4efe-431c-8258-f84905b158e5", "e776449e-2b10-45c5-9217-2775c88ca1a0", serviceInput, null);
         assertEquals(stringObjectMap.get("a"), "default_value");
     }
 
@@ -244,7 +278,7 @@ public class ResourceRequestBuilderTest extends BaseTest {
         HashMap serviceInput = new HashMap();
         serviceInput.put("key1", "value");
         Map<String, Object> stringObjectMap = ResourceRequestBuilder.buildResouceRequest(
-                "c3954379-4efe-431c-8258-f84905b158e5", "e776449e-2b10-45c5-9217-2775c88ca1a0", serviceInput);
+                "c3954379-4efe-431c-8258-f84905b158e5", "e776449e-2b10-45c5-9217-2775c88ca1a0", serviceInput, null);
         assertEquals(stringObjectMap.get("a"), "value");
     }
 
@@ -337,7 +371,7 @@ public class ResourceRequestBuilderTest extends BaseTest {
         HashMap serviceInput = new HashMap();
         serviceInput.put("key1", "value");
         Map<String, Object> stringObjectMap = ResourceRequestBuilder.buildResouceRequest(
-                "c3954379-4efe-431c-8258-f84905b158e5", "e776449e-2b10-45c5-9217-2775c88ca1a0", serviceInput);
+                "c3954379-4efe-431c-8258-f84905b158e5", "e776449e-2b10-45c5-9217-2775c88ca1a0", serviceInput, null);
         assertEquals(0, stringObjectMap.size());
     }
 
@@ -382,8 +416,78 @@ public class ResourceRequestBuilderTest extends BaseTest {
         HashMap serviceInput = new HashMap();
         serviceInput.put("key2", "value");
         Map<String, Object> stringObjectMap = ResourceRequestBuilder.buildResouceRequest(
-                "c3954379-4efe-431c-8258-f84905b158e5", "a00404d5-d7eb-4c46-b6b6-9cf2d087e545", serviceInput);
+                "c3954379-4efe-431c-8258-f84905b158e5", "a00404d5-d7eb-4c46-b6b6-9cf2d087e545", serviceInput, null);
         assertEquals(stringObjectMap.get("a"), "");
     }
 
+    @Test
+    public void getListResourceInputTest() throws Exception {
+
+
+
+        wireMockServer.stubFor(get(urlEqualTo(
+                "/ecomp/mso/catalog/v2/serviceResources?serviceModelUuid=c3954379-4efe-431c-8258-f84905b158e5"))
+                        .willReturn(ok(this.serviceInput)));
+
+        // when(UrnPropertiesReader.getVariable(anyString())).thenReturn("http://localhost:8080");
+
+        // VF level request
+        Map<String, Object> currentVFData = new HashMap<>();
+        Map<String, Object> stringObjectMap =
+                ResourceRequestBuilder.buildResouceRequest("c3954379-4efe-431c-8258-f84905b158e5",
+                        "a00404d5-d7eb-4c46-b6b6-9cf2d087e545", this.userInputMap, currentVFData);
+        assertEquals("b", stringObjectMap.get("a"));
+        assertEquals("hub_spoke", stringObjectMap.get("topology"));
+        assertEquals("defaultvpn", stringObjectMap.get("name"));
+        assertTrue(((String) stringObjectMap.get("sitelist")).contains("["));
+
+        // vfc level request
+        stringObjectMap = ResourceRequestBuilder.buildResouceRequest("c3954379-4efe-431c-8258-f84905b158e5",
+                "e776449e-2b10-45c5-9217-2775c88ca1a0", this.userInputMap, currentVFData);
+        assertEquals("", stringObjectMap.get("a"));
+        assertEquals("layer3-port", stringObjectMap.get("portswitch"));
+        assertEquals("192.168.10.1", stringObjectMap.get("ipAddress"));
+        assertEquals("vCPE", stringObjectMap.get("deviceName"));
+
+        // vfc level request
+        stringObjectMap = ResourceRequestBuilder.buildResouceRequest("c3954379-4efe-431c-8258-f84905b158e5",
+                "e776449e-2b10-45c5-9217-2775c88ca1a1", this.userInputMap, currentVFData);
+        assertEquals("", stringObjectMap.get("a"));
+        assertEquals("layer2-port", stringObjectMap.get("portswitch"));
+        assertEquals("192.168.11.1", stringObjectMap.get("ipAddress"));
+        assertEquals("CPE_Beijing", stringObjectMap.get("deviceName"));
+
+        // VF level request
+        stringObjectMap = ResourceRequestBuilder.buildResouceRequest("c3954379-4efe-431c-8258-f84905b158e5",
+                "e776449e-2b10-45c5-9217-2775c88ca1c1", this.userInputMap, currentVFData);
+        assertEquals("Huawei Private Cloud", stringObjectMap.get("address"));
+        assertEquals("dsvpn_hub1", stringObjectMap.get("role"));
+        assertTrue(((String) stringObjectMap.get("wanlist")).contains("["));
+        assertTrue(((String) stringObjectMap.get("devlist")).contains("["));
+
+        // VFC request
+        stringObjectMap = ResourceRequestBuilder.buildResouceRequest("c3954379-4efe-431c-8258-f84905b158e5",
+                "e776449e-2b10-45c5-9217-2775c88cb1a1", this.userInputMap, currentVFData);
+        assertEquals("Huawei Private Cloud", stringObjectMap.get("address"));
+        assertEquals("20000", stringObjectMap.get("postcode"));
+        assertEquals("single_gateway", stringObjectMap.get("type"));
+        assertEquals("vCPE", stringObjectMap.get("deviceName"));
+        assertEquals("20.20.20.1", stringObjectMap.get("systemip"));
+        assertEquals("default_ipv6", stringObjectMap.get("systemipv6"));
+
+
+        // VFC request again
+        /*
+         * stringObjectMap = ResourceRequestBuilder.buildResouceRequest( "c3954379-4efe-431c-8258-f84905b158e5",
+         * "e776449e-2b10-45c5-9217-2775c88cb1f1", this.userInputMap, currentVFData);
+         * assertEquals("Huawei Public Cloud", stringObjectMap.get("address")); assertEquals("20001",
+         * stringObjectMap.get("postcode")); assertEquals("multiple_gateway", stringObjectMap.get("type"));
+         * assertEquals("CPE_Beijing", stringObjectMap.get("deviceName")); assertEquals("20.20.20.2",
+         * stringObjectMap.get("systemip"));
+         */
+
+
+    }
+
+
 }