openstack/deb-designate
Code Issues Proposed changes

Refactor Zone Import Internals

Browse Source 
In preparation for async zone exports, move imports to be their own objects,
away from zone tasks. This is essentially a giant renaming.

Change-Id: If6eefbf5553d0fc09e638e879b88c73c133c56fe
This commit is contained in:
TimSimmons
2015-08-20 14:30:24 -05:00
parent 7ac4cb4759
commit 523395dec0
11 changed files with 126 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
designate/tests/__init__.py
View File

@@ -245,7 +245,7 @@ class TestCase(base.BaseTestCase):
"target_tenant_id": "target_tenant_id"
}]
zone_task_fixtures = [{
zone_import_fixtures = [{
'status': 'PENDING',
'domain_id': None,
'message': None,
@@ -528,10 +528,10 @@ class TestCase(base.BaseTestCase):
_values.update(values)
return _values
def get_zone_task_fixture(self, fixture=0, values=None):
def get_zone_import_fixture(self, fixture=0, values=None):
values = values or {}
_values = copy.copy(self.zone_task_fixtures[fixture])
_values = copy.copy(self.zone_import_fixtures[fixture])
_values.update(values)
return _values
@@ -678,15 +678,15 @@ class TestCase(base.BaseTestCase):
return self.central_service.create_zone_transfer_accept(
context, objects.ZoneTransferAccept.from_dict(values))
def create_zone_task(self, **kwargs):
def create_zone_import(self, **kwargs):
context = kwargs.pop('context', self.admin_context)
fixture = kwargs.pop('fixture', 0)
zone_task = self.get_zone_task_fixture(fixture=fixture,
zone_import = self.get_zone_import_fixture(fixture=fixture,
values=kwargs)
return self.storage.create_zone_task(
context, objects.ZoneTask.from_dict(zone_task))
return self.storage.create_zone_import(
context, objects.ZoneImport.from_dict(zone_import))
def wait_for_import(self, zone_import_id, errorok=False):
"""