Skip to content

Commit

Permalink
Merge "filters['id'] is a list instead of single id"
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Jun 18, 2015
2 parents ef004cb + 47ab0a4 commit fa5c9fe
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -2641,9 +2641,11 @@ def subnets_list(self, context, filters=None):
if filters and 'id' in filters:
# required subnets are specified,
# just read in corresponding net_ids
subnet_keys = self._subnet_vnc_read_mapping(id=filters['id'])
net_ids = [sk.split()[0] for sk in subnet_keys]
all_net_objs.extend(self._virtual_network_list(obj_uuids=net_ids,
net_ids = set([])
for subnet_id in filters['id']:
subnet_key = self._subnet_vnc_read_mapping(id=subnet_id)
net_ids.add(subnet_key.split()[0])
all_net_objs.extend(self._virtual_network_list(obj_uuids=list(net_ids),
detail=True))
else:
if not context['is_admin']:
Expand Down

0 comments on commit fa5c9fe

Please sign in to comment.