Stop skipping compute owner in Linux Bridge loop
Nova Ocata and Newton have protection against bridge creation races in os-vif[1] so we no longer need to special-case this port type in the Linux Bridge loop going forward in Pike. 1. Ib0266086e0caffecf3f9f2a8291369cfa155f386 Related-Bug: #1617447 Change-Id: I2a23d0cbc4c4d0db6e9f48d91ca03b5007f91a84
This commit is contained in:
parent
9ea1fd034a
commit
1feb19c83f
neutron
plugins/ml2/drivers/linuxbridge/agent
tests/unit/plugins/ml2/drivers/linuxbridge/agent
@ -474,25 +474,15 @@ class LinuxBridgeManager(amb.CommonAgentManagerBase):
|
||||
physical_network,
|
||||
segmentation_id):
|
||||
return False
|
||||
# Avoid messing with plugging devices into a bridge that the agent
|
||||
# does not own
|
||||
if not device_owner.startswith(constants.DEVICE_OWNER_COMPUTE_PREFIX):
|
||||
# Check if device needs to be added to bridge
|
||||
if not bridge_lib.BridgeDevice.get_interface_bridge(
|
||||
tap_device_name):
|
||||
data = {'tap_device_name': tap_device_name,
|
||||
'bridge_name': bridge_name}
|
||||
LOG.debug("Adding device %(tap_device_name)s to bridge "
|
||||
"%(bridge_name)s", data)
|
||||
if bridge_lib.BridgeDevice(bridge_name).addif(tap_device_name):
|
||||
return False
|
||||
else:
|
||||
# Check if device needs to be added to bridge
|
||||
if not bridge_lib.BridgeDevice.get_interface_bridge(
|
||||
tap_device_name):
|
||||
data = {'tap_device_name': tap_device_name,
|
||||
'device_owner': device_owner,
|
||||
'bridge_name': bridge_name}
|
||||
LOG.debug("Skip adding device %(tap_device_name)s to "
|
||||
"%(bridge_name)s. It is owned by %(device_owner)s and "
|
||||
"thus added elsewhere.", data)
|
||||
LOG.debug("Adding device %(tap_device_name)s to bridge "
|
||||
"%(bridge_name)s", data)
|
||||
if bridge_lib.BridgeDevice(bridge_name).addif(tap_device_name):
|
||||
return False
|
||||
return True
|
||||
|
||||
def plug_interface(self, network_id, network_segment, tap_name,
|
||||
|
@ -510,15 +510,6 @@ class TestLinuxBridgeManager(base.BaseTestCase):
|
||||
p_const.TYPE_VLAN, "physnet1", None, "tap1",
|
||||
"foo")
|
||||
|
||||
def test_add_tap_interface_owner_compute(self):
|
||||
with mock.patch.object(ip_lib, "device_exists"):
|
||||
with mock.patch.object(self.lbm, "ensure_local_bridge"):
|
||||
self.assertTrue(self.lbm.add_tap_interface("123",
|
||||
p_const.TYPE_LOCAL,
|
||||
"physnet1", None,
|
||||
"tap1",
|
||||
"compute:1"))
|
||||
|
||||
def _test_add_tap_interface(self, dev_owner_prefix):
|
||||
with mock.patch.object(ip_lib, "device_exists") as de_fn:
|
||||
de_fn.return_value = False
|
||||
|
Loading…
x
Reference in New Issue
Block a user