From d6f0e5ba491d94cf71486b86a14a17bb411a2a4b Mon Sep 17 00:00:00 2001 From: Ester Rotstein Date: Sun, 6 Aug 2017 10:04:42 +0300 Subject: [SDC-182] support nested properties with function Change-Id: I7c7dda4940010bd018880f76eb61eeb2de6d4fcc Signed-off-by: Ester Rotstein --- .../sdc/impl/SdcToscaParserBasicTest.java | 2 - .../sdc/impl/ToscaParserNodeTemplateTest.java | 52 ++++++++++++--------- .../csars/service-Ipassignservice-csar.csar | Bin 49975 -> 50084 bytes 3 files changed, 29 insertions(+), 25 deletions(-) (limited to 'src/test') diff --git a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java b/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java index 817ac92..28dd376 100644 --- a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java +++ b/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java @@ -24,7 +24,6 @@ public abstract class SdcToscaParserBasicTest { static ISdcCsarHelper rainyCsarHelperSingleVf; static ISdcCsarHelper rainyCsarHelperMultiVfs; static ISdcCsarHelper fdntCsarHelper; - static ISdcCsarHelper complexCps; static ISdcCsarHelper fdntCsarHelperWithInputs; static ISdcCsarHelper nfodCsarHlper; static ISdcCsarHelper ipAssignCsarHelper; @@ -38,7 +37,6 @@ public abstract class SdcToscaParserBasicTest { fdntCsarHelper = getCsarHelper("csars/service-sunny-flow.csar"); rainyCsarHelperMultiVfs = getCsarHelper("csars/service-ServiceFdnt-csar-rainy.csar"); rainyCsarHelperSingleVf = getCsarHelper("csars/service-ServiceFdnt-csar.csar"); - complexCps = getCsarHelper("csars/service-consolidated-props-csar.csar"); fdntCsarHelperWithInputs = getCsarHelper("csars/service-ServiceFdnt-with-get-input.csar"); nfodCsarHlper = getCsarHelper("csars/service-NfodService-csar.csar"); ipAssignCsarHelper = getCsarHelper("csars/service-Ipassignservice-csar.csar"); diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java b/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java index 4ab9af3..e31828c 100644 --- a/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java +++ b/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java @@ -66,6 +66,12 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest { assertEquals(null, fdntCsarHelperWithInputs.getNodeTemplatePropertyLeafValue(serviceVfList.get(1), "target_network_role")); } + @Test + public void testNodeTemplateNestedFunctionProperty() throws SdcToscaParserException { + List vfcs = ipAssignCsarHelper.getVfcListByVf("b5190df2-7880-4d6f-836f-56ab17e1b85b"); + assertEquals(null, ipAssignCsarHelper.getNodeTemplatePropertyLeafValue(vfcs.get(0), "port_pd01_port_ip_requirements#ip_count_required#count")); + } + @Test public void testNodeTemplateNestedProperty() throws SdcToscaParserException { List serviceVlList = fdntCsarHelper.getServiceVlList(); @@ -352,7 +358,7 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest { assertEquals("subnet_role_4", firstIpRequirements.get("subnet_role")); assertEquals(4, firstIpRequirements.get("ip_version")); assertEquals(true, ((Map) firstIpRequirements.get("ip_count_required")).get("is_required")); - assertEquals(4, ((Map) firstIpRequirements.get("ip_count_required")).get("count")); + assertEquals("get_input:node_count", ((Map) firstIpRequirements.get("ip_count_required")).get("count").toString()); assertEquals(false, ((Map)((Map)pd01.get("mac_requirements")).get("mac_count_required")).get("is_required")); assertEquals("test_subnetpoolid", pd01.get("subnetpoolid")); assertEquals("oam", pd01.get("network_role_tag")); @@ -363,7 +369,6 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest { assertTrue(isChecked); } - @Test public void testGetCpPropertiesFromVfcForNullVFC() { Map> cps = ipAssignCsarHelper.getCpPropertiesFromVfcAsObject(null); @@ -395,17 +400,18 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest { //region filterNodeTemplatePropertiesByValue @Test public void testFilterNodeTemplatePropertiesByContains() { - List vfcs = complexCps.getVfcListByVf("f999e2ca-72c0-42d3-9b11-13f2122fb8ef"); + List vfcs = ipAssignCsarHelper.getVfcListByVf("b5190df2-7880-4d6f-836f-56ab17e1b85b"); boolean isChecked = false; for (NodeTemplate vfc: vfcs) { - if(vfc.getName().equalsIgnoreCase("abstract_ddc")) + if(vfc.getName().equalsIgnoreCase("abstract_pd_server")) { isChecked = true; - Map filteredInputs = complexCps.filterNodeTemplatePropertiesByValue(vfc, FilterType.CONTAINS, "get_input"); + Map filteredInputs = ipAssignCsarHelper.filterNodeTemplatePropertiesByValue(vfc, FilterType.CONTAINS, "get_input"); - assertEquals(16, filteredInputs.size()); - assertEquals("get_input:vnf_id", filteredInputs.get("compute_ddc_metadata#vf_module_id#vnf_id")); - assertEquals("get_input:[ddc_int_imbl_v6_ips, 3]", filteredInputs.get("port_ddc_int_imbl__port_fixed_ips#ip_address")); + assertEquals(7, filteredInputs.size()); + assertEquals("get_input:availabilityzone_name", filteredInputs.get("compute_pd_server_availability_zone")); + assertEquals("get_input:[pd_server_names, 0]", filteredInputs.get("compute_pd_server_name")); + assertEquals("get_input:node_count", filteredInputs.get("port_pd01_port_ip_requirements#ip_count_required#count")); break; } @@ -416,25 +422,25 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest { @Test public void testFilterNodeTemplatePropertiesByDummyContains() { - List vfcs = complexCps.getVfcListByVf("f999e2ca-72c0-42d3-9b11-13f2122fb8ef"); - Map filteredInputs = complexCps.filterNodeTemplatePropertiesByValue(vfcs.get(0), FilterType.CONTAINS, "dummy"); + List vfcs = ipAssignCsarHelper.getVfcListByVf("b5190df2-7880-4d6f-836f-56ab17e1b85b"); + Map filteredInputs = ipAssignCsarHelper.filterNodeTemplatePropertiesByValue(vfcs.get(0), FilterType.CONTAINS, "dummy"); assertNotNull(filteredInputs); assertEquals(0, filteredInputs.size()); } @Test public void testFilterNodeTemplatePropertiesByEquals() { - List vfcs = complexCps.getVfcListByVf("f999e2ca-72c0-42d3-9b11-13f2122fb8ef"); + List vfcs = ipAssignCsarHelper.getVfcListByVf("b5190df2-7880-4d6f-836f-56ab17e1b85b"); boolean isChecked = false; for (NodeTemplate vfc: vfcs) { - if(vfc.getName().equalsIgnoreCase("abstract_ddc")) + if(vfc.getName().equalsIgnoreCase("abstract_pd_server")) { isChecked = true; - Map filteredInputs = complexCps.filterNodeTemplatePropertiesByValue(vfc, FilterType.EQUALS, "ddc"); + Map filteredInputs = ipAssignCsarHelper.filterNodeTemplatePropertiesByValue(vfc, FilterType.EQUALS, "oam"); assertEquals(2, filteredInputs.size()); - assertEquals("ddc", filteredInputs.get("vm_type_tag")); - assertEquals("ddc", filteredInputs.get("nfc_naming_code")); + assertEquals("oam", filteredInputs.get("port_pd02_port_network_role_tag")); + assertEquals("oam", filteredInputs.get("port_pd01_port_network_role_tag")); break; } @@ -444,31 +450,31 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest { @Test public void testFilterNodeTemplatePropertiesByDummyEquals() { - List vfcs = complexCps.getVfcListByVf("f999e2ca-72c0-42d3-9b11-13f2122fb8ef"); - Map filteredInputs = complexCps.filterNodeTemplatePropertiesByValue(vfcs.get(0), FilterType.EQUALS, "dummy"); + List vfcs = ipAssignCsarHelper.getVfcListByVf("b5190df2-7880-4d6f-836f-56ab17e1b85b"); + Map filteredInputs = ipAssignCsarHelper.filterNodeTemplatePropertiesByValue(vfcs.get(0), FilterType.EQUALS, "dummy"); assertNotNull(filteredInputs); assertEquals(0, filteredInputs.size()); } @Test public void testFilterNodeTemplatePropertiesByNullFilterType() { - List vfcs = complexCps.getVfcListByVf("f999e2ca-72c0-42d3-9b11-13f2122fb8ef"); - Map filteredInputs = complexCps.filterNodeTemplatePropertiesByValue(vfcs.get(11), null, "ddc"); + List vfcs = ipAssignCsarHelper.getVfcListByVf("b5190df2-7880-4d6f-836f-56ab17e1b85b"); + Map filteredInputs = ipAssignCsarHelper.filterNodeTemplatePropertiesByValue(vfcs.get(0), null, "ddc"); assertNotNull(filteredInputs); assertEquals(0, filteredInputs.size()); } @Test public void testFilterNodeTemplatePropertiesByNullPattern() { - List vfcs = complexCps.getVfcListByVf("f999e2ca-72c0-42d3-9b11-13f2122fb8ef"); - Map filteredInputs = complexCps.filterNodeTemplatePropertiesByValue(vfcs.get(11), FilterType.EQUALS, null); + List vfcs = ipAssignCsarHelper.getVfcListByVf("b5190df2-7880-4d6f-836f-56ab17e1b85b"); + Map filteredInputs = ipAssignCsarHelper.filterNodeTemplatePropertiesByValue(vfcs.get(0), FilterType.EQUALS, null); assertNotNull(filteredInputs); assertEquals(0, filteredInputs.size()); } @Test public void testFilterNodeTemplatePropertiesByNullVfc() { - Map filteredInputs = complexCps.filterNodeTemplatePropertiesByValue(null, FilterType.EQUALS, "ddc"); + Map filteredInputs = ipAssignCsarHelper.filterNodeTemplatePropertiesByValue(null, FilterType.EQUALS, "ddc"); assertNotNull(filteredInputs); assertEquals(0, filteredInputs.size()); } @@ -527,7 +533,7 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest { @Test public void testGetVnfConfigByNonFoundVNF() { - NodeTemplate vnfConfig = complexCps.getVnfConfig("f999e2ca-72c0-42d3-9b11-13f2122fb8ef"); + NodeTemplate vnfConfig = ipAssignCsarHelper.getVnfConfig("b5190df2-7880-4d6f-836f-56ab17e1b85b"); assertNull(vnfConfig); } diff --git a/src/test/resources/csars/service-Ipassignservice-csar.csar b/src/test/resources/csars/service-Ipassignservice-csar.csar index 0507457..abdcd3e 100644 Binary files a/src/test/resources/csars/service-Ipassignservice-csar.csar and b/src/test/resources/csars/service-Ipassignservice-csar.csar differ -- cgit 1.2.3-korg