aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-tosca-parser/src
diff options
context:
space:
mode:
authorPavel Aharoni <pa0916@att.com>2017-05-08 13:19:36 +0300
committerPavel Aharoni <pa0916@att.com>2017-05-08 13:19:36 +0300
commit87511869a3e3ca3c147f072b49371874e1336d74 (patch)
tree262890ffebd7bd2f1b7e6d8b9722c749bcc76ca7 /sdc-tosca-parser/src
parentf09c2646860e66de2d91bccd61217ce22abfe75d (diff)
[SDC-16] JTosca support of input complex types
Change-Id: Id146b4da662c0aab5edcf637206e8d2c922c9b81 Signed-off-by: Pavel Aharoni <pa0916@att.com>
Diffstat (limited to 'sdc-tosca-parser/src')
-rw-r--r--sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java11
-rw-r--r--sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csarbin44991 -> 44976 bytes
2 files changed, 10 insertions, 1 deletions
diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
index 7c30616..8c748f6 100644
--- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
+++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
@@ -45,10 +45,19 @@ public class ToscaParserNodeTemplateTest extends BasicTest {
public void testNodeTemplateNestedProperty() throws SdcToscaParserException {
List<NodeTemplate> serviceVlList = ToscaParserTestSuite.fdntCsarHelper.getServiceVlList();
NodeTemplate nodeTemplate = serviceVlList.get(0);
- System.out.println("node template " + nodeTemplate.toString());
+ //System.out.println("node template " + nodeTemplate.toString());
assertEquals("24", ToscaParserTestSuite.fdntCsarHelper.getNodeTemplatePropertyLeafValue(nodeTemplate, "network_assignments#ipv4_subnet_default_assignment#cidr_mask"));
assertEquals("7a6520b-9982354-ee82992c-105720", ToscaParserTestSuite.fdntCsarHelper.getNodeTemplatePropertyLeafValue(nodeTemplate, "network_flows#vpn_binding"));
}
+
+ @Test
+ public void testNodeTemplateNestedPropertyFromInput() throws SdcToscaParserException {
+ List<NodeTemplate> serviceVfList = ToscaParserTestSuite.fdntCsarHelper.getServiceVfList();
+ NodeTemplate nodeTemplate = serviceVfList.get(0);
+ //System.out.println("node template " + nodeTemplate.toString());
+ assertEquals("true", ToscaParserTestSuite.fdntCsarHelper.getNodeTemplatePropertyLeafValue(nodeTemplate, "nf_naming#ecomp_generated_naming"));
+ assertEquals("FDNT_instance_VF_2", ToscaParserTestSuite.fdntCsarHelper.getNodeTemplatePropertyLeafValue(nodeTemplate, "nf_naming#naming_policy"));
+ }
@Test
public void testNodeTemplateNestedPropertyNotExists() throws SdcToscaParserException {
diff --git a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar b/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar
index 41ee2c7..a343e84 100644
--- a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar
+++ b/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar
Binary files differ