diff options
| -rw-r--r-- | .zuul.yaml | 2 | ||||
| -rw-r--r-- | designate/central/service.py | 20 |
2 files changed, 15 insertions, 7 deletions
@@ -125,7 +125,7 @@ - release-notes-jobs-python3 check: jobs: - - neutron-tempest-plugin-designate-scenario + - neutron-tempest-plugin-designate-scenario-ussuri gate: queue: designate experimental: diff --git a/designate/central/service.py b/designate/central/service.py index 2c0a8403..ce728464 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -2816,9 +2816,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) @@ -2885,9 +2889,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) |