From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 6 Nov 2018 18:44:34 +0000 (+0100)
Subject: Disable agent testing in tempest-based testcases
X-Git-Tag: opnfv-8.1.0~116^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=81936769f11d3cc4f12ea763b64b9995a3343da1;p=functest.git

Disable agent testing in tempest-based testcases

It blacklists agent testing and two tests asking for VXLAN as overlay
if OVN (OVN supports GENEVE) [1]

blacklist.txt is renamed blacklist.yaml and is verified by yamllint.

[1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-gambia/33/console

Change-Id: I73c1b8cbbd74973a7f15476feea6ee4532786660
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 3b07c3e741e0e64603d01afc651176aa2fc52391)
---

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 6d301a624..12671d4c1 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -36,7 +36,7 @@ GLANCE_IMAGE_PATH = os.path.join(
 TEMPEST_CUSTOM = pkg_resources.resource_filename(
     'functest', 'opnfv_tests/openstack/tempest/custom_tests/test_list.txt')
 TEMPEST_BLACKLIST = pkg_resources.resource_filename(
-    'functest', 'opnfv_tests/openstack/tempest/custom_tests/blacklist.txt')
+    'functest', 'opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml')
 TEMPEST_CONF_YAML = pkg_resources.resource_filename(
     'functest', 'opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml')
 
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
deleted file mode 100644
index bb1aed339..000000000
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
--
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml
new file mode 100644
index 000000000..224bd9a30
--- /dev/null
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml
@@ -0,0 +1,12 @@
+---
+-
+    scenarios:
+        - os-ovn-nofeature-ha
+    tests:
+        - neutron_tempest_plugin.api.admin.test_agent_management
+        - neutron_tempest_plugin.api.admin.test_dhcp_agent_scheduler
+        - patrole_tempest_plugin.tests.api.network.test_agents_rbac
+        - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type
+        - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id
+        - tempest.api.network.admin.test_agent_management
+        - tempest.api.network.admin.test_dhcp_agent_scheduler
diff --git a/tox.ini b/tox.ini
index 5f474380b..719efafce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,6 +81,7 @@ files =
   docker
   functest/ci
   functest/opnfv_tests/openstack/rally/rally_jobs.yaml
+  functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml
   functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
   functest/opnfv_tests/vnf
 commands =