1 files changed, 58 insertions, 14 deletions

diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProvider/OnbordingDataProviders.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProvider/OnbordingDataProviders.java
index 69037500a2..ad9ce781c8 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProvider/OnbordingDataProviders.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProvider/OnbordingDataProviders.java
@@ -1,26 +1,23 @@
 package org.openecomp.sdc.ci.tests.dataProvider;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.openecomp.sdc.ci.tests.execute.sanity.ToscaValidationTest;
-import org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest;
 import org.openecomp.sdc.ci.tests.utilities.FileHandling;
-import org.openecomp.sdc.ci.tests.utilities.OnboardingUtils;
+import org.openecomp.sdc.ci.tests.utils.general.OnboardingUtils;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Factory;
-
 public class OnbordingDataProviders {
 
 	protected static String filepath = FileHandling.getVnfRepositoryPath();
-	
+
 //	-----------------------dataProviders-----------------------------------------	
 	@DataProvider(name = "randomVNF_List", parallel = false)
 	private static final Object[][] randomVnfList() throws Exception {
 		int randomElementNumber = 3; //how many VNFs to onboard randomly
-		List<String> fileNamesFromFolder = OnboardingUtils.getVnfNamesFileList();
+		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);
@@ -30,12 +27,29 @@ public class OnbordingDataProviders {
 	private static final Object[][] VnfList() throws Exception {
 		
 		List<String> fileNamesFromFolder = OnboardingUtils.getVnfNamesFileList();
-		
+
 		System.out.println(String.format("There are %s zip file(s) to test", fileNamesFromFolder.size()));
 		return provideData(fileNamesFromFolder, filepath);
 	}
-	
-//	-----------------------factories-----------------------------------------
+
+	@DataProvider(name = "updateList")
+	private static final Object[][] updateList() throws Exception {
+
+		Object[][] objectArr = new Object[2][];
+
+		Object[][] filteredArObject = null;
+
+		objectArr[0] = new Object[]{ "1-2016-20-visbc3vf-(VOIP)_v2.1.zip", "2-2016-20-visbc3vf-(VOIP)_v2.1_RenameResourceToShay.zip" };
+		objectArr[1] = new Object[]{ "1-2017-404_vUSP_vCCF_AIC3.0-(VOIP)_v6.0.zip", "2-2017-404_vUSP_vCCF_AIC3.0-(VOIP)_v6.0_Added2TestParameters.zip" };
+
+		filteredArObject = OnboardingUtils.filterObjectArrWithExcludedVnfs(objectArr);
+
+		return filteredArObject;
+
+
+	}
+
+	//	-----------------------factories-----------------------------------------
 	@Factory(dataProvider = "VNF_List")
 	public Object[] OnbordingDataProviders(String filepath, String vnfFile){
 		return new Object[] { new ToscaValidationTest(filepath, vnfFile)};
@@ -54,7 +68,7 @@ public class OnbordingDataProviders {
 		return arObject;
 	}
 	
-	private static List<String> getRandomElements(int randomElementNumber, List<String> fileNamesFromFolder) {
+	public static List<String> getRandomElements(int randomElementNumber, List<String> fileNamesFromFolder) {
 		if(fileNamesFromFolder.size() == 0 || fileNamesFromFolder.size() < randomElementNumber){
 			return null;
 		}else{
@@ -71,8 +85,38 @@ public class OnbordingDataProviders {
 			return newRandomFileNamesFromFolder;
 		}
 	}
-	
-	
-	
-	
+
+
+//	private static String[][] arrangeFilesVersionPairs(List<String> filesArr) {
+//		String[][] filesArrangeByPairs = null;
+//
+//		List<String> versionOneFiles= null;
+//		List<String> versionTowFiles= null;
+//
+//		for ( String fileName : filesArr )
+//		{
+//			if(fileName.startsWith("1-"))
+//			{
+//				versionOneFiles.add(fileName);
+//			}
+//			else if(fileName.startsWith("2-"))
+//			{
+//				versionTowFiles.add(fileName);
+//			}
+//		}
+//
+//		Collections.sort(versionOneFiles);
+//		Collections.sort(versionTowFiles);
+//
+//		for (int i=0 ; i<versionOneFiles.size() ; i++ )
+//		{
+//			for (int j=0 ; j<versionTowFiles.size() ; j++ )
+//			{
+//
+//			}
+//		}
+//
+//		return filesArrangeByPairs;
+//	}
+
 }