From b675cde3363762d1e716241e04733ca315fb63b4 Mon Sep 17 00:00:00 2001 From: "Manzon, Inna (im453s)" Date: Mon, 17 Sep 2018 17:58:16 +0300 Subject: Resolve get_input for list change Change-Id: I818bc10c27b543fd767cd47eca7b59ba07e27b09 Issue-ID: SDC-1769 Signed-off-by: Manzon, Inna (im453s) --- .../org/onap/sdc/impl/SdcToscaParserBasicTest.java | 2 ++ .../onap/sdc/impl/ToscaParserNodeTemplateTest.java | 22 +++++++++++++++++++++ .../service-NetworkCloudVnfServiceMock-csar.csar | Bin 0 -> 61275 bytes 3 files changed, 24 insertions(+) create mode 100644 src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar (limited to 'src/test') diff --git a/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java b/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java index edcf3ca..d1eed3e 100644 --- a/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java +++ b/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java @@ -45,6 +45,7 @@ public abstract class SdcToscaParserBasicTest { static ISdcCsarHelper csarHelperVfInterfaces; static ISdcCsarHelper csarHelperServiceAnnotations; static ISdcCsarHelper csarHelperServiceAdiodAnnotations; + static ISdcCsarHelper csarHelperServiceNetworkCloud; static Map>> fdntCsarHelper_Data; @@ -77,6 +78,7 @@ public abstract class SdcToscaParserBasicTest { csarHelperServiceAnnotations = getCsarHelper("csars/resource-Sirovinputannotation-csar.csar"); csarHelperVfInterfaces = getCsarHelper("csars/service-CxSvc-csar.csar"); csarHelperServiceAdiodAnnotations = getCsarHelper("csars/service-AdiodVmxVpeBvService-csar.csar"); + csarHelperServiceNetworkCloud = getCsarHelper("csars/service-NetworkCloudVnfServiceMock-csar.csar"); fdntCsarHelper_Data = new HashMap>>(){ { diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java index db7e5ae..7b268c6 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java +++ b/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java @@ -1,6 +1,7 @@ package org.onap.sdc.impl; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; @@ -784,6 +785,27 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest { assertEquals("subnet_role_6", ((Map) ((ArrayList) propertyAsObject).get(1)).get("subnet_role")); } + @Test + public void testResolveGetInputForListOnNetworkCloud() { + final String related_network_role = "related_network_role"; + List serviceVfList = csarHelperServiceNetworkCloud.getServiceVfList(); + assertNotNull(serviceVfList); + assertFalse(serviceVfList.isEmpty()); + List vfcListByVf = csarHelperServiceNetworkCloud.getVfcListByVf(csarHelperServiceNetworkCloud.getNodeTemplateCustomizationUuid(serviceVfList.get(0))); + assertNotNull(vfcListByVf); + assertFalse(vfcListByVf.isEmpty()); + List cpList = csarHelperServiceNetworkCloud.getNodeTemplateChildren(vfcListByVf.get(0)); + assertNotNull(cpList); + assertFalse(cpList.isEmpty()); + final Object propertyValue = cpList.get(0).getPropertyValue("related_networks"); + assertNotNull(propertyValue); + ArrayList> relatedNetworkList = (ArrayList)propertyValue; + assertEquals(3, relatedNetworkList.size()); + assertEquals("cor_direct_2", relatedNetworkList.get(0).get(related_network_role)); + assertEquals("sgi_direct_2", relatedNetworkList.get(1).get(related_network_role)); + assertEquals("int_imbl_2", relatedNetworkList.get(2).get(related_network_role)); + } + @Test public void testResolveGetInputForPrimitiveTypeString() { //This test covers "default" resolving of primitive - as Object diff --git a/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar b/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar new file mode 100644 index 0000000..84d90d8 Binary files /dev/null and b/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar differ -- cgit 1.2.3-korg