Merge "Adapt vping testcases to the new template"

diff --combined functest/ci/exec_test.sh
index 8dc409d,fece3b9..4d913c5
--- 1/functest/ci/exec_test.sh
--- 2/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@@ -84,12 -84,6 +84,6 @@@ function run_test()
          "healthcheck")
              ${FUNCTEST_TEST_DIR}/OpenStack/healthcheck/healthcheck.sh
          ;;
-         "vping_ssh")
-             python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m ssh $report
-         ;;
-         "vping_userdata")
-             python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m userdata $report
-         ;;
          "odl")
              odl_tests
              [[ "$report" == "-r" ]] && args=-p
@@@ -156,11 -150,17 +150,11 @@@
                  $clean_flag -s -m feature_multisite $report \
                  -c ${FUNCTEST_TEST_DIR}/OpenStack/tempest/tempest_multisite.conf
          ;;
 -        "domino")
 -            python ${FUNCTEST_TEST_DIR}/features/domino.py $report
 -        ;;
          "odl-sfc")
 -            pip install --upgrade python-keystoneclient==1.7.4
 -            ODL_SFC_DIR=${FUNCTEST_TEST_DIR}/features/sfc
 -            # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash
 +            ODL_SFC_DIR=${repos_dir}/sfc/tests/functest/odl-sfc
              FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} python ${ODL_SFC_DIR}/prepare_odl_sfc.py || exit $?
              source ${ODL_SFC_DIR}/tackerc
              python ${ODL_SFC_DIR}/sfc.py $report
 -            pip install --upgrade python-keystoneclient==3.5.0
          ;;
          "parser")
              python ${FUNCTEST_TEST_DIR}/vnf/vRNC/parser.py $report

diff --combined functest/ci/testcases.yaml
index fc835b9,1fb3511..1b7747c
--- 1/functest/ci/testcases.yaml
--- 2/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@@ -37,6 -37,9 +37,9 @@@ tiers
                  dependencies:
                      installer: ''
                      scenario: '^((?!bgpvpn|odl_l3).)*$'
+                 run:
+                     module: 'functest.opnfv_tests.OpenStack.vPing.vping_ssh'
+                     class: 'VPingSSH'
  
              -
                  name: vping_userdata
@@@ -48,6 -51,9 +51,9 @@@
                  dependencies:
                      installer: ''
                      scenario: '^((?!lxd).)*$'
+                 run:
+                     module: 'functest.opnfv_tests.OpenStack.vPing.vping_userdata'
+                     class: 'VPingUserdata'
  
              -
                  name: tempest_smoke_serial
@@@ -192,9 -198,6 +198,9 @@@
                  dependencies:
                      installer: 'joid'
                      scenario: ''
 +                run:
 +                    module: 'functest.opnfv_tests.features.domino'
 +                    class: 'DominoCases'
              -
                  name: odl-sfc
                  criteria: 'status == "PASS"'

diff --combined functest/core/TestCasesBase.py
index 777b09f,4c156b2..bd02e13
--- 1/functest/core/TestCasesBase.py
--- 2/functest/core/TestCasesBase.py
+++ b/functest/core/TestCasesBase.py
@@@ -21,9 -21,11 +21,10 @@@ class TestCasesBase(object)
  
      logger = ft_logger.Logger(__name__).getLogger()
  
 -    project = "functest"
 -
      def __init__(self):
+         self.functest_repo = ft_utils.FUNCTEST_REPO
          self.details = {}
 +        self.project_name = "functest"
          self.case_name = ""
          self.criteria = ""
          self.start_time = ""
@@@ -35,13 -37,12 +36,13 @@@
  
      def push_to_db(self):
          try:
 +            assert self.project_name
              assert self.case_name
              assert self.criteria
              assert self.start_time
              assert self.stop_time
              if ft_utils.push_results_to_db(
 -                    TestCasesBase.project, self.case_name, self.start_time,
 +                    self.project_name, self.case_name, self.start_time,
                      self.stop_time, self.criteria, self.details):
                  self.logger.info("The results were successfully pushed to DB")
                  return TestCasesBase.EX_OK