diff options
| author | Michael Chapman <woppin@gmail.com> | 2021-05-05 16:54:18 +1000 |
|---|---|---|
| committer | Michael Johnson <johnsomor@gmail.com> | 2021-11-20 01:05:36 +0000 |
| commit | 3069fb6b5fdc0a86c7df50b56d434c647c9230aa (patch) | |
| tree | fd4d9acce09a8c02070094afb4409709b3202d96 | |
| parent | 7cbbd3a18ffedc9dbeaddaab189643b59a224878 (diff) | |
| download | designate-3069fb6b5fdc0a86c7df50b56d434c647c9230aa.tar.gz | |
Support filtering on zone import/export list
List operations should add the task_type criterion to the user
provided criterion.
This patch also fixes the neutron-tempest-plugin-designate-scenario
job to use the ussuri version neutron-tempest-plugin-designate-scenario-ussuri.
This is required for this patch to merge.
Change-Id: I983d930f975c109cce24a9587bba6db563b3f19f
Launchpad: 1926058
(cherry picked from commit fb9f0b33d338037365f5c9dae20f4f795b119d13)
| -rw-r--r-- | .zuul.yaml | 2 | ||||
| -rw-r--r-- | designate/central/service.py | 20 |
2 files changed, 15 insertions, 7 deletions
@@ -150,7 +150,7 @@ - release-notes-jobs-python3 check: jobs: - - neutron-tempest-plugin-designate-scenario + - neutron-tempest-plugin-designate-scenario-victoria gate: queue: designate experimental: 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) |