Use skip_checks to define class level skip condition
check_preconditions() method is no longer available in tempest. So, this commit is to use skip_checks to define class level skip conditions Closes-Bug:#1517329 Change-Id: I5d09da7416c040c57731cc8ea3ab519111834fab
This commit is contained in:
parent
3ab38f5ebe
commit
c3204061a8
|
@ -31,15 +31,15 @@ LOG = logging.getLogger(__name__)
|
|||
class TestCeilometerDriver(manager_congress.ScenarioPolicyBase):
|
||||
|
||||
@classmethod
|
||||
def check_preconditions(cls):
|
||||
super(TestCeilometerDriver, cls).check_preconditions()
|
||||
|
||||
def setUp(cls):
|
||||
super(TestCeilometerDriver, cls).setUp()
|
||||
def skip_checks(cls):
|
||||
super(TestCeilometerDriver, cls).skip_checks()
|
||||
if not CONF.service_available.ceilometer:
|
||||
msg = ("%s skipped as ceilometer is not available" %
|
||||
cls.__class__.__name__)
|
||||
raise cls.skipException(msg)
|
||||
|
||||
def setUp(cls):
|
||||
super(TestCeilometerDriver, cls).setUp()
|
||||
cls.os = clients.Manager(cls.admin_manager.auth_provider.credentials)
|
||||
cls.telemetry_client = cls.os.telemetry_client
|
||||
cls.datasource_id = manager_congress.get_datasource_id(
|
||||
|
|
|
@ -31,8 +31,8 @@ LOG = logging.getLogger(__name__)
|
|||
class TestCinderDriver(manager_congress.ScenarioPolicyBase):
|
||||
|
||||
@classmethod
|
||||
def check_preconditions(cls):
|
||||
super(TestCinderDriver, cls).check_preconditions()
|
||||
def skip_checks(cls):
|
||||
super(TestCinderDriver, cls).skip_checks()
|
||||
if not (CONF.network.tenant_networks_reachable or
|
||||
CONF.network.public_network_id):
|
||||
msg = ('Either tenant_networks_reachable must be "true", or'
|
||||
|
@ -40,6 +40,10 @@ class TestCinderDriver(manager_congress.ScenarioPolicyBase):
|
|||
cls.enabled = False
|
||||
raise cls.skipException(msg)
|
||||
|
||||
if not CONF.service_available.cinder:
|
||||
skip_msg = ("%s skipped as cinder is not available" % cls.__name__)
|
||||
raise cls.skipException(skip_msg)
|
||||
|
||||
def setUp(cls):
|
||||
super(TestCinderDriver, cls).setUp()
|
||||
cls.os = clients.Manager(cls.admin_manager.auth_provider.credentials)
|
||||
|
|
|
@ -28,20 +28,21 @@ LOG = logging.getLogger(__name__)
|
|||
class TestGlanceV2Driver(manager_congress.ScenarioPolicyBase):
|
||||
|
||||
@classmethod
|
||||
def check_preconditions(cls):
|
||||
super(TestGlanceV2Driver, cls).check_preconditions()
|
||||
if not (CONF.network.tenant_networks_reachable or
|
||||
CONF.network.public_network_id):
|
||||
def skip_checks(cls):
|
||||
super(TestGlanceV2Driver, cls).skip_checks()
|
||||
if not (CONF.network.tenant_networks_reachable
|
||||
or CONF.network.public_network_id):
|
||||
msg = ('Either tenant_networks_reachable must be "true", or '
|
||||
'public_network_id must be defined.')
|
||||
cls.enabled = False
|
||||
raise cls.skipException(msg)
|
||||
|
||||
def setUp(cls):
|
||||
super(TestGlanceV2Driver, cls).setUp()
|
||||
if not CONF.service_available.glance:
|
||||
skip_msg = ("%s skipped as glance is not available" % cls.__name__)
|
||||
raise cls.skipException(skip_msg)
|
||||
|
||||
def setUp(cls):
|
||||
super(TestGlanceV2Driver, cls).setUp()
|
||||
cls.os = clients.Manager(cls.admin_manager.auth_provider.credentials)
|
||||
cls.glancev2 = cls.os.image_client_v2
|
||||
cls.datasource_id = manager_congress.get_datasource_id(
|
||||
|
|
|
@ -30,8 +30,8 @@ LOG = logging.getLogger(__name__)
|
|||
class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
|
||||
|
||||
@classmethod
|
||||
def check_preconditions(cls):
|
||||
super(TestKeystoneV2Driver, cls).check_preconditions()
|
||||
def skip_checks(cls):
|
||||
super(TestKeystoneV2Driver, cls).skip_checks()
|
||||
if not (CONF.network.tenant_networks_reachable or
|
||||
CONF.network.public_network_id):
|
||||
msg = ('Either tenant_networks_reachable must be "true", or'
|
||||
|
|
|
@ -27,8 +27,8 @@ CONF = config.CONF
|
|||
class TestMuranoDriver(manager_congress.ScenarioPolicyBase):
|
||||
|
||||
@classmethod
|
||||
def check_preconditions(cls):
|
||||
super(TestMuranoDriver, cls).check_preconditions()
|
||||
def skip_checks(cls):
|
||||
super(TestMuranoDriver, cls).skip_checks()
|
||||
if not (CONF.network.tenant_networks_reachable
|
||||
or CONF.network.public_network_id):
|
||||
msg = ('Either tenant_networks_reachable must be "true", or '
|
||||
|
|
|
@ -31,8 +31,8 @@ LOG = logging.getLogger(__name__)
|
|||
class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
|
||||
|
||||
@classmethod
|
||||
def check_preconditions(cls):
|
||||
super(TestNeutronV2Driver, cls).check_preconditions()
|
||||
def skip_checks(cls):
|
||||
super(TestNeutronV2Driver, cls).skip_checks()
|
||||
if not (CONF.network.tenant_networks_reachable
|
||||
or CONF.network.public_network_id):
|
||||
msg = ('Either tenant_networks_reachable must be "true", or '
|
||||
|
@ -40,12 +40,13 @@ class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
|
|||
cls.enabled = False
|
||||
raise cls.skipException(msg)
|
||||
|
||||
def setUp(cls):
|
||||
super(TestNeutronV2Driver, cls).setUp()
|
||||
if not CONF.service_available.neutron:
|
||||
skip_msg = ("%s skipped as neutron is not available"
|
||||
% cls.__name__)
|
||||
raise cls.skipException(skip_msg)
|
||||
|
||||
def setUp(cls):
|
||||
super(TestNeutronV2Driver, cls).setUp()
|
||||
cls.os = clients.Manager(cls.admin_manager.auth_provider.credentials)
|
||||
cls.neutron_client = cls.os.network_client
|
||||
cls.datasource_id = manager_congress.get_datasource_id(
|
||||
|
|
|
@ -29,8 +29,12 @@ LOG = logging.getLogger(__name__)
|
|||
class TestNovaDriver(manager_congress.ScenarioPolicyBase):
|
||||
|
||||
@classmethod
|
||||
def check_preconditions(cls):
|
||||
super(TestNovaDriver, cls).check_preconditions()
|
||||
def skip_checks(cls):
|
||||
super(TestNovaDriver, cls).skip_checks()
|
||||
if not CONF.service_available.nova:
|
||||
skip_msg = ("%s skipped as nova is not available" % cls.__name__)
|
||||
raise cls.skipException(skip_msg)
|
||||
|
||||
if not (CONF.network.tenant_networks_reachable
|
||||
or CONF.network.public_network_id):
|
||||
msg = ('Either tenant_networks_reachable must be "true", or '
|
||||
|
|
|
@ -35,8 +35,8 @@ LOG = logging.getLogger(__name__)
|
|||
class TestPolicyBasicOps(manager_congress.ScenarioPolicyBase):
|
||||
|
||||
@classmethod
|
||||
def check_preconditions(cls):
|
||||
super(TestPolicyBasicOps, cls).check_preconditions()
|
||||
def skip_checks(cls):
|
||||
super(TestPolicyBasicOps, cls).skip_checks()
|
||||
if not (CONF.network.tenant_networks_reachable
|
||||
or CONF.network.public_network_id):
|
||||
msg = ('Either tenant_networks_reachable must be "true", or '
|
||||
|
@ -191,8 +191,8 @@ class TestPolicyBasicOps(manager_congress.ScenarioPolicyBase):
|
|||
class TestCongressDataSources(manager_congress.ScenarioPolicyBase):
|
||||
|
||||
@classmethod
|
||||
def check_preconditions(cls):
|
||||
super(TestCongressDataSources, cls).check_preconditions()
|
||||
def skip_checks(cls):
|
||||
super(TestCongressDataSources, cls).skip_checks()
|
||||
if not (CONF.network.tenant_networks_reachable
|
||||
or CONF.network.public_network_id):
|
||||
msg = ('Either tenant_networks_reachable must be "true", or '
|
||||
|
|
Loading…
Reference in New Issue