openstack
/
freezer-api
Code Issues Proposed changes

Merge "Add backup search for sql"

This commit is contained in:
Zuul 2018-11-28 04:10:01 +00:00 committed by Gerrit Code Review
parent 9ca5617b1d 11977bac68
commit 750b00c1fc
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
freezer_api/db/sqlalchemy/api.py
View File

@ -585,7 +585,12 @@ def search_action(user_id, project_id=None, offset=0,
actionmap['freezer_action']['log_file'] = action.get('log_file')
actions.append(actionmap)
actions = filter_tuple_by_search_opt(actions, search)
# If search opt is wrong, filter will not work,
# return all tuples.
try:
actions = filter_tuple_by_search_opt(actions, search)
except Exception as e:
LOG.error(e)
return actions
@ -866,7 +871,7 @@ def search_backup(user_id, project_id=None, offset=0,
result = search_tuple(tablename=models.Backup, user_id=user_id,
project_id=project_id, offset=offset,
limit=limit, search=search)
limit=limit)
for backup in result:
backupmap = {}
backupmap['project_id'] = project_id
@ -877,6 +882,13 @@ def search_backup(user_id, project_id=None, offset=0,
json_decode(backup.get('backup_metadata'))
backups.append(backupmap)
# If search opt is wrong, filter will not work,
# return all tuples.
try:
backups = filter_tuple_by_search_opt(backups, search)
except Exception as e:
LOG.error(e)
return backups