From 9ffdb63f01a939b09a24a3d49d700d71948bd1a7 Mon Sep 17 00:00:00 2001
From: Yuli Shlosberg <ys9693@att.com>
Date: Mon, 22 Oct 2018 16:54:02 +0300
Subject: [PATCH] new UI onboarding test

Change-Id: I2594e1d4e5c1112bb7845d9fd69d88ceb1e0fa67
Issue-ID: SDC-1854
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
---
 .../sdc/ci/tests/dataProviders/OnbordingDataProviders.java    | 11 +++++++++--
 ui-ci/pom.xml                                                 |  5 +++++
 .../sdc/ci/tests/execute/sanity/OnboardingFlowsUI.java        |  9 +++++++++
 ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml       | 10 ++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProviders/OnbordingDataProviders.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProviders/OnbordingDataProviders.java
index b61daf8075..9f9fd99bd9 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProviders/OnbordingDataProviders.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProviders/OnbordingDataProviders.java
@@ -29,12 +29,19 @@ public class OnbordingDataProviders {
 	
 	@DataProvider(name = "VNF_List" , parallel = true)
 	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);
 	}
+
+	@DataProvider(name = "Single_VNF" , parallel = true)
+	private static final Object[][] SingleVNF() throws Exception {
+		List<String> fileNamesFromFolder = OnboardingUtils.getVnfNamesFileList();
+		List<String> newList = new ArrayList<>();
+		newList.add(fileNamesFromFolder.get(0));
+		System.out.println(String.format("There are %s zip file(s) to test", fileNamesFromFolder.size()));
+		return provideData(newList, filepath);
+	}
 	
 //	-----------------------factories-----------------------------------------
 
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index c5b5b09c1b..2b7630986f 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -308,6 +308,11 @@
 									<directory>${project.basedir}/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/testSuites</directory>
 									<followSymlinks>false</followSymlinks>
 								</fileset>
+								<!-- VNF files -->
+								<fileset>
+									<directory>${project.basedir}/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/Files/VNFs</directory>
+									<followSymlinks>false</followSymlinks>
+								</fileset>
 							</filesets>
 						</configuration>
 					</execution>
diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/OnboardingFlowsUI.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/OnboardingFlowsUI.java
index 1a14410266..77b2a0a80a 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/OnboardingFlowsUI.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/OnboardingFlowsUI.java
@@ -98,6 +98,15 @@ public class OnboardingFlowsUI extends SetupCDTest {
         runOnboardToDistributionFlow(resourceReqDetails, serviceReqDetails, filePath, vnfFile);
     }
 
+    @Test(dataProviderClass = org.openecomp.sdc.ci.tests.dataProviders.OnbordingDataProviders.class, dataProvider = "Single_VNF")
+    public void onapOnboardVNFflow(String filePath, String vnfFile) throws Exception, Throwable {
+        setLog(vnfFile);
+        ResourceReqDetails resourceReqDetails = ElementFactory.getDefaultResource();//getResourceReqDetails(ComponentConfigurationTypeEnum.DEFAULT);
+        ServiceReqDetails serviceReqDetails = ElementFactory.getDefaultService();//getServiceReqDetails(ComponentConfigurationTypeEnum.DEFAULT);
+        System.out.println("print - >" + makeDistributionValue);
+        runOnboardToDistributionFlow(resourceReqDetails, serviceReqDetails, filePath, vnfFile);
+    }
+
 
     public void runOnboardToDistributionFlow(ResourceReqDetails resourceReqDetails, ServiceReqDetails serviceMetadata, String filePath, String vnfFile) throws Exception {
         getExtendTest().log(Status.INFO, "Going to create resource with category: " + resourceReqDetails.getCategories().get(0).getName()
diff --git a/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml b/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml
index 480abdd7c6..de03d3d07e 100644
--- a/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml
+++ b/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml
@@ -2,6 +2,8 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="uitests" configfailurepolicy="continue" parallel="methods" thread-count="1" data-provider-thread-count="1">
 
+    <parameter name="makeDistribution"  value="false"/>
+
   <test name="uiSanity">
     <classes>
 
@@ -17,6 +19,14 @@
             </methods>
         </class>
 
+
+        <class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlowsUI">
+            <methods>
+                <include name="onapOnboardVNFflow"/>
+            </methods>
+        </class>
+
+
 						
     </classes>
   </test> <!-- uitests -->
-- 
2.16.6