1 files changed, 14 insertions, 6 deletions

diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/OnboardViaApis.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/OnboardViaApis.java
index 71fe44cc79..2ce944d273 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/OnboardViaApis.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/OnboardViaApis.java
@@ -28,6 +28,7 @@ import java.io.FileOutputStream;
 import java.nio.charset.StandardCharsets;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -67,8 +68,8 @@ public class OnboardViaApis{
 
 	private static final String FULL_PATH = "C://tmp//CSARs//";
 	
-	public static Object[][] provideData(Object[] fileNamesFromFolder, String filepath) {
-		Object[][] arObject = new Object[fileNamesFromFolder.length][];
+	public static Object[][] provideData(List<String> fileNamesFromFolder, String filepath) {
+		Object[][] arObject = new Object[fileNamesFromFolder.size()][];
 
 		int index = 0;
 		for (Object obj : fileNamesFromFolder) {
@@ -81,8 +82,14 @@ public class OnboardViaApis{
 	private static final Object[][] VnfList() throws Exception {
 		String filepath = FileHandling.getVnfRepositoryPath();
 		
-		Object[] fileNamesFromFolder = FileHandling.getZipFileNamesFromFolder(filepath);
-		System.out.println(String.format("There are %s zip file(s) to test", fileNamesFromFolder.length));
+//		Object[] fileNamesFromFolder = FileHandling.getZipFileNamesFromFolder(filepath);
+		List<String> fileNamesFromFolder = FileHandling.getZipFileNamesFromFolder(filepath);
+		List<String> exludeVnfList = Arrays.asList("2016-197_vscp_vscp-fw_1610_e2e.zip", "2016-281_vProbes_BE_11_1_f_30_1610_e2e.zip", 
+				"2016-282_vProbes_FE_11_1_f_30_1610_e2e.zip", "2016-044_vfw_fnat_30_1607_e2e.zip", "2017-376_vMOG_11_1.zip", "vMOG.zip", 
+				"vMRF_USP_AIC3.0_1702.zip", "2016-211_vprobesbe_vprobes_be_30_1610_e2e.zip", "2016-005_vprobesfe_vprobes_fe_30_1607_e2e.zip", 
+				"vMRF_RTT.zip", "2016-006_vvm_vvm_30_1607_e2e.zip", "2016-001_vvm_vvm_30_1607_e2e.zip");
+		fileNamesFromFolder.removeAll(exludeVnfList);
+		System.out.println(String.format("There are %s zip file(s) to test", fileNamesFromFolder.size()));
 		return provideData(fileNamesFromFolder, filepath);
 	}
 
@@ -126,8 +133,9 @@ public class OnboardViaApis{
 	public void onboardingAndParser() throws Exception {
 		Service service = null;
 		String filepath = getFilePath();
-		Object[] fileNamesFromFolder = FileHandling.getZipFileNamesFromFolder(filepath);
-		String vnfFile = fileNamesFromFolder[7].toString();
+//		Object[] fileNamesFromFolder = FileHandling.getZipFileNamesFromFolder(filepath);
+		List<String> fileNamesFromFolder = FileHandling.getZipFileNamesFromFolder(filepath);
+		String vnfFile = fileNamesFromFolder.get(7);
 		System.err.println(timestamp + " Starting test with VNF: " + vnfFile);
 		service = runOnboardViaApisOnly(filepath, vnfFile);