From fb9f0b33d338037365f5c9dae20f4f795b119d13 Mon Sep 17 00:00:00 2001 From: Michael Chapman Date: Wed, 5 May 2021 16:54:18 +1000 Subject: [PATCH] Support filtering on zone import/export list List operations should add the task_type criterion to the user provided criterion. Change-Id: I983d930f975c109cce24a9587bba6db563b3f19f Launchpad: 1926058 --- designate/central/service.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/designate/central/service.py b/designate/central/service.py index d86a99592..ca851fd71 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)