Browse Source

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 fb9f0b33d3)
changes/45/817545/2
Michael Chapman 1 year ago committed by Michael Johnson
parent
commit
3069fb6b5f
  1. 2
      .zuul.yaml
  2. 20
      designate/central/service.py

2
.zuul.yaml

@ -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:

20
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)

Loading…
Cancel
Save