Do not create network resources for API tests
We need to call set_network_resources() from class with API tests, to avoid creating network resources. Which are not needed for API tests. Change-Id: Ia93303390d9887722fa2cfde7757e5e9103ae585 Closes-Bug: #1689415
This commit is contained in:
parent
48b08be4a2
commit
f015ecb1de
|
@ -36,6 +36,12 @@ class QuotasAdminTest(BaseQuotasTest):
|
|||
|
||||
credentials = ["admin"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(QuotasAdminTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(QuotasAdminTest, cls).setup_clients()
|
||||
|
|
|
@ -23,6 +23,12 @@ from designate_tempest_plugin.tests import base
|
|||
|
||||
|
||||
class DnsDomainsTest(base.BaseDnsV1Test):
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(DnsDomainsTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(DnsDomainsTest, cls).setup_clients()
|
||||
|
|
|
@ -22,6 +22,12 @@ from designate_tempest_plugin.tests import base
|
|||
|
||||
|
||||
class RecordsTest(base.BaseDnsV1Test):
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(RecordsTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(RecordsTest, cls).setup_clients()
|
||||
|
|
|
@ -32,6 +32,12 @@ class ServersAdminTest(base.BaseDnsV1Test):
|
|||
"""
|
||||
credentials = ['admin']
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(ServersAdminTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ServersAdminTest, cls).setup_clients()
|
||||
|
|
|
@ -30,6 +30,12 @@ class BlacklistsAdminTest(BaseBlacklistsTest):
|
|||
|
||||
credentials = ["admin"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(BlacklistsAdminTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(BlacklistsAdminTest, cls).setup_clients()
|
||||
|
@ -108,6 +114,12 @@ class TestBlacklistNotFoundAdmin(BaseBlacklistsTest):
|
|||
|
||||
credentials = ["admin"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestBlacklistNotFoundAdmin, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestBlacklistNotFoundAdmin, cls).setup_clients()
|
||||
|
@ -145,6 +157,12 @@ class TestBlacklistInvalidIdAdmin(BaseBlacklistsTest):
|
|||
|
||||
credentials = ["admin"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestBlacklistInvalidIdAdmin, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestBlacklistInvalidIdAdmin, cls).setup_clients()
|
||||
|
|
|
@ -36,6 +36,12 @@ class BasePoolTest(base.BaseDnsV2Test):
|
|||
class PoolAdminTest(BasePoolTest):
|
||||
credentials = ['admin']
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(PoolAdminTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(PoolAdminTest, cls).setup_clients()
|
||||
|
@ -121,6 +127,12 @@ class TestPoolNotFoundAdmin(BasePoolTest):
|
|||
|
||||
credentials = ["admin"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestPoolNotFoundAdmin, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestPoolNotFoundAdmin, cls).setup_clients()
|
||||
|
@ -158,6 +170,12 @@ class TestPoolInvalidIdAdmin(BasePoolTest):
|
|||
|
||||
credentials = ["admin"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestPoolInvalidIdAdmin, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestPoolInvalidIdAdmin, cls).setup_clients()
|
||||
|
|
|
@ -28,6 +28,12 @@ class QuotasV2Test(base.BaseDnsV2Test):
|
|||
|
||||
credentials = ['primary', 'admin']
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(QuotasV2Test, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def skip_checks(cls):
|
||||
super(QuotasV2Test, cls).skip_checks()
|
||||
|
|
|
@ -48,6 +48,12 @@ class BaseRecordsetsTest(base.BaseDnsV2Test):
|
|||
|
||||
@ddt.ddt
|
||||
class RecordsetsTest(BaseRecordsetsTest):
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(RecordsetsTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(RecordsetsTest, cls).setup_clients()
|
||||
|
@ -201,6 +207,12 @@ class RecordsetsTest(BaseRecordsetsTest):
|
|||
|
||||
@ddt.ddt
|
||||
class RecordsetsNegativeTest(BaseRecordsetsTest):
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(RecordsetsNegativeTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(RecordsetsNegativeTest, cls).setup_clients()
|
||||
|
@ -300,6 +312,11 @@ class RecordsetsNegativeTest(BaseRecordsetsTest):
|
|||
|
||||
|
||||
class RootRecordsetsTests(BaseRecordsetsTest):
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(RootRecordsetsTests, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
|
@ -393,6 +410,12 @@ class RecordsetOwnershipTest(BaseRecordsetsTest):
|
|||
|
||||
credentials = ['primary', 'alt']
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(RecordsetOwnershipTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(RecordsetOwnershipTest, cls).setup_clients()
|
||||
|
|
|
@ -41,6 +41,12 @@ class RecordsetValidationTest(base.BaseDnsV2Test):
|
|||
super(RecordsetValidationTest, self).setUp()
|
||||
self._zone = None
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(RecordsetValidationTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(RecordsetValidationTest, cls).setup_clients()
|
||||
|
|
|
@ -29,6 +29,12 @@ class BaseTldTest(base.BaseDnsV2Test):
|
|||
class TldAdminTest(BaseTldTest):
|
||||
credentials = ['admin']
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TldAdminTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TldAdminTest, cls).setup_clients()
|
||||
|
@ -119,6 +125,12 @@ class TestTldNotFoundAdmin(BaseTldTest):
|
|||
|
||||
credentials = ["admin"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestTldNotFoundAdmin, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestTldNotFoundAdmin, cls).setup_clients()
|
||||
|
@ -156,6 +168,12 @@ class TestTldInvalidIdAdmin(BaseTldTest):
|
|||
|
||||
credentials = ["admin"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestTldInvalidIdAdmin, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestTldInvalidIdAdmin, cls).setup_clients()
|
||||
|
|
|
@ -25,6 +25,12 @@ class BaseTransferAcceptTest(base.BaseDnsV2Test):
|
|||
|
||||
|
||||
class TransferAcceptTest(BaseTransferAcceptTest):
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TransferAcceptTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TransferAcceptTest, cls).setup_clients()
|
||||
|
|
|
@ -29,6 +29,12 @@ class BaseTransferRequestTest(base.BaseDnsV2Test):
|
|||
class TransferRequestTest(BaseTransferRequestTest):
|
||||
credentials = ['primary', 'alt']
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TransferRequestTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TransferRequestTest, cls).setup_clients()
|
||||
|
@ -191,6 +197,12 @@ class TransferRequestTest(BaseTransferRequestTest):
|
|||
|
||||
class TestTransferRequestNotFound(BaseTransferRequestTest):
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestTransferRequestNotFound, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestTransferRequestNotFound, cls).setup_clients()
|
||||
|
@ -227,6 +239,12 @@ class TestTransferRequestNotFound(BaseTransferRequestTest):
|
|||
|
||||
class TestTransferRequestInvalidId(BaseTransferRequestTest):
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestTransferRequestInvalidId, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestTransferRequestInvalidId, cls).setup_clients()
|
||||
|
|
|
@ -29,6 +29,12 @@ class BaseTsigkeyTest(base.BaseDnsV2Test):
|
|||
class TsigkeyAdminTest(BaseTsigkeyTest):
|
||||
credentials = ['primary', 'admin']
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TsigkeyAdminTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TsigkeyAdminTest, cls).setup_clients()
|
||||
|
@ -136,6 +142,12 @@ class TestTsigkeyNotFoundAdmin(BaseTsigkeyTest):
|
|||
|
||||
credentials = ["admin"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestTsigkeyNotFoundAdmin, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestTsigkeyNotFoundAdmin, cls).setup_clients()
|
||||
|
@ -173,6 +185,12 @@ class TestTsigkeyInvalidIdAdmin(BaseTsigkeyTest):
|
|||
|
||||
credentials = ["admin"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestTsigkeyInvalidIdAdmin, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestTsigkeyInvalidIdAdmin, cls).setup_clients()
|
||||
|
|
|
@ -28,6 +28,12 @@ class TestDnsUnauthed(base.BaseDnsV2Test):
|
|||
client_manager = clients.ManagerV2Unauthed
|
||||
credentials = ["primary"]
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(TestDnsUnauthed, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(TestDnsUnauthed, cls).setup_clients()
|
||||
|
|
|
@ -28,6 +28,12 @@ class BaseZonesTest(base.BaseDnsV2Test):
|
|||
|
||||
|
||||
class ZonesTest(BaseZonesTest):
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(ZonesTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ZonesTest, cls).setup_clients()
|
||||
|
@ -115,6 +121,12 @@ class ZonesTest(BaseZonesTest):
|
|||
class ZonesAdminTest(BaseZonesTest):
|
||||
credentials = ['primary', 'admin']
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(ZonesAdminTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ZonesAdminTest, cls).setup_clients()
|
||||
|
@ -139,6 +151,12 @@ class ZonesAdminTest(BaseZonesTest):
|
|||
class ZoneOwnershipTest(BaseZonesTest):
|
||||
credentials = ['primary', 'alt']
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(ZoneOwnershipTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ZoneOwnershipTest, cls).setup_clients()
|
||||
|
|
|
@ -27,6 +27,12 @@ class BaseZoneExportsTest(base.BaseDnsV2Test):
|
|||
|
||||
|
||||
class ZonesExportTest(BaseZoneExportsTest):
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(ZonesExportTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ZonesExportTest, cls).setup_clients()
|
||||
|
|
|
@ -27,6 +27,12 @@ class BaseZonesImportTest(base.BaseDnsV2Test):
|
|||
|
||||
|
||||
class ZonesImportTest(BaseZonesImportTest):
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(ZonesImportTest, cls).setup_credentials()
|
||||
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ZonesImportTest, cls).setup_clients()
|
||||
|
|
|
@ -75,12 +75,6 @@ class BaseDnsTest(test.BaseTestCase):
|
|||
% cls.__name__)
|
||||
raise cls.skipException(skip_msg)
|
||||
|
||||
@classmethod
|
||||
def setup_credentials(cls):
|
||||
# Do not create network resources for these test.
|
||||
cls.set_network_resources()
|
||||
super(BaseDnsTest, cls).setup_credentials()
|
||||
|
||||
def assertExpected(self, expected, actual, excluded_keys):
|
||||
for key, value in six.iteritems(expected):
|
||||
if key not in excluded_keys:
|
||||
|
|
Loading…
Reference in New Issue