summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-03-16 08:41:02 +0000
committerGerrit Code Review <review@openstack.org>2018-03-16 08:41:02 +0000
commit8a3b02adbd377f289914558f014ac7bb482c13dd (patch)
treeca21183c72c84ca3c3f06ed952075edf9950806b
parent76317cde0da30b33a08628e63d3f9eb536bd10c7 (diff)
parentf015ecb1de60562103557f1fc2c4be1b0456ef07 (diff)
Merge "Do not create network resources for API tests"
-rw-r--r--designate_tempest_plugin/tests/api/admin/test_quotas.py6
-rw-r--r--designate_tempest_plugin/tests/api/v1/test_domains.py6
-rw-r--r--designate_tempest_plugin/tests/api/v1/test_records.py6
-rw-r--r--designate_tempest_plugin/tests/api/v1/test_servers.py6
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_blacklists.py18
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_pool.py18
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_quotas.py6
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_recordset.py23
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_recordset_validation.py6
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_tld.py18
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_transfer_accepts.py6
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_transfer_request.py18
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_tsigkey.py18
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_unauthed.py6
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_zones.py18
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_zones_exports.py6
-rw-r--r--designate_tempest_plugin/tests/api/v2/test_zones_imports.py6
-rw-r--r--designate_tempest_plugin/tests/base.py6
18 files changed, 191 insertions, 6 deletions
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 @@ class QuotasAdminTest(BaseQuotasTest):
37 credentials = ["admin"] 37 credentials = ["admin"]
38 38
39 @classmethod 39 @classmethod
40 def setup_credentials(cls):
41 # Do not create network resources for these test.
42 cls.set_network_resources()
43 super(QuotasAdminTest, cls).setup_credentials()
44
45 @classmethod
40 def setup_clients(cls): 46 def setup_clients(cls):
41 super(QuotasAdminTest, cls).setup_clients() 47 super(QuotasAdminTest, cls).setup_clients()
42 48
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 @@ from designate_tempest_plugin.tests import base
24 24
25class DnsDomainsTest(base.BaseDnsV1Test): 25class DnsDomainsTest(base.BaseDnsV1Test):
26 @classmethod 26 @classmethod
27 def setup_credentials(cls):
28 # Do not create network resources for these test.
29 cls.set_network_resources()
30 super(DnsDomainsTest, cls).setup_credentials()
31
32 @classmethod
27 def setup_clients(cls): 33 def setup_clients(cls):
28 super(DnsDomainsTest, cls).setup_clients() 34 super(DnsDomainsTest, cls).setup_clients()
29 35
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 @@ from designate_tempest_plugin.tests import base
23 23
24class RecordsTest(base.BaseDnsV1Test): 24class RecordsTest(base.BaseDnsV1Test):
25 @classmethod 25 @classmethod
26 def setup_credentials(cls):
27 # Do not create network resources for these test.
28 cls.set_network_resources()
29 super(RecordsTest, cls).setup_credentials()
30
31 @classmethod
26 def setup_clients(cls): 32 def setup_clients(cls):
27 super(RecordsTest, cls).setup_clients() 33 super(RecordsTest, cls).setup_clients()
28 34
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 @@ class ServersAdminTest(base.BaseDnsV1Test):
33 credentials = ['admin'] 33 credentials = ['admin']
34 34
35 @classmethod 35 @classmethod
36 def setup_credentials(cls):
37 # Do not create network resources for these test.
38 cls.set_network_resources()
39 super(ServersAdminTest, cls).setup_credentials()
40
41 @classmethod
36 def setup_clients(cls): 42 def setup_clients(cls):
37 super(ServersAdminTest, cls).setup_clients() 43 super(ServersAdminTest, cls).setup_clients()
38 44
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 @@ class BlacklistsAdminTest(BaseBlacklistsTest):
31 credentials = ["admin"] 31 credentials = ["admin"]
32 32
33 @classmethod 33 @classmethod
34 def setup_credentials(cls):
35 # Do not create network resources for these test.
36 cls.set_network_resources()
37 super(BlacklistsAdminTest, cls).setup_credentials()
38
39 @classmethod
34 def setup_clients(cls): 40 def setup_clients(cls):
35 super(BlacklistsAdminTest, cls).setup_clients() 41 super(BlacklistsAdminTest, cls).setup_clients()
36 cls.admin_client = cls.os_admin.blacklists_client 42 cls.admin_client = cls.os_admin.blacklists_client
@@ -109,6 +115,12 @@ class TestBlacklistNotFoundAdmin(BaseBlacklistsTest):
109 credentials = ["admin"] 115 credentials = ["admin"]
110 116
111 @classmethod 117 @classmethod
118 def setup_credentials(cls):
119 # Do not create network resources for these test.
120 cls.set_network_resources()
121 super(TestBlacklistNotFoundAdmin, cls).setup_credentials()
122
123 @classmethod
112 def setup_clients(cls): 124 def setup_clients(cls):
113 super(TestBlacklistNotFoundAdmin, cls).setup_clients() 125 super(TestBlacklistNotFoundAdmin, cls).setup_clients()
114 cls.admin_client = cls.os_admin.blacklists_client 126 cls.admin_client = cls.os_admin.blacklists_client
@@ -146,6 +158,12 @@ class TestBlacklistInvalidIdAdmin(BaseBlacklistsTest):
146 credentials = ["admin"] 158 credentials = ["admin"]
147 159
148 @classmethod 160 @classmethod
161 def setup_credentials(cls):
162 # Do not create network resources for these test.
163 cls.set_network_resources()
164 super(TestBlacklistInvalidIdAdmin, cls).setup_credentials()
165
166 @classmethod
149 def setup_clients(cls): 167 def setup_clients(cls):
150 super(TestBlacklistInvalidIdAdmin, cls).setup_clients() 168 super(TestBlacklistInvalidIdAdmin, cls).setup_clients()
151 cls.admin_client = cls.os_admin.blacklists_client 169 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 @@ class PoolAdminTest(BasePoolTest):
37 credentials = ['admin'] 37 credentials = ['admin']
38 38
39 @classmethod 39 @classmethod
40 def setup_credentials(cls):
41 # Do not create network resources for these test.
42 cls.set_network_resources()
43 super(PoolAdminTest, cls).setup_credentials()
44
45 @classmethod
40 def setup_clients(cls): 46 def setup_clients(cls):
41 super(PoolAdminTest, cls).setup_clients() 47 super(PoolAdminTest, cls).setup_clients()
42 48
@@ -122,6 +128,12 @@ class TestPoolNotFoundAdmin(BasePoolTest):
122 credentials = ["admin"] 128 credentials = ["admin"]
123 129
124 @classmethod 130 @classmethod
131 def setup_credentials(cls):
132 # Do not create network resources for these test.
133 cls.set_network_resources()
134 super(TestPoolNotFoundAdmin, cls).setup_credentials()
135
136 @classmethod
125 def setup_clients(cls): 137 def setup_clients(cls):
126 super(TestPoolNotFoundAdmin, cls).setup_clients() 138 super(TestPoolNotFoundAdmin, cls).setup_clients()
127 cls.admin_client = cls.os_admin.pool_client 139 cls.admin_client = cls.os_admin.pool_client
@@ -159,6 +171,12 @@ class TestPoolInvalidIdAdmin(BasePoolTest):
159 credentials = ["admin"] 171 credentials = ["admin"]
160 172
161 @classmethod 173 @classmethod
174 def setup_credentials(cls):
175 # Do not create network resources for these test.
176 cls.set_network_resources()
177 super(TestPoolInvalidIdAdmin, cls).setup_credentials()
178
179 @classmethod
162 def setup_clients(cls): 180 def setup_clients(cls):
163 super(TestPoolInvalidIdAdmin, cls).setup_clients() 181 super(TestPoolInvalidIdAdmin, cls).setup_clients()
164 cls.admin_client = cls.os_admin.pool_client 182 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 @@ class QuotasV2Test(base.BaseDnsV2Test):
29 credentials = ['primary', 'admin'] 29 credentials = ['primary', 'admin']
30 30
31 @classmethod 31 @classmethod
32 def setup_credentials(cls):
33 # Do not create network resources for these test.
34 cls.set_network_resources()
35 super(QuotasV2Test, cls).setup_credentials()
36
37 @classmethod
32 def skip_checks(cls): 38 def skip_checks(cls):
33 super(QuotasV2Test, cls).skip_checks() 39 super(QuotasV2Test, cls).skip_checks()
34 40
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 @@ class BaseRecordsetsTest(base.BaseDnsV2Test):
49@ddt.ddt 49@ddt.ddt
50class RecordsetsTest(BaseRecordsetsTest): 50class RecordsetsTest(BaseRecordsetsTest):
51 @classmethod 51 @classmethod
52 def setup_credentials(cls):
53 # Do not create network resources for these test.
54 cls.set_network_resources()
55 super(RecordsetsTest, cls).setup_credentials()
56
57 @classmethod
52 def setup_clients(cls): 58 def setup_clients(cls):
53 super(RecordsetsTest, cls).setup_clients() 59 super(RecordsetsTest, cls).setup_clients()
54 60
@@ -202,6 +208,12 @@ class RecordsetsTest(BaseRecordsetsTest):
202@ddt.ddt 208@ddt.ddt
203class RecordsetsNegativeTest(BaseRecordsetsTest): 209class RecordsetsNegativeTest(BaseRecordsetsTest):
204 @classmethod 210 @classmethod
211 def setup_credentials(cls):
212 # Do not create network resources for these test.
213 cls.set_network_resources()
214 super(RecordsetsNegativeTest, cls).setup_credentials()
215
216 @classmethod
205 def setup_clients(cls): 217 def setup_clients(cls):
206 super(RecordsetsNegativeTest, cls).setup_clients() 218 super(RecordsetsNegativeTest, cls).setup_clients()
207 219
@@ -300,6 +312,11 @@ class RecordsetsNegativeTest(BaseRecordsetsTest):
300 312
301 313
302class RootRecordsetsTests(BaseRecordsetsTest): 314class RootRecordsetsTests(BaseRecordsetsTest):
315 @classmethod
316 def setup_credentials(cls):
317 # Do not create network resources for these test.
318 cls.set_network_resources()
319 super(RootRecordsetsTests, cls).setup_credentials()
303 320
304 @classmethod 321 @classmethod
305 def setup_clients(cls): 322 def setup_clients(cls):
@@ -394,6 +411,12 @@ class RecordsetOwnershipTest(BaseRecordsetsTest):
394 credentials = ['primary', 'alt'] 411 credentials = ['primary', 'alt']
395 412
396 @classmethod 413 @classmethod
414 def setup_credentials(cls):
415 # Do not create network resources for these test.
416 cls.set_network_resources()
417 super(RecordsetOwnershipTest, cls).setup_credentials()
418
419 @classmethod
397 def setup_clients(cls): 420 def setup_clients(cls):
398 super(RecordsetOwnershipTest, cls).setup_clients() 421 super(RecordsetOwnershipTest, cls).setup_clients()
399 422
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 @@ class RecordsetValidationTest(base.BaseDnsV2Test):
42 self._zone = None 42 self._zone = None
43 43
44 @classmethod 44 @classmethod
45 def setup_credentials(cls):
46 # Do not create network resources for these test.
47 cls.set_network_resources()
48 super(RecordsetValidationTest, cls).setup_credentials()
49
50 @classmethod
45 def setup_clients(cls): 51 def setup_clients(cls):
46 super(RecordsetValidationTest, cls).setup_clients() 52 super(RecordsetValidationTest, cls).setup_clients()
47 53
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 @@ class TldAdminTest(BaseTldTest):
30 credentials = ['admin'] 30 credentials = ['admin']
31 31
32 @classmethod 32 @classmethod
33 def setup_credentials(cls):
34 # Do not create network resources for these test.
35 cls.set_network_resources()
36 super(TldAdminTest, cls).setup_credentials()
37
38 @classmethod
33 def setup_clients(cls): 39 def setup_clients(cls):
34 super(TldAdminTest, cls).setup_clients() 40 super(TldAdminTest, cls).setup_clients()
35 cls.admin_client = cls.os_admin.tld_client 41 cls.admin_client = cls.os_admin.tld_client
@@ -120,6 +126,12 @@ class TestTldNotFoundAdmin(BaseTldTest):
120 credentials = ["admin"] 126 credentials = ["admin"]
121 127
122 @classmethod 128 @classmethod
129 def setup_credentials(cls):
130 # Do not create network resources for these test.
131 cls.set_network_resources()
132 super(TestTldNotFoundAdmin, cls).setup_credentials()
133
134 @classmethod
123 def setup_clients(cls): 135 def setup_clients(cls):
124 super(TestTldNotFoundAdmin, cls).setup_clients() 136 super(TestTldNotFoundAdmin, cls).setup_clients()
125 cls.admin_client = cls.os_admin.tld_client 137 cls.admin_client = cls.os_admin.tld_client
@@ -157,6 +169,12 @@ class TestTldInvalidIdAdmin(BaseTldTest):
157 credentials = ["admin"] 169 credentials = ["admin"]
158 170
159 @classmethod 171 @classmethod
172 def setup_credentials(cls):
173 # Do not create network resources for these test.
174 cls.set_network_resources()
175 super(TestTldInvalidIdAdmin, cls).setup_credentials()
176
177 @classmethod
160 def setup_clients(cls): 178 def setup_clients(cls):
161 super(TestTldInvalidIdAdmin, cls).setup_clients() 179 super(TestTldInvalidIdAdmin, cls).setup_clients()
162 cls.admin_client = cls.os_admin.tld_client 180 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 BaseTransferAcceptTest(base.BaseDnsV2Test):
26 26
27class TransferAcceptTest(BaseTransferAcceptTest): 27class TransferAcceptTest(BaseTransferAcceptTest):
28 @classmethod 28 @classmethod
29 def setup_credentials(cls):
30 # Do not create network resources for these test.
31 cls.set_network_resources()
32 super(TransferAcceptTest, cls).setup_credentials()
33
34 @classmethod
29 def setup_clients(cls): 35 def setup_clients(cls):
30 super(TransferAcceptTest, cls).setup_clients() 36 super(TransferAcceptTest, cls).setup_clients()
31 37
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 @@ class TransferRequestTest(BaseTransferRequestTest):
30 credentials = ['primary', 'alt'] 30 credentials = ['primary', 'alt']
31 31
32 @classmethod 32 @classmethod
33 def setup_credentials(cls):
34 # Do not create network resources for these test.
35 cls.set_network_resources()
36 super(TransferRequestTest, cls).setup_credentials()
37
38 @classmethod
33 def setup_clients(cls): 39 def setup_clients(cls):
34 super(TransferRequestTest, cls).setup_clients() 40 super(TransferRequestTest, cls).setup_clients()
35 41
@@ -192,6 +198,12 @@ class TransferRequestTest(BaseTransferRequestTest):
192class TestTransferRequestNotFound(BaseTransferRequestTest): 198class TestTransferRequestNotFound(BaseTransferRequestTest):
193 199
194 @classmethod 200 @classmethod
201 def setup_credentials(cls):
202 # Do not create network resources for these test.
203 cls.set_network_resources()
204 super(TestTransferRequestNotFound, cls).setup_credentials()
205
206 @classmethod
195 def setup_clients(cls): 207 def setup_clients(cls):
196 super(TestTransferRequestNotFound, cls).setup_clients() 208 super(TestTransferRequestNotFound, cls).setup_clients()
197 cls.client = cls.os_primary.transfer_request_client 209 cls.client = cls.os_primary.transfer_request_client
@@ -228,6 +240,12 @@ class TestTransferRequestNotFound(BaseTransferRequestTest):
228class TestTransferRequestInvalidId(BaseTransferRequestTest): 240class TestTransferRequestInvalidId(BaseTransferRequestTest):
229 241
230 @classmethod 242 @classmethod
243 def setup_credentials(cls):
244 # Do not create network resources for these test.
245 cls.set_network_resources()
246 super(TestTransferRequestInvalidId, cls).setup_credentials()
247
248 @classmethod
231 def setup_clients(cls): 249 def setup_clients(cls):
232 super(TestTransferRequestInvalidId, cls).setup_clients() 250 super(TestTransferRequestInvalidId, cls).setup_clients()
233 cls.client = cls.os_primary.transfer_request_client 251 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 @@ class TsigkeyAdminTest(BaseTsigkeyTest):
30 credentials = ['primary', 'admin'] 30 credentials = ['primary', 'admin']
31 31
32 @classmethod 32 @classmethod
33 def setup_credentials(cls):
34 # Do not create network resources for these test.
35 cls.set_network_resources()
36 super(TsigkeyAdminTest, cls).setup_credentials()
37
38 @classmethod
33 def setup_clients(cls): 39 def setup_clients(cls):
34 super(TsigkeyAdminTest, cls).setup_clients() 40 super(TsigkeyAdminTest, cls).setup_clients()
35 cls.zone_client = cls.os_primary.zones_client 41 cls.zone_client = cls.os_primary.zones_client
@@ -137,6 +143,12 @@ class TestTsigkeyNotFoundAdmin(BaseTsigkeyTest):
137 credentials = ["admin"] 143 credentials = ["admin"]
138 144
139 @classmethod 145 @classmethod
146 def setup_credentials(cls):
147 # Do not create network resources for these test.
148 cls.set_network_resources()
149 super(TestTsigkeyNotFoundAdmin, cls).setup_credentials()
150
151 @classmethod
140 def setup_clients(cls): 152 def setup_clients(cls):
141 super(TestTsigkeyNotFoundAdmin, cls).setup_clients() 153 super(TestTsigkeyNotFoundAdmin, cls).setup_clients()
142 cls.admin_client = cls.os_admin.tsigkey_client 154 cls.admin_client = cls.os_admin.tsigkey_client
@@ -174,6 +186,12 @@ class TestTsigkeyInvalidIdAdmin(BaseTsigkeyTest):
174 credentials = ["admin"] 186 credentials = ["admin"]
175 187
176 @classmethod 188 @classmethod
189 def setup_credentials(cls):
190 # Do not create network resources for these test.
191 cls.set_network_resources()
192 super(TestTsigkeyInvalidIdAdmin, cls).setup_credentials()
193
194 @classmethod
177 def setup_clients(cls): 195 def setup_clients(cls):
178 super(TestTsigkeyInvalidIdAdmin, cls).setup_clients() 196 super(TestTsigkeyInvalidIdAdmin, cls).setup_clients()
179 cls.admin_client = cls.os_admin.tsigkey_client 197 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 @@ class TestDnsUnauthed(base.BaseDnsV2Test):
29 credentials = ["primary"] 29 credentials = ["primary"]
30 30
31 @classmethod 31 @classmethod
32 def setup_credentials(cls):
33 # Do not create network resources for these test.
34 cls.set_network_resources()
35 super(TestDnsUnauthed, cls).setup_credentials()
36
37 @classmethod
32 def setup_clients(cls): 38 def setup_clients(cls):
33 super(TestDnsUnauthed, cls).setup_clients() 39 super(TestDnsUnauthed, cls).setup_clients()
34 cls.zones_client = cls.os_primary.zones_client 40 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 BaseZonesTest(base.BaseDnsV2Test):
29 29
30class ZonesTest(BaseZonesTest): 30class ZonesTest(BaseZonesTest):
31 @classmethod 31 @classmethod
32 def setup_credentials(cls):
33 # Do not create network resources for these test.
34 cls.set_network_resources()
35 super(ZonesTest, cls).setup_credentials()
36
37 @classmethod
32 def setup_clients(cls): 38 def setup_clients(cls):
33 super(ZonesTest, cls).setup_clients() 39 super(ZonesTest, cls).setup_clients()
34 40
@@ -116,6 +122,12 @@ class ZonesAdminTest(BaseZonesTest):
116 credentials = ['primary', 'admin'] 122 credentials = ['primary', 'admin']
117 123
118 @classmethod 124 @classmethod
125 def setup_credentials(cls):
126 # Do not create network resources for these test.
127 cls.set_network_resources()
128 super(ZonesAdminTest, cls).setup_credentials()
129
130 @classmethod
119 def setup_clients(cls): 131 def setup_clients(cls):
120 super(ZonesAdminTest, cls).setup_clients() 132 super(ZonesAdminTest, cls).setup_clients()
121 133
@@ -140,6 +152,12 @@ class ZoneOwnershipTest(BaseZonesTest):
140 credentials = ['primary', 'alt'] 152 credentials = ['primary', 'alt']
141 153
142 @classmethod 154 @classmethod
155 def setup_credentials(cls):
156 # Do not create network resources for these test.
157 cls.set_network_resources()
158 super(ZoneOwnershipTest, cls).setup_credentials()
159
160 @classmethod
143 def setup_clients(cls): 161 def setup_clients(cls):
144 super(ZoneOwnershipTest, cls).setup_clients() 162 super(ZoneOwnershipTest, cls).setup_clients()
145 163
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 BaseZoneExportsTest(base.BaseDnsV2Test):
28 28
29class ZonesExportTest(BaseZoneExportsTest): 29class ZonesExportTest(BaseZoneExportsTest):
30 @classmethod 30 @classmethod
31 def setup_credentials(cls):
32 # Do not create network resources for these test.
33 cls.set_network_resources()
34 super(ZonesExportTest, cls).setup_credentials()
35
36 @classmethod
31 def setup_clients(cls): 37 def setup_clients(cls):
32 super(ZonesExportTest, cls).setup_clients() 38 super(ZonesExportTest, cls).setup_clients()
33 39
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 BaseZonesImportTest(base.BaseDnsV2Test):
28 28
29class ZonesImportTest(BaseZonesImportTest): 29class ZonesImportTest(BaseZonesImportTest):
30 @classmethod 30 @classmethod
31 def setup_credentials(cls):
32 # Do not create network resources for these test.
33 cls.set_network_resources()
34 super(ZonesImportTest, cls).setup_credentials()
35
36 @classmethod
31 def setup_clients(cls): 37 def setup_clients(cls):
32 super(ZonesImportTest, cls).setup_clients() 38 super(ZonesImportTest, cls).setup_clients()
33 cls.client = cls.os_primary.zone_imports_client 39 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 @@ class BaseDnsTest(test.BaseTestCase):
75 % cls.__name__) 75 % cls.__name__)
76 raise cls.skipException(skip_msg) 76 raise cls.skipException(skip_msg)
77 77
78 @classmethod
79 def setup_credentials(cls):
80 # Do not create network resources for these test.
81 cls.set_network_resources()
82 super(BaseDnsTest, cls).setup_credentials()
83
84 def assertExpected(self, expected, actual, excluded_keys): 78 def assertExpected(self, expected, actual, excluded_keys):
85 for key, value in six.iteritems(expected): 79 for key, value in six.iteritems(expected):
86 if key not in excluded_keys: 80 if key not in excluded_keys: