commit c6c1aea2a056e7f66d37bfd00c18903dcfba1670
author ibumarskov <ibumarskov@mirantis.com> Tue Oct 30 14:07:51 2018 +0400
committer Ilya Bumarskov <ibumarskov@mirantis.com> Tue Oct 30 12:13:03 2018 +0000
tree 906e79242d5f94c39a61bbe1a19234fc6c55ec9b
parent 8abdf7f0a36a4f95ef41e29bda85a9f7e69caf14

Add contrail related parameters

We should provide service name which we added in keystone catalog
and path to policy file which located in docker-ci-tempest docker
image.
Related-PROD: PROD-23947

Change-Id: Iba14c1cdfbaee846fd6477b7d060b06af34fe8d7

_modules/runtest/tempest_sections/patrole_plugin.py

diff --git a/_modules/runtest/tempest_sections/patrole_plugin.py b/_modules/runtest/tempest_sections/patrole_plugin.py
index 8276169..f74284b 100644
--- a/_modules/runtest/tempest_sections/patrole_plugin.py
+++ b/_modules/runtest/tempest_sections/patrole_plugin.py
@@ -25,7 +25,12 @@
 
     @property
     def custom_policy_files(self):
-        pass
+        contrail_enabled = conditions.BaseRule('opencontrail.control.enabled',
+                                               'eq', True, multiple='any')
+        if contrail_enabled:
+            return '/etc/opencontrail/policy.json'
+        else:
+            pass
 
     @property
     def test_custom_requirements(self):

_modules/runtest/tempest_sections/tungsten_plugin.py

diff --git a/_modules/runtest/tempest_sections/tungsten_plugin.py b/_modules/runtest/tempest_sections/tungsten_plugin.py
index 513bc8d..8b477ae 100644
--- a/_modules/runtest/tempest_sections/tungsten_plugin.py
+++ b/_modules/runtest/tempest_sections/tungsten_plugin.py
@@ -8,11 +8,16 @@
 
     name = "sdn"
     options = [
+        'service_name',
         'endpoint_type',
         'catalog_type',
     ]
 
     @property
+    def service_name(self):
+        return 'opencontrail'
+
+    @property
     def endpoint_type(self):
         return 'internal'