Browse Source

Fix credential naming

Change-Id: Ica935f22ed30792033c6c36742abead20de66363
Graham Hayes 1 year ago
parent
commit
bbc01e3510
No account linked to committer's email address
23 changed files with 64 additions and 63 deletions
  1. 1
    1
      designate_tempest_plugin/tests/api/admin/test_quotas.py
  2. 1
    1
      designate_tempest_plugin/tests/api/v1/test_domains.py
  3. 4
    3
      designate_tempest_plugin/tests/api/v1/test_records.py
  4. 1
    1
      designate_tempest_plugin/tests/api/v1/test_servers.py
  5. 3
    3
      designate_tempest_plugin/tests/api/v2/test_blacklists.py
  6. 3
    3
      designate_tempest_plugin/tests/api/v2/test_pool.py
  7. 2
    2
      designate_tempest_plugin/tests/api/v2/test_quotas.py
  8. 8
    8
      designate_tempest_plugin/tests/api/v2/test_recordset.py
  9. 2
    2
      designate_tempest_plugin/tests/api/v2/test_recordset_validation.py
  10. 3
    3
      designate_tempest_plugin/tests/api/v2/test_tld.py
  11. 3
    3
      designate_tempest_plugin/tests/api/v2/test_transfer_accepts.py
  12. 4
    4
      designate_tempest_plugin/tests/api/v2/test_transfer_request.py
  13. 3
    3
      designate_tempest_plugin/tests/api/v2/test_tsigkey.py
  14. 5
    5
      designate_tempest_plugin/tests/api/v2/test_unauthed.py
  15. 4
    4
      designate_tempest_plugin/tests/api/v2/test_zones.py
  16. 2
    2
      designate_tempest_plugin/tests/api/v2/test_zones_exports.py
  17. 1
    1
      designate_tempest_plugin/tests/api/v2/test_zones_imports.py
  18. 2
    2
      designate_tempest_plugin/tests/base.py
  19. 2
    2
      designate_tempest_plugin/tests/scenario/v2/test_zones.py
  20. 2
    2
      designate_tempest_plugin/tests/scenario/v2/test_zones_export.py
  21. 2
    2
      designate_tempest_plugin/tests/scenario/v2/test_zones_import.py
  22. 3
    3
      designate_tempest_plugin/tests/scenario/v2/test_zones_transfer.py
  23. 3
    3
      doc/source/index.rst

+ 1
- 1
designate_tempest_plugin/tests/api/admin/test_quotas.py View File

@@ -40,7 +40,7 @@ class QuotasAdminTest(BaseQuotasTest):
40 40
     def setup_clients(cls):
41 41
         super(QuotasAdminTest, cls).setup_clients()
42 42
 
43
-        cls.admin_client = cls.os_adm.quotas_client
43
+        cls.admin_client = cls.os_admin.quotas_client
44 44
 
45 45
     @decorators.idempotent_id('ed42f367-e5ba-40d7-a08d-366ad787d21c')
46 46
     def test_show_quotas(self):

+ 1
- 1
designate_tempest_plugin/tests/api/v1/test_domains.py View File

@@ -27,7 +27,7 @@ class DnsDomainsTest(base.BaseDnsV1Test):
27 27
     def setup_clients(cls):
28 28
         super(DnsDomainsTest, cls).setup_clients()
29 29
 
30
-        cls.client = cls.os.domains_client
30
+        cls.client = cls.os_primary.domains_client
31 31
 
32 32
     @classmethod
33 33
     def resource_setup(cls):

+ 4
- 3
designate_tempest_plugin/tests/api/v1/test_records.py View File

@@ -26,7 +26,7 @@ class RecordsTest(base.BaseDnsV1Test):
26 26
     def setup_clients(cls):
27 27
         super(RecordsTest, cls).setup_clients()
28 28
 
29
-        cls.client = cls.os.records_client
29
+        cls.client = cls.os_primary.records_client
30 30
 
31 31
     @classmethod
32 32
     def resource_setup(cls):
@@ -36,7 +36,8 @@ class RecordsTest(base.BaseDnsV1Test):
36 36
         cls.setup_records = list()
37 37
         name = data_utils.rand_name('domain') + '.com.'
38 38
         email = data_utils.rand_name('dns') + '@testmail.com'
39
-        _, cls.domain = cls.os.domains_client.create_domain(name, email)
39
+        _, cls.domain = cls.os_primary.domains_client.create_domain(
40
+            name, email)
40 41
         # Creates a record with type as A
41 42
         r_name = 'www.' + name
42 43
         data1 = "192.0.2.3"
@@ -55,7 +56,7 @@ class RecordsTest(base.BaseDnsV1Test):
55 56
     def resource_cleanup(cls):
56 57
         for record in cls.setup_records:
57 58
             cls.client.delete_record(cls.domain['id'], record['id'])
58
-        cls.os.domains_client.delete_domain(cls.domain['id'])
59
+        cls.os_primary.domains_client.delete_domain(cls.domain['id'])
59 60
         super(RecordsTest, cls).resource_cleanup()
60 61
 
61 62
     def _delete_record(self, domain_id, record_id):

+ 1
- 1
designate_tempest_plugin/tests/api/v1/test_servers.py View File

@@ -36,7 +36,7 @@ class ServersAdminTest(base.BaseDnsV1Test):
36 36
     def setup_clients(cls):
37 37
         super(ServersAdminTest, cls).setup_clients()
38 38
 
39
-        cls.client = cls.os_adm.servers_client
39
+        cls.client = cls.os_admin.servers_client
40 40
 
41 41
     @classmethod
42 42
     def skip_checks(cls):

+ 3
- 3
designate_tempest_plugin/tests/api/v2/test_blacklists.py View File

@@ -33,7 +33,7 @@ class BlacklistsAdminTest(BaseBlacklistsTest):
33 33
     @classmethod
34 34
     def setup_clients(cls):
35 35
         super(BlacklistsAdminTest, cls).setup_clients()
36
-        cls.admin_client = cls.os_adm.blacklists_client
36
+        cls.admin_client = cls.os_admin.blacklists_client
37 37
 
38 38
     @decorators.idempotent_id('3a7f7564-6bdd-446e-addc-a3475b4c3f71')
39 39
     def test_create_blacklist(self):
@@ -111,7 +111,7 @@ class TestBlacklistNotFoundAdmin(BaseBlacklistsTest):
111 111
     @classmethod
112 112
     def setup_clients(cls):
113 113
         super(TestBlacklistNotFoundAdmin, cls).setup_clients()
114
-        cls.admin_client = cls.os_adm.blacklists_client
114
+        cls.admin_client = cls.os_admin.blacklists_client
115 115
 
116 116
     @decorators.idempotent_id('9d65b638-fe98-47a8-853f-fa9244d144cc')
117 117
     def test_show_blacklist_404(self):
@@ -148,7 +148,7 @@ class TestBlacklistInvalidIdAdmin(BaseBlacklistsTest):
148 148
     @classmethod
149 149
     def setup_clients(cls):
150 150
         super(TestBlacklistInvalidIdAdmin, cls).setup_clients()
151
-        cls.admin_client = cls.os_adm.blacklists_client
151
+        cls.admin_client = cls.os_admin.blacklists_client
152 152
 
153 153
     @decorators.idempotent_id('c7bae53f-2edc-45d8-b254-8a81482728c1')
154 154
     def test_show_blacklist_invalid_uuid(self):

+ 3
- 3
designate_tempest_plugin/tests/api/v2/test_pool.py View File

@@ -40,7 +40,7 @@ class PoolAdminTest(BasePoolTest):
40 40
     def setup_clients(cls):
41 41
         super(PoolAdminTest, cls).setup_clients()
42 42
 
43
-        cls.admin_client = cls.os_adm.pool_client
43
+        cls.admin_client = cls.os_admin.pool_client
44 44
 
45 45
     @decorators.idempotent_id('69257f7c-b3d5-4e1b-998e-0677ad12f125')
46 46
     def test_create_pool(self):
@@ -124,7 +124,7 @@ class TestPoolNotFoundAdmin(BasePoolTest):
124 124
     @classmethod
125 125
     def setup_clients(cls):
126 126
         super(TestPoolNotFoundAdmin, cls).setup_clients()
127
-        cls.admin_client = cls.os_adm.pool_client
127
+        cls.admin_client = cls.os_admin.pool_client
128 128
 
129 129
     @decorators.idempotent_id('56281b2f-dd5a-4376-8c32-aba771062fa5')
130 130
     def test_show_pool_404(self):
@@ -161,7 +161,7 @@ class TestPoolInvalidIdAdmin(BasePoolTest):
161 161
     @classmethod
162 162
     def setup_clients(cls):
163 163
         super(TestPoolInvalidIdAdmin, cls).setup_clients()
164
-        cls.admin_client = cls.os_adm.pool_client
164
+        cls.admin_client = cls.os_admin.pool_client
165 165
 
166 166
     @decorators.idempotent_id('081d0188-42a7-4953-af0e-b022960715e2')
167 167
     def test_show_pool_invalid_uuid(self):

+ 2
- 2
designate_tempest_plugin/tests/api/v2/test_quotas.py View File

@@ -41,8 +41,8 @@ class QuotasV2Test(base.BaseDnsV2Test):
41 41
     def setup_clients(cls):
42 42
         super(QuotasV2Test, cls).setup_clients()
43 43
 
44
-        cls.quotas_client = cls.os.quotas_client
45
-        cls.admin_client = cls.os_adm.quotas_client
44
+        cls.quotas_client = cls.os_primary.quotas_client
45
+        cls.admin_client = cls.os_admin.quotas_client
46 46
 
47 47
     @decorators.idempotent_id('1dac991a-9e2e-452c-a47a-26ac37381ec5')
48 48
     def test_show_quotas(self):

+ 8
- 8
designate_tempest_plugin/tests/api/v2/test_recordset.py View File

@@ -52,8 +52,8 @@ class RecordsetsTest(BaseRecordsetsTest):
52 52
     def setup_clients(cls):
53 53
         super(RecordsetsTest, cls).setup_clients()
54 54
 
55
-        cls.client = cls.os.recordset_client
56
-        cls.zone_client = cls.os.zones_client
55
+        cls.client = cls.os_primary.recordset_client
56
+        cls.zone_client = cls.os_primary.zones_client
57 57
 
58 58
     @decorators.attr(type='smoke')
59 59
     @decorators.idempotent_id('631d74fd-6909-4684-a61b-5c4d2f92c3e7')
@@ -205,8 +205,8 @@ class RecordsetsNegativeTest(BaseRecordsetsTest):
205 205
     def setup_clients(cls):
206 206
         super(RecordsetsNegativeTest, cls).setup_clients()
207 207
 
208
-        cls.client = cls.os.recordset_client
209
-        cls.zone_client = cls.os.zones_client
208
+        cls.client = cls.os_primary.recordset_client
209
+        cls.zone_client = cls.os_primary.zones_client
210 210
 
211 211
     @decorators.idempotent_id('98c94f8c-217a-4056-b996-b1f856d0753e')
212 212
     @ddt.file_data("recordset_data_invalid.json")
@@ -305,8 +305,8 @@ class RootRecordsetsTests(BaseRecordsetsTest):
305 305
     def setup_clients(cls):
306 306
         super(RootRecordsetsTests, cls).setup_clients()
307 307
 
308
-        cls.client = cls.os.recordset_client
309
-        cls.zone_client = cls.os.zones_client
308
+        cls.client = cls.os_primary.recordset_client
309
+        cls.zone_client = cls.os_primary.zones_client
310 310
 
311 311
     @classmethod
312 312
     def skip_checks(cls):
@@ -397,8 +397,8 @@ class RecordsetOwnershipTest(BaseRecordsetsTest):
397 397
     def setup_clients(cls):
398 398
         super(RecordsetOwnershipTest, cls).setup_clients()
399 399
 
400
-        cls.client = cls.os.recordset_client
401
-        cls.zone_client = cls.os.zones_client
400
+        cls.client = cls.os_primary.recordset_client
401
+        cls.zone_client = cls.os_primary.zones_client
402 402
         cls.alt_zone_client = cls.os_alt.zones_client
403 403
         cls.alt_client = cls.os_alt.recordset_client
404 404
 

+ 2
- 2
designate_tempest_plugin/tests/api/v2/test_recordset_validation.py View File

@@ -45,8 +45,8 @@ class RecordsetValidationTest(base.BaseDnsV2Test):
45 45
     def setup_clients(cls):
46 46
         super(RecordsetValidationTest, cls).setup_clients()
47 47
 
48
-        cls.recordset_client = cls.os.recordset_client
49
-        cls.zones_client = cls.os.zones_client
48
+        cls.recordset_client = cls.os_primary.recordset_client
49
+        cls.zones_client = cls.os_primary.zones_client
50 50
 
51 51
     @property
52 52
     def zone(self):

+ 3
- 3
designate_tempest_plugin/tests/api/v2/test_tld.py View File

@@ -32,7 +32,7 @@ class TldAdminTest(BaseTldTest):
32 32
     @classmethod
33 33
     def setup_clients(cls):
34 34
         super(TldAdminTest, cls).setup_clients()
35
-        cls.admin_client = cls.os_adm.tld_client
35
+        cls.admin_client = cls.os_admin.tld_client
36 36
 
37 37
     @classmethod
38 38
     def resource_setup(cls):
@@ -122,7 +122,7 @@ class TestTldNotFoundAdmin(BaseTldTest):
122 122
     @classmethod
123 123
     def setup_clients(cls):
124 124
         super(TestTldNotFoundAdmin, cls).setup_clients()
125
-        cls.admin_client = cls.os_adm.tld_client
125
+        cls.admin_client = cls.os_admin.tld_client
126 126
 
127 127
     @decorators.idempotent_id('b237d5ee-0d76-4294-a3b6-c2f8bf4b0e30')
128 128
     def test_show_tld_404(self):
@@ -159,7 +159,7 @@ class TestTldInvalidIdAdmin(BaseTldTest):
159 159
     @classmethod
160 160
     def setup_clients(cls):
161 161
         super(TestTldInvalidIdAdmin, cls).setup_clients()
162
-        cls.admin_client = cls.os_adm.tld_client
162
+        cls.admin_client = cls.os_admin.tld_client
163 163
 
164 164
     @decorators.idempotent_id('f9ec0730-57ff-4720-8d06-e11d377c7cfc')
165 165
     def test_show_tld_invalid_uuid(self):

+ 3
- 3
designate_tempest_plugin/tests/api/v2/test_transfer_accepts.py View File

@@ -29,9 +29,9 @@ class TransferAcceptTest(BaseTransferAcceptTest):
29 29
     def setup_clients(cls):
30 30
         super(TransferAcceptTest, cls).setup_clients()
31 31
 
32
-        cls.zone_client = cls.os.zones_client
33
-        cls.request_client = cls.os.transfer_request_client
34
-        cls.client = cls.os.transfer_accept_client
32
+        cls.zone_client = cls.os_primary.zones_client
33
+        cls.request_client = cls.os_primary.transfer_request_client
34
+        cls.client = cls.os_primary.transfer_accept_client
35 35
 
36 36
     @decorators.idempotent_id('1c6baf97-a83e-4d2e-a5d8-9d37fb7808f3')
37 37
     def test_create_transfer_accept(self):

+ 4
- 4
designate_tempest_plugin/tests/api/v2/test_transfer_request.py View File

@@ -33,8 +33,8 @@ class TransferRequestTest(BaseTransferRequestTest):
33 33
     def setup_clients(cls):
34 34
         super(TransferRequestTest, cls).setup_clients()
35 35
 
36
-        cls.zone_client = cls.os.zones_client
37
-        cls.client = cls.os.transfer_request_client
36
+        cls.zone_client = cls.os_primary.zones_client
37
+        cls.client = cls.os_primary.transfer_request_client
38 38
         cls.alt_client = cls.os_alt.transfer_request_client
39 39
 
40 40
     @decorators.idempotent_id('2381d489-ad84-403d-b0a2-8b77e4e966bf')
@@ -194,7 +194,7 @@ class TestTransferRequestNotFound(BaseTransferRequestTest):
194 194
     @classmethod
195 195
     def setup_clients(cls):
196 196
         super(TestTransferRequestNotFound, cls).setup_clients()
197
-        cls.client = cls.os.transfer_request_client
197
+        cls.client = cls.os_primary.transfer_request_client
198 198
 
199 199
     @decorators.idempotent_id('d255f72f-ba24-43df-9dba-011ed7f4625d')
200 200
     def test_show_transfer_request_404(self):
@@ -230,7 +230,7 @@ class TestTransferRequestInvalidId(BaseTransferRequestTest):
230 230
     @classmethod
231 231
     def setup_clients(cls):
232 232
         super(TestTransferRequestInvalidId, cls).setup_clients()
233
-        cls.client = cls.os.transfer_request_client
233
+        cls.client = cls.os_primary.transfer_request_client
234 234
 
235 235
     @decorators.idempotent_id('2205dd19-ecc7-4c68-9e89-63c47d642b07')
236 236
     def test_show_transfer_request_invalid_uuid(self):

+ 3
- 3
designate_tempest_plugin/tests/api/v2/test_tsigkey.py View File

@@ -32,7 +32,7 @@ class TsigkeyAdminTest(BaseTsigkeyTest):
32 32
     @classmethod
33 33
     def setup_clients(cls):
34 34
         super(TsigkeyAdminTest, cls).setup_clients()
35
-        cls.zone_client = cls.os.zones_client
35
+        cls.zone_client = cls.os_primary.zones_client
36 36
         cls.admin_client = cls.os_admin.tsigkey_client
37 37
 
38 38
     @decorators.idempotent_id('e7b484e3-7ed5-4840-89d7-1e696986f8e4')
@@ -139,7 +139,7 @@ class TestTsigkeyNotFoundAdmin(BaseTsigkeyTest):
139 139
     @classmethod
140 140
     def setup_clients(cls):
141 141
         super(TestTsigkeyNotFoundAdmin, cls).setup_clients()
142
-        cls.admin_client = cls.os_adm.tsigkey_client
142
+        cls.admin_client = cls.os_admin.tsigkey_client
143 143
 
144 144
     @decorators.idempotent_id('824c9b49-edc5-4282-929e-467a158d23e4')
145 145
     def test_show_tsigkey_404(self):
@@ -176,7 +176,7 @@ class TestTsigkeyInvalidIdAdmin(BaseTsigkeyTest):
176 176
     @classmethod
177 177
     def setup_clients(cls):
178 178
         super(TestTsigkeyInvalidIdAdmin, cls).setup_clients()
179
-        cls.admin_client = cls.os_adm.tsigkey_client
179
+        cls.admin_client = cls.os_admin.tsigkey_client
180 180
 
181 181
     @decorators.idempotent_id('2a8dfc75-9884-4b1c-8f1f-ed835d96f2fe')
182 182
     def test_show_tsigkey_invalid_uuid(self):

+ 5
- 5
designate_tempest_plugin/tests/api/v2/test_unauthed.py View File

@@ -31,11 +31,11 @@ class TestDnsUnauthed(base.BaseDnsV2Test):
31 31
     @classmethod
32 32
     def setup_clients(cls):
33 33
         super(TestDnsUnauthed, cls).setup_clients()
34
-        cls.zones_client = cls.os.zones_client
35
-        cls.recordset_client = cls.os.recordset_client
36
-        cls.tld_client = cls.os.tld_client
37
-        cls.pool_client = cls.os.pool_client
38
-        cls.blacklists_client = cls.os.blacklists_client
34
+        cls.zones_client = cls.os_primary.zones_client
35
+        cls.recordset_client = cls.os_primary.recordset_client
36
+        cls.tld_client = cls.os_primary.tld_client
37
+        cls.pool_client = cls.os_primary.pool_client
38
+        cls.blacklists_client = cls.os_primary.blacklists_client
39 39
 
40 40
     @decorators.idempotent_id('0f7a6d20-f6f3-4937-8fe6-7a9851227d98')
41 41
     @ddt.file_data('unauthed_data.json')

+ 4
- 4
designate_tempest_plugin/tests/api/v2/test_zones.py View File

@@ -32,7 +32,7 @@ class ZonesTest(BaseZonesTest):
32 32
     def setup_clients(cls):
33 33
         super(ZonesTest, cls).setup_clients()
34 34
 
35
-        cls.client = cls.os.zones_client
35
+        cls.client = cls.os_primary.zones_client
36 36
 
37 37
     @decorators.idempotent_id('9d2e20fc-e56f-4a62-9c61-9752a9ec615c')
38 38
     def test_create_zone(self):
@@ -119,8 +119,8 @@ class ZonesAdminTest(BaseZonesTest):
119 119
     def setup_clients(cls):
120 120
         super(ZonesAdminTest, cls).setup_clients()
121 121
 
122
-        cls.client = cls.os.zones_client
123
-        cls.admin_client = cls.os_adm.zones_client
122
+        cls.client = cls.os_primary.zones_client
123
+        cls.admin_client = cls.os_admin.zones_client
124 124
 
125 125
     @decorators.idempotent_id('6477f92d-70ba-46eb-bd6c-fc50c405e222')
126 126
     def test_get_other_tenant_zone(self):
@@ -143,7 +143,7 @@ class ZoneOwnershipTest(BaseZonesTest):
143 143
     def setup_clients(cls):
144 144
         super(ZoneOwnershipTest, cls).setup_clients()
145 145
 
146
-        cls.client = cls.os.zones_client
146
+        cls.client = cls.os_primary.zones_client
147 147
         cls.alt_client = cls.os_alt.zones_client
148 148
 
149 149
     @decorators.idempotent_id('5d28580a-a012-4b57-b211-e077b1a01340')

+ 2
- 2
designate_tempest_plugin/tests/api/v2/test_zones_exports.py View File

@@ -31,8 +31,8 @@ class ZonesExportTest(BaseZoneExportsTest):
31 31
     def setup_clients(cls):
32 32
         super(ZonesExportTest, cls).setup_clients()
33 33
 
34
-        cls.zone_client = cls.os.zones_client
35
-        cls.client = cls.os.zone_exports_client
34
+        cls.zone_client = cls.os_primary.zones_client
35
+        cls.client = cls.os_primary.zone_exports_client
36 36
 
37 37
     @decorators.idempotent_id('2dd8a9a0-98a2-4bf6-bb51-286583b30f40')
38 38
     def test_create_zone_export(self):

+ 1
- 1
designate_tempest_plugin/tests/api/v2/test_zones_imports.py View File

@@ -30,7 +30,7 @@ class ZonesImportTest(BaseZonesImportTest):
30 30
     @classmethod
31 31
     def setup_clients(cls):
32 32
         super(ZonesImportTest, cls).setup_clients()
33
-        cls.client = cls.os.zone_imports_client
33
+        cls.client = cls.os_primary.zone_imports_client
34 34
 
35 35
     @decorators.idempotent_id('2e2d907d-0609-405b-9c96-3cb2b87e3dce')
36 36
     def test_create_zone_import(self):

+ 2
- 2
designate_tempest_plugin/tests/base.py View File

@@ -60,8 +60,8 @@ class BaseDnsTest(test.BaseTestCase):
60 60
     # at class setup time. Credential types can be 'primary', 'alt', 'admin' or
61 61
     # a list of roles - the first element of the list being a label, and the
62 62
     # rest the actual roles.
63
-    # NOTE(kiall) primary will result in a manager @ cls.os, alt will have
64
-    # cls.os_alt, and admin will have cls.os_adm.
63
+    # NOTE(kiall) primary will result in a manager @ cls.os_primary, alt will
64
+    # have cls.os_alt, and admin will have cls.os_admin.
65 65
     # NOTE(kiall) We should default to only primary, and request additional
66 66
     # credentials in the tests that require them.
67 67
     credentials = ['primary']

+ 2
- 2
designate_tempest_plugin/tests/scenario/v2/test_zones.py View File

@@ -29,8 +29,8 @@ class ZonesTest(base.BaseDnsV2Test):
29 29
     def setup_clients(cls):
30 30
         super(ZonesTest, cls).setup_clients()
31 31
 
32
-        cls.client = cls.os.zones_client
33
-        cls.query_client = cls.os.query_client
32
+        cls.client = cls.os_primary.zones_client
33
+        cls.query_client = cls.os_primary.query_client
34 34
 
35 35
     @decorators.attr(type='smoke')
36 36
     @decorators.attr(type='slow')

+ 2
- 2
designate_tempest_plugin/tests/scenario/v2/test_zones_export.py View File

@@ -28,8 +28,8 @@ class ZonesExportTest(BaseZoneExportsTest):
28 28
     def setup_clients(cls):
29 29
         super(ZonesExportTest, cls).setup_clients()
30 30
 
31
-        cls.zones_client = cls.os.zones_client
32
-        cls.client = cls.os.zone_exports_client
31
+        cls.zones_client = cls.os_primary.zones_client
32
+        cls.client = cls.os_primary.zone_exports_client
33 33
 
34 34
     @decorators.attr(type='slow')
35 35
     @decorators.idempotent_id('0484c3c4-df57-458e-a6e5-6eb63e0475e0')

+ 2
- 2
designate_tempest_plugin/tests/scenario/v2/test_zones_import.py View File

@@ -27,8 +27,8 @@ class ZonesImportTest(BaseZonesImportTest):
27 27
     @classmethod
28 28
     def setup_clients(cls):
29 29
         super(ZonesImportTest, cls).setup_clients()
30
-        cls.client = cls.os.zone_imports_client
31
-        cls.zones_client = cls.os.zones_client
30
+        cls.client = cls.os_primary.zone_imports_client
31
+        cls.zones_client = cls.os_primary.zones_client
32 32
 
33 33
     @decorators.attr(type='slow')
34 34
     @decorators.idempotent_id('679f38d0-2f2f-49c5-934e-8fe0c452f56e')

+ 3
- 3
designate_tempest_plugin/tests/scenario/v2/test_zones_transfer.py View File

@@ -26,11 +26,11 @@ class ZonesTransferTest(base.BaseDnsV2Test):
26 26
     @classmethod
27 27
     def setup_clients(cls):
28 28
         super(ZonesTransferTest, cls).setup_clients()
29
-        cls.zones_client = cls.os.zones_client
29
+        cls.zones_client = cls.os_primary.zones_client
30 30
         cls.alt_zones_client = cls.os_alt.zones_client
31
-        cls.request_client = cls.os.transfer_request_client
31
+        cls.request_client = cls.os_primary.transfer_request_client
32 32
         cls.alt_request_client = cls.os_alt.transfer_request_client
33
-        cls.accept_client = cls.os.transfer_accept_client
33
+        cls.accept_client = cls.os_primary.transfer_accept_client
34 34
         cls.alt_accept_client = cls.os_alt.transfer_accept_client
35 35
 
36 36
     @decorators.idempotent_id('60bd80ac-c979-4686-9a03-f2f775f272ab')

+ 3
- 3
doc/source/index.rst View File

@@ -166,7 +166,7 @@ included below:
166 166
        def setup_clients(cls):
167 167
            super(ZonesTest, cls).setup_clients()
168 168
 
169
-           cls.client = cls.os.zones_client
169
+           cls.client = cls.os_primary.zones_client
170 170
 
171 171
        @decorators.attr(type='smoke')
172 172
        @decorators.idempotent_id('fbabd6af-238a-462e-b923-de4d736b90a7')
@@ -200,8 +200,8 @@ credentials are available using the class level "credentials" property like so:
200 200
        def setup_clients(cls):
201 201
            super(ZonesAdminTest, cls).setup_clients()
202 202
 
203
-           cls.client = cls.os.zones_client
204
-           cls.adm_client = cls.os_adm.zones_client
203
+           cls.client = cls.os_primary.zones_client
204
+           cls.adm_client = cls.os_admin.zones_client
205 205
 
206 206
        @decorators.idempotent_id('6477f92d-70ba-46eb-bd6c-fc50c405e222')
207 207
        def test_get_other_tenant_zone(self):

Loading…
Cancel
Save