[SDC-40] complex inputs support

Change-Id: I29ac43c25f385c2b9e249111a48e76c2407ae69d
Signed-off-by: Pavel Aharoni <pa0916@att.com>

diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java b/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java
index ea5c2ef..75f904f 100644 (file)
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java
+++ b/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java
@@ -59,5 +59,19 @@ public class ToscaParserServiceInputTest extends SdcToscaParserBasicTest {
         Object serviceInputLeafValue = fdntCsarHelper.getServiceInputLeafValueOfDefault("service_naming#default");
         assertEquals("test service naming", serviceInputLeafValue);
     }
+    
+    @Test
+    public void testGetServiceComplexInputLeafValueOfDefault() {
+        String serviceInputLeafValue = fdntCsarHelperWithInputs.getServiceInputLeafValueOfDefault("complex_input#default#ipv4_subnet_default_assignment#cidr_mask");
+        assertEquals(serviceInputLeafValue, "24");
+    }
+    
+    @Test
+    public void testGetServiceDummyComplexInputLeafValueOfDefault() {
+        String serviceInputLeafValue = fdntCsarHelperWithInputs.getServiceInputLeafValueOfDefault("complex_input#default#ipv4_subnet_default_assignment#XXX");
+        assertNull(serviceInputLeafValue);
+    }
+    
+    
     //endregion
 }

diff --git a/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar b/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar
index 53aea49..995fd41 100644 (file)
Binary files a/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar and b/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar differ