From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 16 Jul 2018 08:01:56 +0000 (+0200)
Subject: Rename Patrole config fields
X-Git-Tag: opnfv-7.0.0~190
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7ddaa0e56b99e298566df2c9f29107390c0bb2fd;p=functest.git

Rename Patrole config fields

Else it conflicts with the new tempest config fields [1].
It makes sense to switch to includes here.

[1] https://build.opnfv.org/ci/view/functest/job/functest-compass-virtual-daily-master/566/console

Change-Id: If7b3025b4003ea5704c6a3cdeae8cd00f1c5509e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index b59af41a7..f364bdef1 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -61,10 +61,10 @@ tiers:
                     class: 'Patrole'
                     args:
                         role: 'admin'
-                        services:
+                        includes:
                             - 'image'
                             - 'network'
-                        exclude:
+                        excludes:
                             - 'test_networks_multiprovider_rbac'
 
             -
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index a9e023e4c..1d3540603 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -252,10 +252,10 @@ tiers:
                     class: 'Patrole'
                     args:
                         role: 'admin'
-                        services:
+                        includes:
                             - 'image'
                             - 'network'
-                        exclude:
+                        excludes:
                             - 'test_networks_multiprovider_rbac'
 
             -
diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py
index efc513cdb..45378b6cd 100644
--- a/functest/opnfv_tests/openstack/patrole/patrole.py
+++ b/functest/opnfv_tests/openstack/patrole/patrole.py
@@ -32,9 +32,9 @@ class Patrole(tempest.TempestCommon):
         self.backup_tempest_config(self.conf_file, self.res_dir)
 
     def run(self, **kwargs):
-        for exclude in kwargs.get('exclude', []):
+        for exclude in kwargs.get('excludes', []):
             kwargs['mode'] = "{}(?!.*{})".format(
                 kwargs.get('mode', ''), exclude)
         kwargs['mode'] = '{}(?=patrole_tempest_plugin.tests.api.({}))'.format(
-            kwargs['mode'], '|'.join(kwargs.get('services', [])))
+            kwargs['mode'], '|'.join(kwargs.get('includes', [])))
         return super(Patrole, self).run(**kwargs)