2 files changed, 35 insertions, 1 deletions

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<String, HashMap<String, List<String>>> 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<String, HashMap<String, List<String>>>(){
     		{
     			HashMap<String, List<String>> 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<NodeTemplate> vfcList = nfodCsarHlper.getVfcListByVf("9bb2ef82-f8f6-4391-bc71-db063f15bf57");
+    	assertNotNull(vfcList);
+    	assertEquals(2, vfcList.size());
+    }
+    
 }