Switch to OPNFV Fraser release

1. Use Functest Fraser docker images whose tag is fraser
2. Use Yardstick stable docker images
3. Functest fraser has moved testcases.yaml file from functest/ci to xtesting/ci
4. Functest fraser has removed 'functest env prepare' command
5. Functest uses rally to execute osinterop test cases
   instead of refstack_client

Change-Id: I81ebefe6ea959ca77c2c87f1d75ef56ac18c165f
Signed-off-by: xudan <xudan16@huawei.com>

diff --git a/dovetail/report.py b/dovetail/report.py
index dea9e42..5e0458b 100644 (file)
--- a/dovetail/report.py
+++ b/dovetail/report.py
@@ -273,10 +273,10 @@ class FunctestCrawler(object):
                         duration = dt_utils.get_duration(timestart, timestop,
                                                          self.logger)
                         if complex_testcase:
-                            tests = data['details']['tests']
-                            failed_num = data['details']['failures']
+                            tests = data['details']['tests_number']
+                            failed_num = data['details']['failures_number']
                             success_case = data['details']['success']
-                            error_case = data['details']['errors']
+                            error_case = data['details']['failures']
                             skipped_case = data['details']['skipped']
                             details = {"tests": tests,
                                        "failures": failed_num,

diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml
index f76bac4..0251b73 100644 (file)
--- a/etc/conf/functest_config.yml
+++ b/etc/conf/functest_config.yml
@@ -1,7 +1,7 @@
 ---
 functest:
   image_name: opnfv/functest-smoke
-  docker_tag: euphrates
+  docker_tag: fraser
   opts: '-id --privileged=true'
   envs: '-e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO=unknown -e NODE_NAME=unknown
          -e TEST_DB_URL=file:///home/opnfv/functest/results/functest_results.txt'
@@ -9,13 +9,12 @@ functest:
     dir: '/home/opnfv/userconfig'
     images: '/home/opnfv/functest/images'
   pre_condition:
-    - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+    - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   cmds:
-    - 'functest env prepare'
-    - 'functest testcase run {{validate_testcase}} -r'
+    - 'run_tests -t {{validate_testcase}} -r'
   post_condition:
     - 'echo test for postcondition in functest'
   result:
     dir: '/home/opnfv/functest/results'
     file_path: 'functest_results.txt'
-  openrc: '/home/opnfv/functest/conf/openstack.creds'
+  openrc: '/home/opnfv/functest/conf/env_file'

diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml
index 6e09c27..f5a01b8 100644 (file)
--- a/etc/conf/yardstick_config.yml
+++ b/etc/conf/yardstick_config.yml
@@ -12,7 +12,7 @@
 
 yardstick:
   image_name: opnfv/yardstick
-  docker_tag: opnfv-5.1.0
+  docker_tag: stable
   opts: '-id --privileged=true'
   envs: {{os_cacert}}
   config:

diff --git a/etc/testcase/ipv6.tc001.yml b/etc/testcase/ipv6.tc001.yml
index c90c21c..12db928 100644 (file)
--- a/etc/testcase/ipv6.tc001.yml
+++ b/etc/testcase/ipv6.tc001.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc001:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc002.yml b/etc/testcase/ipv6.tc002.yml
index c7e8d48..1b29d0b 100644 (file)
--- a/etc/testcase/ipv6.tc002.yml
+++ b/etc/testcase/ipv6.tc002.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc002:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc003.yml b/etc/testcase/ipv6.tc003.yml
index 0866407..995e1d9 100644 (file)
--- a/etc/testcase/ipv6.tc003.yml
+++ b/etc/testcase/ipv6.tc003.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc003:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc004.yml b/etc/testcase/ipv6.tc004.yml
index b165af0..023bae6 100644 (file)
--- a/etc/testcase/ipv6.tc004.yml
+++ b/etc/testcase/ipv6.tc004.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc004:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc005.yml b/etc/testcase/ipv6.tc005.yml
index 128a535..f75f91e 100644 (file)
--- a/etc/testcase/ipv6.tc005.yml
+++ b/etc/testcase/ipv6.tc005.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc005:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc006.yml b/etc/testcase/ipv6.tc006.yml
index ed6f683..19f61d0 100644 (file)
--- a/etc/testcase/ipv6.tc006.yml
+++ b/etc/testcase/ipv6.tc006.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc006:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc007.yml b/etc/testcase/ipv6.tc007.yml
index 592a0fe..816d6c8 100644 (file)
--- a/etc/testcase/ipv6.tc007.yml
+++ b/etc/testcase/ipv6.tc007.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc007:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc008.yml b/etc/testcase/ipv6.tc008.yml
index 08583fd..1a2a655 100644 (file)
--- a/etc/testcase/ipv6.tc008.yml
+++ b/etc/testcase/ipv6.tc008.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc008:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc009.yml b/etc/testcase/ipv6.tc009.yml
index 74ab872..417b67f 100644 (file)
--- a/etc/testcase/ipv6.tc009.yml
+++ b/etc/testcase/ipv6.tc009.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc009:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc010.yml b/etc/testcase/ipv6.tc010.yml
index 22d36ca..e8f4049 100644 (file)
--- a/etc/testcase/ipv6.tc010.yml
+++ b/etc/testcase/ipv6.tc010.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc010:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc011.yml b/etc/testcase/ipv6.tc011.yml
index a562907..5ed7850 100644 (file)
--- a/etc/testcase/ipv6.tc011.yml
+++ b/etc/testcase/ipv6.tc011.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc011:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc012.yml b/etc/testcase/ipv6.tc012.yml
index 5384acc..4509357 100644 (file)
--- a/etc/testcase/ipv6.tc012.yml
+++ b/etc/testcase/ipv6.tc012.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc012:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc013.yml b/etc/testcase/ipv6.tc013.yml
index 1b99e9b..4c50788 100644 (file)
--- a/etc/testcase/ipv6.tc013.yml
+++ b/etc/testcase/ipv6.tc013.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc013:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc014.yml b/etc/testcase/ipv6.tc014.yml
index fc58fa8..6cd9178 100644 (file)
--- a/etc/testcase/ipv6.tc014.yml
+++ b/etc/testcase/ipv6.tc014.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc014:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc015.yml b/etc/testcase/ipv6.tc015.yml
index 5218ff9..9dfd31b 100644 (file)
--- a/etc/testcase/ipv6.tc015.yml
+++ b/etc/testcase/ipv6.tc015.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc015:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc016.yml b/etc/testcase/ipv6.tc016.yml
index e8949a0..8717413 100644 (file)
--- a/etc/testcase/ipv6.tc016.yml
+++ b/etc/testcase/ipv6.tc016.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc016:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc017.yml b/etc/testcase/ipv6.tc017.yml
index 8cff0c3..579ecb3 100644 (file)
--- a/etc/testcase/ipv6.tc017.yml
+++ b/etc/testcase/ipv6.tc017.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc017:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc018.yml b/etc/testcase/ipv6.tc018.yml
index ff7d56b..af9c5d9 100644 (file)
--- a/etc/testcase/ipv6.tc018.yml
+++ b/etc/testcase/ipv6.tc018.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc018:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc019.yml b/etc/testcase/ipv6.tc019.yml
index 4debe2d..e02fc11 100644 (file)
--- a/etc/testcase/ipv6.tc019.yml
+++ b/etc/testcase/ipv6.tc019.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc019:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc020.yml b/etc/testcase/ipv6.tc020.yml
index 351b400..a650bc0 100644 (file)
--- a/etc/testcase/ipv6.tc020.yml
+++ b/etc/testcase/ipv6.tc020.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc020:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc021.yml b/etc/testcase/ipv6.tc021.yml
index b25cc68..7cfa23c 100644 (file)
--- a/etc/testcase/ipv6.tc021.yml
+++ b/etc/testcase/ipv6.tc021.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc021:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc022.yml b/etc/testcase/ipv6.tc022.yml
index 0893640..268255b 100644 (file)
--- a/etc/testcase/ipv6.tc022.yml
+++ b/etc/testcase/ipv6.tc022.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc022:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc023.yml b/etc/testcase/ipv6.tc023.yml
index a7f2e9f..f8cc31c 100644 (file)
--- a/etc/testcase/ipv6.tc023.yml
+++ b/etc/testcase/ipv6.tc023.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc023:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc024.yml b/etc/testcase/ipv6.tc024.yml
index 00ce308..6f93d07 100644 (file)
--- a/etc/testcase/ipv6.tc024.yml
+++ b/etc/testcase/ipv6.tc024.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc024:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/ipv6.tc025.yml b/etc/testcase/ipv6.tc025.yml
index 4828abd..7178f92 100644 (file)
--- a/etc/testcase/ipv6.tc025.yml
+++ b/etc/testcase/ipv6.tc025.yml
@@ -7,7 +7,7 @@ dovetail.ipv6.tc025:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/osinterop.tc001.yml b/etc/testcase/osinterop.tc001.yml
index f0eb4b5..e375da6 100644 (file)
--- a/etc/testcase/osinterop.tc001.yml
+++ b/etc/testcase/osinterop.tc001.yml
@@ -10,15 +10,10 @@ dovetail.osinterop.tc001:
     testcase: refstack_defcore
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: osinterop.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/refstack_client/defcore.txt
-    cmds:
-      - 'functest env prepare'
-      - 'functest testcase run refstack_defcore -r'
-    post_condition:
-      - 'echo test for postcondition in testcase'
   report:
     sub_testcase_list:
       # VIM compute operations test cases

diff --git a/etc/testcase/sdnvpn.tc000.yml b/etc/testcase/sdnvpn.tc000.yml
index 4b1acf2..390deb7 100644 (file)
--- a/etc/testcase/sdnvpn.tc000.yml
+++ b/etc/testcase/sdnvpn.tc000.yml
@@ -8,7 +8,7 @@ dovetail.sdnvpn.tc000:
     image_name: opnfv/functest-features
     pre_condition:
       - "sed -i 's/networking_bgpvpn_tempest/networking_bgpvpn_tempest-r networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest*/' /usr/lib/python2.7/site-packages/sdnvpn/test/functest/tempest.py"
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       exist_src_file: sdnvpn_config_tc000.yaml
       dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml

diff --git a/etc/testcase/smoke.tc001.yml b/etc/testcase/smoke.tc001.yml
index 6d8d692..b2b250b 100644 (file)
--- a/etc/testcase/smoke.tc001.yml
+++ b/etc/testcase/smoke.tc001.yml
@@ -7,7 +7,7 @@ dovetail.smoke.tc001:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/tempest.tc001.yml b/etc/testcase/tempest.tc001.yml
index 8e66924..b93363e 100644 (file)
--- a/etc/testcase/tempest.tc001.yml
+++ b/etc/testcase/tempest.tc001.yml
@@ -7,7 +7,7 @@ dovetail.tempest.tc001:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/tempest.tc002.yml b/etc/testcase/tempest.tc002.yml
index 4985dfa..36fe9b3 100644 (file)
--- a/etc/testcase/tempest.tc002.yml
+++ b/etc/testcase/tempest.tc002.yml
@@ -7,7 +7,7 @@ dovetail.tempest.tc002:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/tempest.tc003.yml b/etc/testcase/tempest.tc003.yml
index b19fd2a..980cc36 100644 (file)
--- a/etc/testcase/tempest.tc003.yml
+++ b/etc/testcase/tempest.tc003.yml
@@ -7,7 +7,7 @@ dovetail.tempest.tc003:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/tempest.tc004.yml b/etc/testcase/tempest.tc004.yml
index a6a49f0..2df96ca 100644 (file)
--- a/etc/testcase/tempest.tc004.yml
+++ b/etc/testcase/tempest.tc004.yml
@@ -7,7 +7,7 @@ dovetail.tempest.tc004:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/testcase/tempest.tc005.yml b/etc/testcase/tempest.tc005.yml
index b20ae5d..8f629bd 100644 (file)
--- a/etc/testcase/tempest.tc005.yml
+++ b/etc/testcase/tempest.tc005.yml
@@ -7,7 +7,7 @@ dovetail.tempest.tc005:
     testcase: tempest_custom
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
     pre_copy:
       src_file: tempest_custom.txt
       dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/etc/userconfig/testcases.yaml b/etc/userconfig/testcases.yaml
index f1cb6ae..571ae7b 100644 (file)
--- a/etc/userconfig/testcases.yaml
+++ b/etc/userconfig/testcases.yaml
@@ -108,14 +108,14 @@ tiers:
                 blocking: false
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
-                    Defcore testcases by using refstack client.
+                    Defcore testcases.
                 dependencies:
                     installer: ''
                     scenario: ''
                 run:
                     module:
-                        'functest.opnfv_tests.openstack.refstack_client.refstack_client'
-                    class: 'RefstackClient'
+                        'functest.opnfv_tests.openstack.refstack.refstack'
+                    class: 'Refstack'
 
             -
                 case_name: tempest_smoke_serial