openstack/placement
Code Issues Proposed changes

Merge "Don't overwrite binding-profile"

Browse Source
This commit is contained in:
Zuul 2017-11-09 11:48:01 +00:00 committed by Gerrit Code Review
commit afb2436146
1 changed files with 9 additions and 1 deletions

10
nova/tests/fixtures.py

@ -1216,6 +1216,13 @@ class NeutronFixture(fixtures.Fixture):
else: else:
return None return None
def _filter_ports(self, **_params):
ports = copy.deepcopy(self._ports)
for opt in _params:
filtered_ports = [p for p in ports if p.get(opt) == _params[opt]]
ports = filtered_ports
return {'ports': ports}
def list_extensions(self, *args, **kwargs): def list_extensions(self, *args, **kwargs):
return copy.deepcopy({'extensions': self._extensions}) return copy.deepcopy({'extensions': self._extensions})
@ -1229,12 +1236,13 @@ class NeutronFixture(fixtures.Fixture):
for current_port in self._ports: for current_port in self._ports:
if current_port['id'] == port: if current_port['id'] == port:
self._ports.remove(current_port) self._ports.remove(current_port)
return
def list_networks(self, retrieve_all=True, **_params): def list_networks(self, retrieve_all=True, **_params):
return copy.deepcopy({'networks': self._networks}) return copy.deepcopy({'networks': self._networks})
def list_ports(self, retrieve_all=True, **_params): def list_ports(self, retrieve_all=True, **_params):
return copy.deepcopy({'ports': self._ports}) return self._filter_ports(**_params)
def list_subnets(self, retrieve_all=True, **_params): def list_subnets(self, retrieve_all=True, **_params):
return copy.deepcopy({'subnets': self._subnets}) return copy.deepcopy({'subnets': self._subnets})