commit 345afba04251e5e553c58f98bca2551f8bf76247
author Oleksii Butenko <obutenko@mirantis.com> Wed Apr 25 17:57:37 2018 +0300
committer Oleksii Butenko <obutenko@mirantis.com> Wed Apr 25 17:57:42 2018 +0300
tree 25c1ca10d5611167a4da5071fb04978bf3254d22
parent 34de9eabb208ebe8b1886dffa561a958b2576812

Set Swift = true for radosgw

We have model with ceph and radosgw, so
we need unskip tempest.api.object_storage.* tests

Change-Id: I5bed1acd04b2e3a81d94f3f82b1b499ef85d7839

_modules/runtest/tempest_sections/service_available.py

diff --git a/_modules/runtest/tempest_sections/service_available.py b/_modules/runtest/tempest_sections/service_available.py
index 64fd929..a205f53 100644
--- a/_modules/runtest/tempest_sections/service_available.py
+++ b/_modules/runtest/tempest_sections/service_available.py
@@ -1,5 +1,6 @@
-
 import base_section
+from runtest import conditions
+
 
 class ServiceAvailable(base_section.BaseSection):
 
@@ -24,8 +25,6 @@
         'keystone',
     ]
 
-
-
     def _is_service_enabled(self, service):
         """Check if service is enabled in specific environment.
 
@@ -106,7 +105,12 @@
 
     @property
     def swift(self):
-        return self._is_service_enabled('swift')
+        radosgw = conditions.BaseRule('*.ceph.radosgw.enabled', 'eq',
+                                      True).check(self.pillar)
+        if radosgw:
+            return True
+        else:
+            return self._is_service_enabled('swift')
 
     @property
     def horizon(self):
@@ -114,4 +118,4 @@
 
     @property
     def keystone(self):
-        return self._is_service_enabled('keystone')
\ No newline at end of file
+        return self._is_service_enabled('keystone')