1 files changed, 24 insertions, 11 deletions
diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/dataProvider/OnbordingDataProviders.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/dataProvider/OnbordingDataProviders.java
index 3a9fd4d9a3..41b247c338 100644
--- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/dataProvider/OnbordingDataProviders.java
+++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/dataProvider/OnbordingDataProviders.java
@@ -24,6 +24,8 @@ package org.onap.sdc.frontend.ci.tests.dataProvider;
 import org.onap.sdc.backend.ci.tests.datatypes.enums.XnfTypeEnum;
 import org.onap.sdc.backend.ci.tests.utils.general.OnboardingUtils;
 import org.onap.sdc.frontend.ci.tests.utilities.FileHandling;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 
@@ -33,6 +35,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class OnbordingDataProviders {
+    private static final Logger LOGGER = LoggerFactory.getLogger(OnbordingDataProviders.class);
 
     private static final String VSP_VGW_CSAR = "vsp-vgw.csar";
     private static final int NUMBER_OF_RANDOMLY_ONBOARD_VNF = 3;
@@ -44,34 +47,44 @@ public class OnbordingDataProviders {
         int randomElementNumber = NUMBER_OF_RANDOMLY_ONBOARD_VNF; //how many VNFs to onboard randomly
         List<String> fileNamesFromFolder = OnboardingUtils.getVnfNamesFileListExcludeToscaParserFailure();
         List<String> newRandomFileNamesFromFolder = getRandomElements(randomElementNumber, fileNamesFromFolder);
-        System.out.println(String.format("There are %s zip file(s) to test", newRandomFileNamesFromFolder.size()));
         return provideData(newRandomFileNamesFromFolder, filepath);
     }
 
     @DataProvider(name = "VNF_List", parallel = true)
     private static Object[][] VnfList() throws Exception {
-
         List<String> fileNamesFromFolder = OnboardingUtils.getXnfNamesFileList(XnfTypeEnum.VNF);
-
-        System.out.println(String.format("There are %s zip file(s) to test", fileNamesFromFolder.size()));
         return provideData(fileNamesFromFolder, filepath);
     }
 
     @DataProvider(name = "CNF_List", parallel = true)
     private static Object[][] cnfList() {
-
         List<String> fileNamesFromFolder = OnboardingUtils.getXnfNamesFileList(XnfTypeEnum.CNF);
-
-        System.out.println(String.format("There are %s zip file(s) to test", fileNamesFromFolder.size()));
         return provideData(fileNamesFromFolder, FileHandling.getCnfRepositoryPath());
     }
 
+    @DataProvider(name = "CNF_Helm_Validator_List", parallel = true)
+    private static Object[][] cnfForHelmValidatorList() {
+        List<String> fileNamesFromFolder = OnboardingUtils.getXnfNamesFileList(XnfTypeEnum.CNF_HELM);
+        return provideData(fileNamesFromFolder, FileHandling.getCnfForHelmValidatorRepositoryPath());
+    }
+
+    @DataProvider(name = "CNF_With_Warning_Helm_Validator_List", parallel = true)
+    private static Object[][] cnfWithWarningForHelmValidatorList() {
+        List<String> fileNamesFromFolder = OnboardingUtils.getXnfNamesWithWarningsFileList(XnfTypeEnum.CNF_HELM);
+        Object[][] objects = provideData(fileNamesFromFolder,
+            FileHandling.getCnfWithWarningForHelmValidatorRepositoryPath());
+        return objects;
+    }
+
+    @DataProvider(name = "Invalid_CNF_Helm_Validator_List", parallel = true)
+    private static Object[][] invalidCnfForHelmValidatorList() {
+        List<String> fileNamesFromFolder = OnboardingUtils.getInvalidXnfNamesFileList(XnfTypeEnum.CNF_HELM);
+        return provideData(fileNamesFromFolder, FileHandling.getInvalidCnfForHelmValidatorRepositoryPath());
+    }
+
     @DataProvider(name = "Invalid_CNF_List", parallel = true)
     private static Object[][] invalidCnfList() {
-
         List<String> fileNamesFromFolder = OnboardingUtils.getInvalidXnfNamesFileList(XnfTypeEnum.CNF);
-
-        System.out.println(String.format("There are %s zip file(s) to test", fileNamesFromFolder.size()));
         return provideData(fileNamesFromFolder, FileHandling.getCnfRepositoryPath());
     }
 
@@ -106,7 +119,7 @@ public class OnbordingDataProviders {
 
     //	-----------------------methods-----------------------------------------
     static Object[][] provideData(List<String> fileNamesFromFolder, String filepath) {
-
+        LOGGER.info(String.format("There are %s zip file(s) to test", fileNamesFromFolder.size()));
         Object[][] arObject = new Object[fileNamesFromFolder.size()][];
         int index = 0;
         for (Object obj : fileNamesFromFolder) {