From 87511869a3e3ca3c147f072b49371874e1336d74 Mon Sep 17 00:00:00 2001 From: Pavel Aharoni Date: Mon, 8 May 2017 13:19:36 +0300 Subject: [SDC-16] JTosca support of input complex types Change-Id: Id146b4da662c0aab5edcf637206e8d2c922c9b81 Signed-off-by: Pavel Aharoni --- .../sdc/impl/ToscaParserNodeTemplateTest.java | 11 ++++++++++- .../csars/service-ServiceFdnt-with-allotted.csar | Bin 44991 -> 44976 bytes 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'sdc-tosca-parser/src/test') 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 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 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 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar and b/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar differ -- cgit 1.2.3-korg