openstack
/
magnum
Code Issues Proposed changes

Merge "The default of filters should be an empty dict"

This commit is contained in:
Jenkins 2015-10-23 17:55:50 +00:00 committed by Gerrit Code Review
parent 947f67d4ee 584ad48e00
commit 7cadd64d23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ class Connection(api.Connection):
def _add_bays_filters(self, query, filters):
if filters is None:
filters = []
filters = {}
possible_filters = ["baymodel_id", "name", "node_count",
"master_count", "stack_id", "api_address",
@ -286,7 +286,7 @@ class Connection(api.Connection):
def _add_baymodels_filters(self, query, filters):
if filters is None:
filters = []
filters = {}
possible_filters = ["name", "image_id", "flavor_id",
"master_flavor_id", "keypair_id",
@ -400,7 +400,7 @@ class Connection(api.Connection):
def _add_containers_filters(self, query, filters):
if filters is None:
filters = []
filters = {}
for key in ['name', 'image', 'project_id', 'user_id', 'memory']:
if key in filters:
@ -495,7 +495,7 @@ class Connection(api.Connection):
def _add_nodes_filters(self, query, filters):
if filters is None:
filters = []
filters = {}
if 'associated' in filters:
if filters['associated']:
@ -599,7 +599,7 @@ class Connection(api.Connection):
def _add_pods_filters(self, query, filters):
if filters is None:
filters = []
filters = {}
if 'bay_uuid' in filters:
query = query.filter_by(bay_uuid=filters['bay_uuid'])
@ -694,7 +694,7 @@ class Connection(api.Connection):
def _add_services_filters(self, query, filters):
if filters is None:
filters = []
filters = {}
if 'bay_uuid' in filters:
query = query.filter_by(bay_uuid=filters['bay_uuid'])
@ -793,7 +793,7 @@ class Connection(api.Connection):
def _add_rcs_filters(self, query, filters):
if filters is None:
filters = []
filters = {}
if 'bay_uuid' in filters:
query = query.filter_by(bay_uuid=filters['bay_uuid'])
@ -964,7 +964,7 @@ class Connection(api.Connection):
def _add_x509keypairs_filters(self, query, filters):
if filters is None:
filters = []
filters = {}
if 'bay_uuid' in filters:
query = query.filter_by(bay_uuid=filters['bay_uuid'])