diff options
Diffstat (limited to 'designate/tests/test_central/test_service.py')
| -rw-r--r-- | designate/tests/test_central/test_service.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/designate/tests/test_central/test_service.py b/designate/tests/test_central/test_service.py index 2c6f8cf5..5db47b4f 100644 --- a/designate/tests/test_central/test_service.py +++ b/designate/tests/test_central/test_service.py @@ -33,9 +33,10 @@ from oslo_messaging.rpc import dispatcher as rpc_dispatcher from designate import exceptions from designate import objects from designate.mdns import rpcapi as mdns_api +from designate.storage.impl_sqlalchemy import tables from designate.tests import fixtures from designate.tests.test_central import CentralTestCase -from designate.storage.impl_sqlalchemy import tables +from designate import utils LOG = logging.getLogger(__name__) @@ -3534,7 +3535,7 @@ class CentralServiceTest(CentralTestCase): # Zone Import Tests def test_create_zone_import(self): # Create a Zone Import - context = self.get_context() + context = self.get_context(project_id=utils.generate_uuid()) request_body = self.get_zonefile_fixture() zone_import = self.central_service.create_zone_import(context, request_body) @@ -3548,7 +3549,7 @@ class CentralServiceTest(CentralTestCase): self.wait_for_import(zone_import.id) def test_find_zone_imports(self): - context = self.get_context() + context = self.get_context(project_id=utils.generate_uuid()) # Ensure we have no zone_imports to start with. zone_imports = self.central_service.find_zone_imports( @@ -3565,7 +3566,7 @@ class CentralServiceTest(CentralTestCase): # Ensure we can retrieve the newly created zone_import zone_imports = self.central_service.find_zone_imports( - self.admin_context) + self.admin_context_all_tenants) self.assertEqual(1, len(zone_imports)) # Create a second zone_import @@ -3578,14 +3579,14 @@ class CentralServiceTest(CentralTestCase): # Ensure we can retrieve both zone_imports zone_imports = self.central_service.find_zone_imports( - self.admin_context) + self.admin_context_all_tenants) self.assertEqual(2, len(zone_imports)) self.assertEqual('COMPLETE', zone_imports[0].status) self.assertEqual('COMPLETE', zone_imports[1].status) def test_get_zone_import(self): # Create a Zone Import - context = self.get_context() + context = self.get_context(project_id=utils.generate_uuid()) request_body = self.get_zonefile_fixture() zone_import = self.central_service.create_zone_import( context, request_body) @@ -3595,7 +3596,7 @@ class CentralServiceTest(CentralTestCase): # Retrieve it, and ensure it's the same zone_import = self.central_service.get_zone_import( - self.admin_context, zone_import.id) + self.admin_context_all_tenants, zone_import.id) self.assertEqual(zone_import.id, zone_import['id']) self.assertEqual(zone_import.status, zone_import['status']) @@ -3603,7 +3604,7 @@ class CentralServiceTest(CentralTestCase): def test_update_zone_import(self): # Create a Zone Import - context = self.get_context() + context = self.get_context(project_id=utils.generate_uuid()) request_body = self.get_zonefile_fixture() zone_import = self.central_service.create_zone_import( context, request_body) @@ -3615,7 +3616,7 @@ class CentralServiceTest(CentralTestCase): # Perform the update zone_import = self.central_service.update_zone_import( - self.admin_context, zone_import) + self.admin_context_all_tenants, zone_import) # Fetch the zone_import again zone_import = self.central_service.get_zone_import(context, @@ -3626,7 +3627,7 @@ class CentralServiceTest(CentralTestCase): def test_delete_zone_import(self): # Create a Zone Import - context = self.get_context() + context = self.get_context(project_id=utils.generate_uuid()) request_body = self.get_zonefile_fixture() zone_import = self.central_service.create_zone_import( context, request_body) |