Add VNFs to sanity docker

Change-Id: I8b81db65fdbad997d8bdf680eed7dcde1b200eb4
Issue-Id: SDC-401
Signed-off-by: Yuli Shlosberg <ys9693@att.com>

diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zip
new file mode 100644 (file)
index 0000000..bb91a94
Binary files /dev/null and b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zip differ

diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zip
new file mode 100644 (file)
index 0000000..b8273de
Binary files /dev/null and b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vfw.zip differ

diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vlb.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vlb.zip
new file mode 100644 (file)
index 0000000..19c8a7d
Binary files /dev/null and b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vlb.zip differ

diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zip
new file mode 100644 (file)
index 0000000..dc9ef5d
Binary files /dev/null and b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vvg.zip differ

diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb
index 6f10a33..690559a 100644 (file)
--- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb
+++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb
@@ -6,7 +6,7 @@ cwd "#{tests_base}"
 code <<-EOH
    cd "#{tests_base}"
    jar_file=`ls test-apis*-jar-with-dependencies.jar`
-   ./startTest.sh $jar_file #{ci_test_suite}
+   nohup ./startTest.sh $jar_file #{ci_test_suite} &
    echo "return code from startTest.sh = [$?]"
 EOH
 timeout 72000

diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
index ad1e8dd..1817b6e 100644 (file)
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
@@ -123,21 +123,20 @@ public abstract class ComponentBaseTest {
        public void setBrowserBeforeTest(java.lang.reflect.Method method, ITestContext context) throws Exception {
 
 
-                   String suiteName = ExtentManager.getSuiteName(context);
-                       ExtentTestManager.startTest(method.getName());
-                       ExtentTestManager.assignCategory(this.getClass());
-      
-//    boolean emptyDataProvider = method.getAnnotation(Test.class).dataProvider().isEmpty();
-//     String className = method.getDeclaringClass().getName();
-//             if (emptyDataProvider)  {
-//                     System.out.println("ExtentReport instance started from BeforeMethod...");
-//                     String suiteName = ExtentManager.getSuiteName(context);
+//                 String suiteName = ExtentManager.getSuiteName(context);
 //                     ExtentTestManager.startTest(method.getName());
 //                     ExtentTestManager.assignCategory(this.getClass());
-//
-//             } else {
-//                     System.out.println("ExtentReport instance started from Test...");
-//             }
+
+               boolean emptyDataProvider = method.getAnnotation(Test.class).dataProvider().isEmpty();
+               String className = method.getDeclaringClass().getName();
+               if (!method.getName().equals("onboardVNFShotFlow"))  {
+                       System.out.println("ExtentReport instance started from BeforeMethod...");
+                       ExtentTestManager.startTest(method.getName());
+                       ExtentTestManager.assignCategory(this.getClass());
+
+               } else {
+                       System.out.println("ExtentReport instance started from Test...");
+               }
       
 
        }
@@ -176,13 +175,8 @@ public abstract class ComponentBaseTest {
        @AfterClass(alwaysRun = true)
        public synchronized static void cleanAfterClass() throws Exception{
 
-//             System.out.println("<<<<<<<<class name>>>>>"+method.getDeclaringClass());
-//             System.out.println("<<<<<<<<class name>>>>>"+method.getName());
-
-
                System.out.println("delete components AfterClass");
                deleteCreatedComponents(getCatalogAsMap());
-//             extentReport.flush();
 
        }