Merge "Fix an attribute error on listing AZs with filters"

This commit is contained in:
Zuul 2018-06-02 01:11:47 +00:00 committed by Gerrit Code Review
commit 685fed22e7
2 changed files with 6 additions and 1 deletions

View File

@ -72,7 +72,7 @@ class AgentAvailabilityZoneMixin(az_ext.AvailabilityZonePluginBase):
def _list_availability_zones(self, context, filters=None):
result = {}
filters = filters or {}
agents = agent_obj.Agent.get_objects(context, filters)
agents = agent_obj.Agent.get_objects(context, **filters)
for agent in agents:
if not agent.availability_zone:
continue

View File

@ -70,6 +70,11 @@ class TestAZAgentCase(AZTestCommon):
res = self._list('availability_zones')
azs = res['availability_zones']
self.assertItemsEqual(expected, azs)
# list with filters
res = self._list('availability_zones',
query_params="availability_zone=nova1")
azs = res['availability_zones']
self.assertItemsEqual(expected[:1], azs)
# not admin case
ctx = context.Context('', 'noadmin')
res = self._list('availability_zones', neutron_context=ctx)