Merge "Do not create network resources for API tests"
diff --git a/designate_tempest_plugin/tests/api/admin/test_quotas.py b/designate_tempest_plugin/tests/api/admin/test_quotas.py
index 59e2dbe..c25ad0a 100644
--- a/designate_tempest_plugin/tests/api/admin/test_quotas.py
+++ b/designate_tempest_plugin/tests/api/admin/test_quotas.py
@@ -37,6 +37,12 @@
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()
diff --git a/designate_tempest_plugin/tests/api/v1/test_domains.py b/designate_tempest_plugin/tests/api/v1/test_domains.py
index d3de5f8..31d4bbd 100644
--- a/designate_tempest_plugin/tests/api/v1/test_domains.py
+++ b/designate_tempest_plugin/tests/api/v1/test_domains.py
@@ -24,6 +24,12 @@
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()
diff --git a/designate_tempest_plugin/tests/api/v1/test_records.py b/designate_tempest_plugin/tests/api/v1/test_records.py
index 34e74cf..e678c3f 100644
--- a/designate_tempest_plugin/tests/api/v1/test_records.py
+++ b/designate_tempest_plugin/tests/api/v1/test_records.py
@@ -23,6 +23,12 @@
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()
diff --git a/designate_tempest_plugin/tests/api/v1/test_servers.py b/designate_tempest_plugin/tests/api/v1/test_servers.py
index fb6aed1..9092b58 100644
--- a/designate_tempest_plugin/tests/api/v1/test_servers.py
+++ b/designate_tempest_plugin/tests/api/v1/test_servers.py
@@ -33,6 +33,12 @@
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()
diff --git a/designate_tempest_plugin/tests/api/v2/test_blacklists.py b/designate_tempest_plugin/tests/api/v2/test_blacklists.py
index 01d4f0c..65b6dff 100644
--- a/designate_tempest_plugin/tests/api/v2/test_blacklists.py
+++ b/designate_tempest_plugin/tests/api/v2/test_blacklists.py
@@ -31,6 +31,12 @@
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()
cls.admin_client = cls.os_admin.blacklists_client
@@ -109,6 +115,12 @@
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()
cls.admin_client = cls.os_admin.blacklists_client
@@ -146,6 +158,12 @@
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()
cls.admin_client = cls.os_admin.blacklists_client
diff --git a/designate_tempest_plugin/tests/api/v2/test_pool.py b/designate_tempest_plugin/tests/api/v2/test_pool.py
index 467abe3..d127006 100644
--- a/designate_tempest_plugin/tests/api/v2/test_pool.py
+++ b/designate_tempest_plugin/tests/api/v2/test_pool.py
@@ -37,6 +37,12 @@
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()
@@ -122,6 +128,12 @@
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()
cls.admin_client = cls.os_admin.pool_client
@@ -159,6 +171,12 @@
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()
cls.admin_client = cls.os_admin.pool_client
diff --git a/designate_tempest_plugin/tests/api/v2/test_quotas.py b/designate_tempest_plugin/tests/api/v2/test_quotas.py
index 254e4b5..b32591f 100644
--- a/designate_tempest_plugin/tests/api/v2/test_quotas.py
+++ b/designate_tempest_plugin/tests/api/v2/test_quotas.py
@@ -29,6 +29,12 @@
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()
diff --git a/designate_tempest_plugin/tests/api/v2/test_recordset.py b/designate_tempest_plugin/tests/api/v2/test_recordset.py
index 8e7a49f..be06b54 100644
--- a/designate_tempest_plugin/tests/api/v2/test_recordset.py
+++ b/designate_tempest_plugin/tests/api/v2/test_recordset.py
@@ -49,6 +49,12 @@
@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()
@@ -202,6 +208,12 @@
@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 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):
@@ -394,6 +411,12 @@
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()
diff --git a/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py b/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py
index b4b4c69..e95ab4b 100644
--- a/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py
+++ b/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py
@@ -42,6 +42,12 @@
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()
diff --git a/designate_tempest_plugin/tests/api/v2/test_tld.py b/designate_tempest_plugin/tests/api/v2/test_tld.py
index d3f6fc3..380d224 100644
--- a/designate_tempest_plugin/tests/api/v2/test_tld.py
+++ b/designate_tempest_plugin/tests/api/v2/test_tld.py
@@ -30,6 +30,12 @@
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()
cls.admin_client = cls.os_admin.tld_client
@@ -120,6 +126,12 @@
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()
cls.admin_client = cls.os_admin.tld_client
@@ -157,6 +169,12 @@
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()
cls.admin_client = cls.os_admin.tld_client
diff --git a/designate_tempest_plugin/tests/api/v2/test_transfer_accepts.py b/designate_tempest_plugin/tests/api/v2/test_transfer_accepts.py
index c8e6ed8..28e687f 100644
--- a/designate_tempest_plugin/tests/api/v2/test_transfer_accepts.py
+++ b/designate_tempest_plugin/tests/api/v2/test_transfer_accepts.py
@@ -26,6 +26,12 @@
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()
diff --git a/designate_tempest_plugin/tests/api/v2/test_transfer_request.py b/designate_tempest_plugin/tests/api/v2/test_transfer_request.py
index b091a43..80a0e4a 100644
--- a/designate_tempest_plugin/tests/api/v2/test_transfer_request.py
+++ b/designate_tempest_plugin/tests/api/v2/test_transfer_request.py
@@ -30,6 +30,12 @@
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()
@@ -192,6 +198,12 @@
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()
cls.client = cls.os_primary.transfer_request_client
@@ -228,6 +240,12 @@
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()
cls.client = cls.os_primary.transfer_request_client
diff --git a/designate_tempest_plugin/tests/api/v2/test_tsigkey.py b/designate_tempest_plugin/tests/api/v2/test_tsigkey.py
index cb3bef3..a09cabb 100644
--- a/designate_tempest_plugin/tests/api/v2/test_tsigkey.py
+++ b/designate_tempest_plugin/tests/api/v2/test_tsigkey.py
@@ -30,6 +30,12 @@
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()
cls.zone_client = cls.os_primary.zones_client
@@ -137,6 +143,12 @@
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()
cls.admin_client = cls.os_admin.tsigkey_client
@@ -174,6 +186,12 @@
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()
cls.admin_client = cls.os_admin.tsigkey_client
diff --git a/designate_tempest_plugin/tests/api/v2/test_unauthed.py b/designate_tempest_plugin/tests/api/v2/test_unauthed.py
index ace676e..aaf8043 100644
--- a/designate_tempest_plugin/tests/api/v2/test_unauthed.py
+++ b/designate_tempest_plugin/tests/api/v2/test_unauthed.py
@@ -29,6 +29,12 @@
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()
cls.zones_client = cls.os_primary.zones_client
diff --git a/designate_tempest_plugin/tests/api/v2/test_zones.py b/designate_tempest_plugin/tests/api/v2/test_zones.py
index bf65c19..74b297a 100644
--- a/designate_tempest_plugin/tests/api/v2/test_zones.py
+++ b/designate_tempest_plugin/tests/api/v2/test_zones.py
@@ -29,6 +29,12 @@
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()
@@ -116,6 +122,12 @@
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()
@@ -140,6 +152,12 @@
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()
diff --git a/designate_tempest_plugin/tests/api/v2/test_zones_exports.py b/designate_tempest_plugin/tests/api/v2/test_zones_exports.py
index cb6df40..881f15c 100644
--- a/designate_tempest_plugin/tests/api/v2/test_zones_exports.py
+++ b/designate_tempest_plugin/tests/api/v2/test_zones_exports.py
@@ -28,6 +28,12 @@
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()
diff --git a/designate_tempest_plugin/tests/api/v2/test_zones_imports.py b/designate_tempest_plugin/tests/api/v2/test_zones_imports.py
index 94c2226..d54551e 100644
--- a/designate_tempest_plugin/tests/api/v2/test_zones_imports.py
+++ b/designate_tempest_plugin/tests/api/v2/test_zones_imports.py
@@ -28,6 +28,12 @@
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()
cls.client = cls.os_primary.zone_imports_client
diff --git a/designate_tempest_plugin/tests/base.py b/designate_tempest_plugin/tests/base.py
index f946faf..e411597 100644
--- a/designate_tempest_plugin/tests/base.py
+++ b/designate_tempest_plugin/tests/base.py
@@ -75,12 +75,6 @@
% 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: