Linuxbridge agent: detect existing IP on bridge
If bridge IP address already exists, when we try and add it an error will be raised. Check for the existence of the IP to avoid the error. Closes-Bug: #1697926 Change-Id: I9aae3b4f0fab053e8c215887f58b983d9549582d
This commit is contained in:
parent
044a06383b
commit
ba5e846859
@ -355,7 +355,10 @@ class LinuxBridgeManager(amb.CommonAgentManagerBase):
|
|||||||
# Append IP's to bridge if necessary
|
# Append IP's to bridge if necessary
|
||||||
if ips:
|
if ips:
|
||||||
for ip in ips:
|
for ip in ips:
|
||||||
dst_device.addr.add(cidr=ip['cidr'])
|
# If bridge ip address already exists, then don't add
|
||||||
|
# otherwise will report error
|
||||||
|
if not dst_device.addr.list(to=ip['cidr']):
|
||||||
|
dst_device.addr.add(cidr=ip['cidr'])
|
||||||
|
|
||||||
if gateway:
|
if gateway:
|
||||||
# Ensure that the gateway can be updated by changing the metric
|
# Ensure that the gateway can be updated by changing the metric
|
||||||
|
@ -415,7 +415,19 @@ class TestLinuxBridgeManager(base.BaseTestCase):
|
|||||||
ip_version=4,
|
ip_version=4,
|
||||||
dynamic=False)
|
dynamic=False)
|
||||||
with mock.patch.object(ip_lib.IpAddrCommand, 'add') as add_fn,\
|
with mock.patch.object(ip_lib.IpAddrCommand, 'add') as add_fn,\
|
||||||
mock.patch.object(ip_lib.IpAddrCommand, 'delete') as del_fn:
|
mock.patch.object(ip_lib.IpAddrCommand, 'delete') as del_fn,\
|
||||||
|
mock.patch.object(ip_lib.IpAddrCommand, 'list') as list_fn:
|
||||||
|
# 'list' actually returns a dict, but we're only simulating
|
||||||
|
# whether the device exists or not
|
||||||
|
list_fn.side_effect = [True, False]
|
||||||
|
|
||||||
|
self.lbm._update_interface_ip_details("br0", "eth0",
|
||||||
|
[ipdict], None)
|
||||||
|
self.assertFalse(add_fn.called)
|
||||||
|
self.assertTrue(del_fn.called)
|
||||||
|
|
||||||
|
add_fn.reset_mock()
|
||||||
|
del_fn.reset_mock()
|
||||||
self.lbm._update_interface_ip_details("br0", "eth0",
|
self.lbm._update_interface_ip_details("br0", "eth0",
|
||||||
[ipdict], None)
|
[ipdict], None)
|
||||||
self.assertTrue(add_fn.called)
|
self.assertTrue(add_fn.called)
|
||||||
|
Loading…
Reference in New Issue
Block a user