From 16b52f965b23d05cd2b57c5c29d1330e8d04a5f1 Mon Sep 17 00:00:00 2001 From: Pavel Aharoni Date: Thu, 29 Jun 2017 19:24:06 +0300 Subject: [SDC-43] NFOD getVnfConfig support Change-Id: I067a30e1c62228b52403807f9572d35f93cd0cfa Signed-off-by: Pavel Aharoni --- .../sdc/impl/SdcToscaParserBasicTest.java | 3 +- .../sdc/impl/ToscaParserNodeTemplateTest.java | 33 +++++++++++++++++++++ .../resources/csars/service-NfodService-csar.csar | Bin 0 -> 39906 bytes 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/csars/service-NfodService-csar.csar (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 2039645..3af654e 100644 --- a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java +++ b/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java @@ -26,6 +26,7 @@ public abstract class SdcToscaParserBasicTest { static ISdcCsarHelper fdntCsarHelper; static ISdcCsarHelper complexCps; static ISdcCsarHelper fdntCsarHelperWithInputs; + static ISdcCsarHelper nfodCsarHlper; static Map>> fdntCsarHelper_Data; @BeforeClass @@ -37,7 +38,7 @@ public abstract class SdcToscaParserBasicTest { 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"); fdntCsarHelper_Data = new HashMap>>(){ { HashMap> FDNT ; diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java b/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java index 28058a5..bc506b1 100644 --- a/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java +++ b/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java @@ -523,4 +523,37 @@ public class ToscaParserNodeTemplateTest extends SdcToscaParserBasicTest { + + @Test + public void testGetVnfConfig() { + NodeTemplate vnfConfig = nfodCsarHlper.getVnfConfig("9bb2ef82-f8f6-4391-bc71-db063f15bf57"); + assertNotNull(vnfConfig); + assertEquals("vnfConfiguration", vnfConfig.getMetaData().getValue("name")); + } + + @Test + public void testGetVnfConfigByNonFoundVNF() { + NodeTemplate vnfConfig = complexCps.getVnfConfig("f999e2ca-72c0-42d3-9b11-13f2122fb8ef"); + assertNull(vnfConfig); + } + + @Test + public void testGetVnfConfigByDummyUUID() { + NodeTemplate vnfConfig = nfodCsarHlper.getVnfConfig("XXX"); + assertNull(vnfConfig); + } + + @Test + public void testGetVnfConfigByNullUUID() { + NodeTemplate vnfConfig = nfodCsarHlper.getVnfConfig(null); + assertNull(vnfConfig); + } + + @Test + public void testGetVfcTypWithoutVnf() { + List vfcList = nfodCsarHlper.getVfcListByVf("9bb2ef82-f8f6-4391-bc71-db063f15bf57"); + assertNotNull(vfcList); + assertEquals(2, vfcList.size()); + } + } diff --git a/src/test/resources/csars/service-NfodService-csar.csar b/src/test/resources/csars/service-NfodService-csar.csar new file mode 100644 index 0000000..679c80b Binary files /dev/null and b/src/test/resources/csars/service-NfodService-csar.csar differ -- cgit 1.2.3-korg