From 45cbac699c67de72160d6aa83c3979b675bc326c Mon Sep 17 00:00:00 2001 From: Pavel Aharoni Date: Thu, 29 Jun 2017 19:18:21 +0300 Subject: [SDC-42] retrieve all port props from VFC Change-Id: I6f7549d5a39b6b22cd0c9ce3bf402efa2c3372f0 Signed-off-by: Pavel Aharoni --- .../openecomp/sdc/impl/ToscaParserNodeTemplateTest.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java b/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java index 28058a5..a0808c5 100644 --- a/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java +++ b/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java @@ -343,22 +343,21 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest { assertEquals(3,cps.size()); - assertEquals(new Integer(1), cps.get("ddc_int_imbl__port").get("ip_requirements#ip_count_required#count")); - assertEquals(new Boolean(true), cps.get("ddc_int_imbl__port").get("ip_requirements#dhcp_enabled")); - assertEquals(new Integer(6), cps.get("ddc_int_imbl__port").get("ip_requirements#ip_version")); - assertEquals(null, cps.get("ddc_int_imbl__port").get("subnetpoolid")); - - //assertEquals("\"int_imsp\"", cps.get("mon_ist_imsp__port").get("network_role_tag")); + assertEquals(new Integer(1), cps.get("port_ddc_int_imbl__port").get("ip_requirements#ip_count_required#count")); + assertEquals(new Boolean(true), cps.get("port_ddc_int_imbl__port").get("ip_requirements#dhcp_enabled")); + assertEquals(new Integer(6), cps.get("port_ddc_int_imbl__port").get("ip_requirements#ip_version")); + assertEquals("subnetpoolid_test", cps.get("port_ddc_int_imbl__port").get("subnetpoolid")); + assertEquals("int_imbl", cps.get("port_ddc_int_imbl__port").get("network_role_tag")); } if(vfcs.get(i).getName().equalsIgnoreCase("abstract_mda")) { isChecked1 = true; - Map> cps1 = complexCps.getCpPropertiesFromVfc(vfcs.get(i)); + Map> cps1 = complexCps.getCpPropertiesFromVfc(vfcs.get(i)); - assertEquals(new Integer(4), cps1.get("mda_int_imsp__port").get("ip_requirements#ip_version")); - assertEquals(null, cps1.get("mda_int_imsp__port").get("ip_requirements#ip_count_required#count")); + assertEquals(new Integer(4), cps1.get("port_mda_int_imsp__port").get("ip_requirements#ip_version")); + assertEquals(null, cps1.get("port_mda_int_imsp__port").get("ip_requirements#ip_count_required#count")); } -- cgit 1.2.3-korg