Running BGPVPN Tempest tests as tempest_custom test

We need to disable one BGPVPN tempest test due to a bug in ODL. Since
the SDNVPN test framework does not allow for disabling a single test
case, we are switching to tempest_custom.

Change-Id: Ifbd7c1dc5e799d6a6c774e08e9fc1a3b2294b47c
Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>

2 files changed, 33 insertions, 6 deletions

diff --git a/docs/testing/user/userguide/testing_guide.rst b/docs/testing/user/userguide/testing_guide.rst
index e8430601..17c5431f 100644
--- a/docs/testing/user/userguide/testing_guide.rst
+++ b/docs/testing/user/userguide/testing_guide.rst
@@ -278,7 +278,17 @@ Here is an example of what this file should contain.
      # Expected device name when a volume is attached to an instance.
      volume_device_name: vdb
 
-Use the listing above at a minimum to execute the mandatory test areas.
+Use the listing above as a minimum to execute the mandatory test areas.
+
+If the optional BGPVPN Tempest API tests shall be run, Tempest needs to be told
+that the BGPVPN service is available. To do that, add the following to the
+``$DOVETAIL_HOME/pre_config/tempest_conf.yaml`` configuration file:
+
+.. code-block:: bash
+
+  service_available:
+    bgpvpn: True
+
 
 Configuration for Running HA Test Cases (Mandatory)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/etc/testcase/tempest.bgpvpn.yml b/etc/testcase/tempest.bgpvpn.yml
index 0801a315..6644616b 100644
--- a/etc/testcase/tempest.bgpvpn.yml
+++ b/etc/testcase/tempest.bgpvpn.yml
@@ -4,20 +4,37 @@ dovetail.tempest.bgpvpn:
   objective: validate BGPVPN API CRUD operations by means of Tempest tests from networking-bgpvpn repository
   validate:
     type: functest
-    testcase: bgpvpn
+    testcase: tempest_custom
     image_name: opnfv/functest-features
     pre_condition:
-      - "sed -i 's/networking_bgpvpn_tempest/networking_bgpvpn_tempest.tests.api/' /usr/lib/python2.7/site-packages/sdnvpn/test/functest/run_tempest.py"
+      - '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/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
+      src_file: tempest_custom.txt
+      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
   report:
     source_archive_files:
       - functest.log
-      - bgpvpn.log
+      - tempest/tempest.log
+      - tempest/tempest-report.html
     dest_archive_files:
       - tempest_logs/dovetail.tempest.bgpvpn.functest.log
       - tempest_logs/dovetail.tempest.bgpvpn.log
+      - tempest_logs/dovetail.tempest.bgpvpn.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_associate_disassociate_network
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_associate_disassociate_router
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_associate_invalid_network[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_attach_associated_subnet_to_associated_router[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_create_bgpvpn
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_create_bgpvpn_as_non_admin_fail[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_create_bgpvpn_with_invalid_routetargets[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_delete_bgpvpn_as_non_admin_fail[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_disassociate_invalid_network[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_list_bgpvpn_as_non_owner_fail[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_list_netassoc_as_non_owner_fail[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_show_bgpvpn_as_non_owner_fail[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_show_netassoc_as_non_owner_fail[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_update_bgpvpn_invalid_routetargets[negative]
+      - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_update_route_target_non_admin_fail[negative]