diff options
| author | Michael Chapman <woppin@gmail.com> | 2021-05-05 16:54:18 +1000 |
|---|---|---|
| committer | Erik Olof Gunnar Andersson <eandersson@blizzard.com> | 2021-06-19 03:38:40 +0000 |
| commit | fb9f0b33d338037365f5c9dae20f4f795b119d13 (patch) | |
| tree | 637445b26aba6aee65ddb422cce339380f342271 | |
| parent | 40b5633dfd65355e53afd298619e672370d2f64b (diff) | |
| download | designate-fb9f0b33d338037365f5c9dae20f4f795b119d13.tar.gz | |
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
| -rw-r--r-- | designate/central/service.py | 20 |
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) |