Add contrail_version parameter to tempest config
According to upstream changes it's necessary to add a contrail
version parameter to prevent execution of unsupported tests.
Links:
https://github.com/tungstenfabric/tungsten-tempest/commit/27d3adcc98903337067dc2744adb760e74fa2d2c
Change-Id: Ic567dc37e3af6fb90cbf0860111456383f717ea4
Related-PROD: PROD-27180 (PROD:27180)
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)