From 4475765f05a24e14f1d90db28941ff5ba5ca1be7 Mon Sep 17 00:00:00 2001
From: Morgan Richomme <morgan.richomme@orange.com>
Date: Wed, 20 Jan 2016 11:01:59 +0100
Subject: [PATCH] create 2 vPing scenario:vping and vping-userdata

the new vping scenario does not use the userdata/cloudinit functions

JIRA: FUNCTEST-3

Change-Id: Ia535a50a9cfd50d520b87c2dd9195747a61b0f1f
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
---
 docker/run_tests.sh                   |  5 +++++
 testcases/config_functest.yaml        | 15 ++++++++-------
 testcases/vPing/CI/libraries/vPing.py |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 7e8b0120..6ae12b90 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -59,6 +59,11 @@ function run_test(){
             python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing2.py \
                 --debug ${report}
         ;;
+        "vping_userdata")
+            info "Running vPing test using userdata/cloudinit.... "
+            python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py \
+                --debug ${report}
+        ;;
         "odl")
             info "Running ODL test..."
             neutron_ip=$(keystone catalog --service identity | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index 6a612067..229cb9b7 100644
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -158,13 +158,13 @@ results:
 # and if vPing is failing is usually not needed to continue...
 test_exec_priority:
     1: vping
-    2: tempest
-    3: odl
-    4: onos
-    5: ovno
-    #6: doctor
-    7: promise
-    #8: policy-test
+    2: vping_userdata
+    3: tempest
+    4: odl
+    5: onos
+    6: ovno
+    #7: doctor
+    8: promise
     #9: odl-vpn_service-tests
     #10: opnfv-yardstick-tc026-sdnvpn
     #11: openstack-neutron-bgpvpn-api-extension-tests
@@ -222,6 +222,7 @@ test-dependencies:
     functest:
         vims:
         vping:
+        vping_userdata:
         tempest:
         rally:
         odl:
diff --git a/testcases/vPing/CI/libraries/vPing.py b/testcases/vPing/CI/libraries/vPing.py
index b87de850..f261ff32 100644
--- a/testcases/vPing/CI/libraries/vPing.py
+++ b/testcases/vPing/CI/libraries/vPing.py
@@ -469,7 +469,7 @@ def main():
             git_version = functest_utils.get_git_branch(REPO_PATH)
             pod_name = functest_utils.get_pod_name(logger)
             functest_utils.push_results_to_db(TEST_DB,
-                                              "vPing",
+                                              "vPing_userdata",
                                               logger, pod_name, git_version,
                                               payload={'timestart': start_time_ts,
                                                        'duration': duration,
-- 
2.16.6