commit 158c1e0ef2607249df378ff840374a46bb471ed0
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Feb 07 07:57:25 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Feb 07 07:57:25 2019 +0000
tree bdcefccf46a80050c5489ab560bae5cc55951135
parent 63fcb96f7bd4a1f5595b081c4de11e678d85bf32
parent 9a19d0172469395a1d1ff89dd142feb51c9fd2a1

Merge "Add contrail_version parameter to tempest config"

_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 2b86029..7d52ac7 100644
--- a/_modules/runtest/tempest_sections/tungsten_plugin.py
+++ b/_modules/runtest/tempest_sections/tungsten_plugin.py
@@ -11,6 +11,7 @@
         'service_name',
         'endpoint_type',
         'catalog_type',
+        'contrail_version',
     ]
 
     @property
@@ -29,5 +30,12 @@
             c = conditions.BaseRule('keystone.client.enabled', 'eq', True)
             return self.get_item_when_condition_match(
                 'keystone.client.server.identity.service.opencontrail.type', c)
-        else:
-            pass
+
+    @property
+    def contrail_version(self):
+        contrail_enabled = conditions.BaseRule('*.opencontrail.control.enabled',
+                                               'eq', True, multiple='any')
+        if contrail_enabled.check(self.pillar):
+            c = conditions.BaseRule('opencontrail.control.enabled', 'eq', True)
+            return self.get_item_when_condition_match(
+                'opencontrail.control.version', c)