openstack/manila
Code Issues Proposed changes

Merge "Filter shares by share type "extra_specs""

Browse Source
This commit is contained in:
Zuul 2021-07-06 09:06:21 +00:00 committed by Gerrit Code Review
commit a2d30e215e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manila/db/sqlalchemy/api.py
View File

@ -42,6 +42,7 @@ from oslo_utils import importutils
from oslo_utils import timeutils from oslo_utils import timeutils
from oslo_utils import uuidutils from oslo_utils import uuidutils
import sqlalchemy import sqlalchemy
from sqlalchemy import and_
from sqlalchemy import MetaData from sqlalchemy import MetaData
from sqlalchemy import or_ from sqlalchemy import or_
from sqlalchemy.orm import joinedload from sqlalchemy.orm import joinedload
@ -2022,8 +2023,8 @@ def _process_share_filters(query, filters, project_id=None, is_public=False):
models.ShareTypeExtraSpecs.share_type_id == models.ShareTypeExtraSpecs.share_type_id ==
models.ShareInstance.share_type_id) models.ShareInstance.share_type_id)
for k, v in filters['extra_specs'].items(): for k, v in filters['extra_specs'].items():
query = query.filter(or_(models.ShareTypeExtraSpecs.key == k, query = query.filter(and_(models.ShareTypeExtraSpecs.key == k,
models.ShareTypeExtraSpecs.value == v)) models.ShareTypeExtraSpecs.value == v))
return query return query

5
releasenotes/notes/bug-192912-fix-filtering-shares-by-extra-specs-b79235301306bcf2.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Filtering shares by share-type "extra_specs" as
key=value now returns the expected output.