summaryrefslogtreecommitdiff
path: root/designate/central/service.py
diff options
context:
space:
mode:
Diffstat (limited to 'designate/central/service.py')
-rw-r--r--designate/central/service.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/designate/central/service.py b/designate/central/service.py
index d86a9959..ca851fd7 100644
--- a/designate/central/service.py
+++ b/designate/central/service.py
@@ -2817,9 +2817,13 @@ class Service(service.RPCService):
target = {'tenant_id': context.project_id}
policy.check('find_zone_imports', context, target)
- criterion = {
- 'task_type': 'IMPORT'
- }
+ if not criterion:
+ criterion = {
+ 'task_type': 'IMPORT'
+ }
+ else:
+ criterion['task_type'] = 'IMPORT'
+
return self.storage.find_zone_imports(context, criterion, marker,
limit, sort_key, sort_dir)
@@ -2886,9 +2890,13 @@ class Service(service.RPCService):
target = {'tenant_id': context.project_id}
policy.check('find_zone_exports', context, target)
- criterion = {
- 'task_type': 'EXPORT'
- }
+ if not criterion:
+ criterion = {
+ 'task_type': 'EXPORT'
+ }
+ else:
+ criterion['task_type'] = 'EXPORT'
+
return self.storage.find_zone_exports(context, criterion, marker,
limit, sort_key, sort_dir)