x/vmware-nsx
Code Issues Proposed changes

l2pop: get_agent_ports: Don't yield (None, {})

Browse Source 
There's no point to yield None lvm with empty entries.

Closes-Bug: #1355759
Related: blueprint ofagent-l2pop
Change-Id: I42aeb48a062d35038116978d70c8dac4139a5583
This commit is contained in:
YAMAMOTO Takashi 2014-08-11 08:39:59 +09:00
parent 515ce28bc2
commit 92b8ccd4b0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/l2population_rpc.py
View File

@ -166,7 +166,9 @@ class L2populationRpcCallBackTunnelMixin(L2populationRpcCallBackMixin):
def get_agent_ports(self, fdb_entries, local_vlan_map): def get_agent_ports(self, fdb_entries, local_vlan_map):
for network_id, values in fdb_entries.items(): for network_id, values in fdb_entries.items():
lvm = local_vlan_map.get(network_id) lvm = local_vlan_map.get(network_id)
agent_ports = values.get('ports') if lvm else {} if lvm is None:
continue
agent_ports = values.get('ports')
yield (lvm, agent_ports) yield (lvm, agent_ports)
@log.log @log.log

1
neutron/tests/unit/agent/test_l2population_rpc.py
View File

@ -40,7 +40,6 @@ class TestL2populationRpcCallBackTunnelMixin(
self.lvm1: { self.lvm1: {
self.ports[0].ip: [[self.lvms[0].mac, self.lvms[0].ip]], self.ports[0].ip: [[self.lvms[0].mac, self.lvms[0].ip]],
self.local_ip: []}, self.local_ip: []},
None: {},
self.lvm3: { self.lvm3: {
self.ports[2].ip: [[self.lvms[2].mac, self.lvms[2].ip]], self.ports[2].ip: [[self.lvms[2].mac, self.lvms[2].ip]],
self.local_ip: []}, self.local_ip: []},