Refactor Zone Import Internals

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

2 files changed, 39 insertions, 36 deletions

diff --git a/designate/storage/base.py b/designate/storage/base.py
index cd4e5da9..16471885 100644
--- a/designate/storage/base.py
+++ b/designate/storage/base.py
@@ -631,28 +631,28 @@ class Storage(DriverPlugin):
         """
 
     @abc.abstractmethod
-    def create_zone_task(self, context, zone_task):
+    def create_zone_import(self, context, zone_import):
         """
-        Create a Zone Task.
+        Create a Zone Import.
 
         :param context: RPC Context.
-        :param zone_task: Tld object with the values to be created.
+        :param zone_import: Zone Import object with the values to be created.
         """
 
     @abc.abstractmethod
-    def get_zone_task(self, context, zone_task_id):
+    def get_zone_import(self, context, zone_import_id):
         """
-        Get a Zone Task via ID.
+        Get a Zone Import via ID.
 
         :param context: RPC Context.
-        :param zone_task_id: Zone Task  ID to get.
+        :param zone_import_id: Zone Import ID to get.
         """
 
     @abc.abstractmethod
-    def find_zone_tasks(self, context, criterion=None, marker=None,
+    def find_zone_imports(self, context, criterion=None, marker=None,
                   limit=None, sort_key=None, sort_dir=None):
         """
-        Find Zone Tasks
+        Find Zone Imports
 
         :param context: RPC Context.
         :param criterion: Criteria to filter by.
@@ -665,30 +665,30 @@ class Storage(DriverPlugin):
         """
 
     @abc.abstractmethod
-    def find_zone_task(self, context, criterion):
+    def find_zone_import(self, context, criterion):
         """
-        Find a single Zone Task.
+        Find a single Zone Import.
 
         :param context: RPC Context.
         :param criterion: Criteria to filter by.
         """
 
     @abc.abstractmethod
-    def update_zone_task(self, context, zone_task):
+    def update_zone_import(self, context, zone_import):
         """
-        Update a Zone Task
+        Update a Zone Import
 
         :param context: RPC Context.
-        :param zone_task: Zone Task to update.
+        :param zone_import: Zone Import to update.
         """
 
     @abc.abstractmethod
-    def delete_zone_task(self, context, zone_task_id):
+    def delete_zone_import(self, context, zone_import_id):
         """
-        Delete a Zone Task via ID.
+        Delete a Zone Import via ID.
 
         :param context: RPC Context.
-        :param zone_task_id: Delete a Zone Task via ID
+        :param zone_import_id: Delete a Zone Import via ID
         """
 
     def ping(self, context):
diff --git a/designate/storage/impl_sqlalchemy/__init__.py b/designate/storage/impl_sqlalchemy/__init__.py
index 7faef554..2f86538c 100644
--- a/designate/storage/impl_sqlalchemy/__init__.py
+++ b/designate/storage/impl_sqlalchemy/__init__.py
@@ -1259,42 +1259,45 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage):
             zone_transfer_accept,
             exceptions.ZoneTransferAcceptNotFound)
 
-    # Zone Task Methods
-    def _find_zone_tasks(self, context, criterion, one=False, marker=None,
+    # Zone Import Methods
+    def _find_zone_imports(self, context, criterion, one=False, marker=None,
                    limit=None, sort_key=None, sort_dir=None):
+        if not criterion:
+            criterion = {}
+        criterion['task_type'] = 'IMPORT'
         return self._find(
-            context, tables.zone_tasks, objects.ZoneTask,
-            objects.ZoneTaskList, exceptions.ZoneTaskNotFound, criterion,
+            context, tables.zone_tasks, objects.ZoneImport,
+            objects.ZoneImportList, exceptions.ZoneImportNotFound, criterion,
             one, marker, limit, sort_key, sort_dir)
 
-    def create_zone_task(self, context, zone_task):
+    def create_zone_import(self, context, zone_import):
         return self._create(
-            tables.zone_tasks, zone_task, exceptions.DuplicateZoneTask)
+            tables.zone_tasks, zone_import, exceptions.DuplicateZoneImport)
 
-    def get_zone_task(self, context, zone_task_id):
-        return self._find_zone_tasks(context, {'id': zone_task_id},
+    def get_zone_import(self, context, zone_import_id):
+        return self._find_zone_imports(context, {'id': zone_import_id},
                                      one=True)
 
-    def find_zone_tasks(self, context, criterion=None, marker=None,
+    def find_zone_imports(self, context, criterion=None, marker=None,
                   limit=None, sort_key=None, sort_dir=None):
-        return self._find_zone_tasks(context, criterion, marker=marker,
+        return self._find_zone_imports(context, criterion, marker=marker,
                                limit=limit, sort_key=sort_key,
                                sort_dir=sort_dir)
 
-    def find_zone_task(self, context, criterion):
-        return self._find_zone_tasks(context, criterion, one=True)
+    def find_zone_import(self, context, criterion):
+        return self._find_zone_imports(context, criterion, one=True)
 
-    def update_zone_task(self, context, zone_task):
+    def update_zone_import(self, context, zone_import):
         return self._update(
-            context, tables.zone_tasks, zone_task,
-            exceptions.DuplicateZoneTask, exceptions.ZoneTaskNotFound)
+            context, tables.zone_tasks, zone_import,
+            exceptions.DuplicateZoneImport, exceptions.ZoneImportNotFound)
 
-    def delete_zone_task(self, context, zone_task_id):
-        # Fetch the existing zone_task, we'll need to return it.
-        zone_task = self._find_zone_tasks(context, {'id': zone_task_id},
+    def delete_zone_import(self, context, zone_import_id):
+        # Fetch the existing zone_import, we'll need to return it.
+        zone_import = self._find_zone_imports(context, {'id': zone_import_id},
                                 one=True)
-        return self._delete(context, tables.zone_tasks, zone_task,
-                    exceptions.ZoneTaskNotFound)
+        return self._delete(context, tables.zone_tasks, zone_import,
+                    exceptions.ZoneImportNotFound)
 
     # diagnostics
     def ping(self, context):