x/vmware-nsx
Code Issues Proposed changes

Do not transfer ips if there isn't any

Browse Source 
Fixes bug 1044403

Check if the interface being attached to the bridge has ips
before iterating over them

Change-Id: I54315831f240c6810707e7247e7a76c1bfa8742e
This commit is contained in:
Salvatore Orlando 2012-08-31 07:30:54 -07:00
parent 8fb4e6efe8
commit d1dce679f1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
View File

@ -216,10 +216,11 @@ class LinuxBridge:
src_device = self.ip.device(source)
# Append IP's to bridge if necessary
for ip in ips:
dst_device.addr.add(ip_version=ip['ip_version'],
cidr=ip['cidr'],
broadcast=ip['broadcast'])
if ips:
for ip in ips:
dst_device.addr.add(ip_version=ip['ip_version'],
cidr=ip['cidr'],
broadcast=ip['broadcast'])
if gateway:
# Ensure that the gateway can be updated by changing the metric
@ -231,9 +232,10 @@ class LinuxBridge:
src_device.route.delete_gateway(gateway=gateway['gateway'])
# Remove IP's from interface
for ip in ips:
src_device.addr.delete(ip_version=ip['ip_version'],
cidr=ip['cidr'])
if ips:
for ip in ips:
src_device.addr.delete(ip_version=ip['ip_version'],
cidr=ip['cidr'])
def ensure_bridge(self, bridge_name, interface, ips=None, gateway=None):
"""