Merge "Add skip_checks"

cyborg_tempest_plugin/tests/api/base.py

@@ -32,6 +32,12 @@ class BaseAPITest(test.BaseTestCase):
 
     # client_manager = cyborgclient.Manager
 
+    @classmethod
+    def skip_checks(cls):
+        super(BaseAPITest, cls).skip_checks()
+        if not CONF.service_available.cyborg:
+            raise cls.skipException('Cyborg support is required')
+
     @classmethod
     def setup_clients(cls):
         super(BaseAPITest, cls).setup_clients()

cyborg_tempest_plugin/tests/api/test_accelerator_request.py

@@ -18,6 +18,10 @@ from cyborg_tempest_plugin.tests.api import base
 
 class TestAcceleratorRequestController(base.BaseAPITest):
 
+    @classmethod
+    def skip_checks(cls):
+        super(TestAcceleratorRequestController, cls).skip_checks()
+
     credentials = ['admin']
 
     def test_create_accelerator_request(self):

cyborg_tempest_plugin/tests/api/test_accelerator_request_negative.py

@@ -22,6 +22,10 @@ from tempest import test
 
 class AcceleratorRequestNegativeTest(base.BaseAPITest):
 
+    @classmethod
+    def skip_checks(cls):
+        super(AcceleratorRequestNegativeTest, cls).skip_checks()
+
     credentials = ['admin']
 
     @test.attr(type=['negative', 'gate'])

cyborg_tempest_plugin/tests/api/test_deployable_negative.py

@@ -22,6 +22,10 @@ from tempest import test
 
 class DeployableNegativeTest(base.BaseAPITest):
 
+    @classmethod
+    def skip_checks(cls):
+        super(DeployableNegativeTest, cls).skip_checks()
+
     credentials = ['admin']
 
     @test.attr(type=['negative', 'gate'])

cyborg_tempest_plugin/tests/api/test_deployables.py

@@ -18,6 +18,10 @@ from cyborg_tempest_plugin.tests.api import base
 
 class TestDeployables(base.BaseAPITest):
 
+    @classmethod
+    def skip_checks(cls):
+        super(TestDeployables, cls).skip_checks()
+
     credentials = ['admin']
 
     def test_list_deployables(self):

cyborg_tempest_plugin/tests/api/test_device.py

@@ -18,6 +18,10 @@ from cyborg_tempest_plugin.tests.api import base
 
 class TestDevice(base.BaseAPITest):
 
+    @classmethod
+    def skip_checks(cls):
+        super(TestDevice, cls).skip_checks()
+
     credentials = ['admin']
 
     def test_list_get_device(self):

cyborg_tempest_plugin/tests/api/test_device_profile.py

@@ -19,6 +19,10 @@ from cyborg_tempest_plugin.tests.api import base
 
 class TestDeviceProfileController(base.BaseAPITest):
 
+    @classmethod
+    def skip_checks(cls):
+        super(TestDeviceProfileController, cls).skip_checks()
+
     credentials = ['admin']
 
     def test_create_device_profile(self):

cyborg_tempest_plugin/tests/api/test_device_profile_negative.py

@@ -22,6 +22,10 @@ from tempest import test
 
 class DeviceProfileNegativeTest(base.BaseAPITest):
 
+    @classmethod
+    def skip_checks(cls):
+        super(DeviceProfileNegativeTest, cls).skip_checks()
+
     credentials = ['admin']
 
     @test.attr(type=['negative', 'gate'])

cyborg_tempest_plugin/tests/scenario/manager.py

@@ -39,6 +39,12 @@ class ScenarioTest(tempest.test.BaseTestCase):
 
     credentials = ['primary', 'admin']
 
+    @classmethod
+    def skip_checks(cls):
+        super(ScenarioTest, cls).skip_checks()
+        if not CONF.service_available.cyborg:
+            raise cls.skipException('Cyborg support is required')
+
     @classmethod
     def setup_clients(cls):
         super(ScenarioTest, cls).setup_clients()

cyborg_tempest_plugin/tests/scenario/test_accelerator_basic_ops.py

@@ -37,6 +37,10 @@ class TestServerBasicOps(manager.ScenarioTest):
 
     """
 
+    @classmethod
+    def skip_checks(cls):
+        super(TestServerBasicOps, cls).skip_checks()
+
     def setUp(self):
         super(TestServerBasicOps, self).setUp()