The default of filters should be an empty dict
Change-Id: I9d6923c0985c8cfefa8d02416092a2ef2be5f226 Closes-Bug: #1509229
This commit is contained in:
parent
c1d13be857
commit
584ad48e00
|
@ -124,7 +124,7 @@ class Connection(api.Connection):
|
||||||
|
|
||||||
def _add_bays_filters(self, query, filters):
|
def _add_bays_filters(self, query, filters):
|
||||||
if filters is None:
|
if filters is None:
|
||||||
filters = []
|
filters = {}
|
||||||
|
|
||||||
possible_filters = ["baymodel_id", "name", "node_count",
|
possible_filters = ["baymodel_id", "name", "node_count",
|
||||||
"master_count", "stack_id", "api_address",
|
"master_count", "stack_id", "api_address",
|
||||||
|
@ -286,7 +286,7 @@ class Connection(api.Connection):
|
||||||
|
|
||||||
def _add_baymodels_filters(self, query, filters):
|
def _add_baymodels_filters(self, query, filters):
|
||||||
if filters is None:
|
if filters is None:
|
||||||
filters = []
|
filters = {}
|
||||||
|
|
||||||
possible_filters = ["name", "image_id", "flavor_id",
|
possible_filters = ["name", "image_id", "flavor_id",
|
||||||
"master_flavor_id", "keypair_id",
|
"master_flavor_id", "keypair_id",
|
||||||
|
@ -400,7 +400,7 @@ class Connection(api.Connection):
|
||||||
|
|
||||||
def _add_containers_filters(self, query, filters):
|
def _add_containers_filters(self, query, filters):
|
||||||
if filters is None:
|
if filters is None:
|
||||||
filters = []
|
filters = {}
|
||||||
|
|
||||||
for key in ['name', 'image', 'project_id', 'user_id', 'memory']:
|
for key in ['name', 'image', 'project_id', 'user_id', 'memory']:
|
||||||
if key in filters:
|
if key in filters:
|
||||||
|
@ -495,7 +495,7 @@ class Connection(api.Connection):
|
||||||
|
|
||||||
def _add_nodes_filters(self, query, filters):
|
def _add_nodes_filters(self, query, filters):
|
||||||
if filters is None:
|
if filters is None:
|
||||||
filters = []
|
filters = {}
|
||||||
|
|
||||||
if 'associated' in filters:
|
if 'associated' in filters:
|
||||||
if filters['associated']:
|
if filters['associated']:
|
||||||
|
@ -599,7 +599,7 @@ class Connection(api.Connection):
|
||||||
|
|
||||||
def _add_pods_filters(self, query, filters):
|
def _add_pods_filters(self, query, filters):
|
||||||
if filters is None:
|
if filters is None:
|
||||||
filters = []
|
filters = {}
|
||||||
|
|
||||||
if 'bay_uuid' in filters:
|
if 'bay_uuid' in filters:
|
||||||
query = query.filter_by(bay_uuid=filters['bay_uuid'])
|
query = query.filter_by(bay_uuid=filters['bay_uuid'])
|
||||||
|
@ -694,7 +694,7 @@ class Connection(api.Connection):
|
||||||
|
|
||||||
def _add_services_filters(self, query, filters):
|
def _add_services_filters(self, query, filters):
|
||||||
if filters is None:
|
if filters is None:
|
||||||
filters = []
|
filters = {}
|
||||||
|
|
||||||
if 'bay_uuid' in filters:
|
if 'bay_uuid' in filters:
|
||||||
query = query.filter_by(bay_uuid=filters['bay_uuid'])
|
query = query.filter_by(bay_uuid=filters['bay_uuid'])
|
||||||
|
@ -793,7 +793,7 @@ class Connection(api.Connection):
|
||||||
|
|
||||||
def _add_rcs_filters(self, query, filters):
|
def _add_rcs_filters(self, query, filters):
|
||||||
if filters is None:
|
if filters is None:
|
||||||
filters = []
|
filters = {}
|
||||||
|
|
||||||
if 'bay_uuid' in filters:
|
if 'bay_uuid' in filters:
|
||||||
query = query.filter_by(bay_uuid=filters['bay_uuid'])
|
query = query.filter_by(bay_uuid=filters['bay_uuid'])
|
||||||
|
@ -964,7 +964,7 @@ class Connection(api.Connection):
|
||||||
|
|
||||||
def _add_x509keypairs_filters(self, query, filters):
|
def _add_x509keypairs_filters(self, query, filters):
|
||||||
if filters is None:
|
if filters is None:
|
||||||
filters = []
|
filters = {}
|
||||||
|
|
||||||
if 'bay_uuid' in filters:
|
if 'bay_uuid' in filters:
|
||||||
query = query.filter_by(bay_uuid=filters['bay_uuid'])
|
query = query.filter_by(bay_uuid=filters['bay_uuid'])
|
||||||
|
|
Loading…
Reference in New Issue