cb0df591a9
This change adds the ability to monitor the local ovsdb for interface changes so that the l2 agent can avoid unnecessary polling. Minimal changes are made to the agent so the risk of breakage should be low. Future efforts to make the agent entirely event-based may be able to use OvsdbMonitor as a starting point. By default polling minimization is not done, and can only be enabled by setting 'minimize_polling = True' in the ovs section of the l2 agent's config file. Closes-Bug: #1177973 Change-Id: I26c035b48a74df2148696869c5a9affae5ab3d27
650 lines
30 KiB
Python
650 lines
30 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright (c) 2012 OpenStack Foundation.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import contextlib
|
|
import sys
|
|
|
|
import mock
|
|
from oslo.config import cfg
|
|
import testtools
|
|
|
|
from neutron.agent.linux import ip_lib
|
|
from neutron.agent.linux import ovs_lib
|
|
from neutron.agent.linux import utils
|
|
from neutron.common import constants as n_const
|
|
from neutron.openstack.common.rpc import common as rpc_common
|
|
from neutron.plugins.openvswitch.agent import ovs_neutron_agent
|
|
from neutron.plugins.openvswitch.common import constants
|
|
from neutron.tests import base
|
|
|
|
|
|
NOTIFIER = ('neutron.plugins.openvswitch.'
|
|
'ovs_neutron_plugin.AgentNotifierApi')
|
|
|
|
|
|
class CreateAgentConfigMap(base.BaseTestCase):
|
|
|
|
def test_create_agent_config_map_succeeds(self):
|
|
self.assertTrue(ovs_neutron_agent.create_agent_config_map(cfg.CONF))
|
|
|
|
def test_create_agent_config_map_fails_for_invalid_tunnel_config(self):
|
|
self.addCleanup(cfg.CONF.reset)
|
|
# An ip address is required for tunneling but there is no default,
|
|
# verify this for both gre and vxlan tunnels.
|
|
cfg.CONF.set_override('tunnel_types', [constants.TYPE_GRE],
|
|
group='AGENT')
|
|
with testtools.ExpectedException(ValueError):
|
|
ovs_neutron_agent.create_agent_config_map(cfg.CONF)
|
|
cfg.CONF.set_override('tunnel_types', [constants.TYPE_VXLAN],
|
|
group='AGENT')
|
|
with testtools.ExpectedException(ValueError):
|
|
ovs_neutron_agent.create_agent_config_map(cfg.CONF)
|
|
|
|
def test_create_agent_config_map_enable_tunneling(self):
|
|
self.addCleanup(cfg.CONF.reset)
|
|
# Verify setting only enable_tunneling will default tunnel_type to GRE
|
|
cfg.CONF.set_override('tunnel_types', None, group='AGENT')
|
|
cfg.CONF.set_override('enable_tunneling', True, group='OVS')
|
|
cfg.CONF.set_override('local_ip', '10.10.10.10', group='OVS')
|
|
cfgmap = ovs_neutron_agent.create_agent_config_map(cfg.CONF)
|
|
self.assertEqual(cfgmap['tunnel_types'], [constants.TYPE_GRE])
|
|
|
|
def test_create_agent_config_map_fails_no_local_ip(self):
|
|
self.addCleanup(cfg.CONF.reset)
|
|
# An ip address is required for tunneling but there is no default
|
|
cfg.CONF.set_override('enable_tunneling', True, group='OVS')
|
|
with testtools.ExpectedException(ValueError):
|
|
ovs_neutron_agent.create_agent_config_map(cfg.CONF)
|
|
|
|
def test_create_agent_config_map_fails_for_invalid_tunnel_type(self):
|
|
self.addCleanup(cfg.CONF.reset)
|
|
cfg.CONF.set_override('tunnel_types', ['foobar'], group='AGENT')
|
|
with testtools.ExpectedException(ValueError):
|
|
ovs_neutron_agent.create_agent_config_map(cfg.CONF)
|
|
|
|
def test_create_agent_config_map_multiple_tunnel_types(self):
|
|
self.addCleanup(cfg.CONF.reset)
|
|
cfg.CONF.set_override('local_ip', '10.10.10.10', group='OVS')
|
|
cfg.CONF.set_override('tunnel_types', [constants.TYPE_GRE,
|
|
constants.TYPE_VXLAN], group='AGENT')
|
|
cfgmap = ovs_neutron_agent.create_agent_config_map(cfg.CONF)
|
|
self.assertEqual(cfgmap['tunnel_types'],
|
|
[constants.TYPE_GRE, constants.TYPE_VXLAN])
|
|
|
|
|
|
class TestOvsNeutronAgent(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(TestOvsNeutronAgent, self).setUp()
|
|
self.addCleanup(cfg.CONF.reset)
|
|
self.addCleanup(mock.patch.stopall)
|
|
notifier_p = mock.patch(NOTIFIER)
|
|
notifier_cls = notifier_p.start()
|
|
self.notifier = mock.Mock()
|
|
notifier_cls.return_value = self.notifier
|
|
# Avoid rpc initialization for unit tests
|
|
cfg.CONF.set_override('rpc_backend',
|
|
'neutron.openstack.common.rpc.impl_fake')
|
|
kwargs = ovs_neutron_agent.create_agent_config_map(cfg.CONF)
|
|
|
|
class MockFixedIntervalLoopingCall(object):
|
|
def __init__(self, f):
|
|
self.f = f
|
|
|
|
def start(self, interval=0):
|
|
self.f()
|
|
|
|
with contextlib.nested(
|
|
mock.patch('neutron.plugins.openvswitch.agent.ovs_neutron_agent.'
|
|
'OVSNeutronAgent.setup_integration_br',
|
|
return_value=mock.Mock()),
|
|
mock.patch('neutron.plugins.openvswitch.agent.ovs_neutron_agent.'
|
|
'OVSNeutronAgent.setup_ancillary_bridges',
|
|
return_value=[]),
|
|
mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.'
|
|
'get_local_port_mac',
|
|
return_value='00:00:00:00:00:01'),
|
|
mock.patch('neutron.agent.linux.utils.get_interface_mac',
|
|
return_value='00:00:00:00:00:01'),
|
|
mock.patch('neutron.openstack.common.loopingcall.'
|
|
'FixedIntervalLoopingCall',
|
|
new=MockFixedIntervalLoopingCall)):
|
|
self.agent = ovs_neutron_agent.OVSNeutronAgent(**kwargs)
|
|
self.agent.tun_br = mock.Mock()
|
|
self.agent.sg_agent = mock.Mock()
|
|
|
|
def _mock_port_bound(self, ofport=None):
|
|
port = mock.Mock()
|
|
port.ofport = ofport
|
|
net_uuid = 'my-net-uuid'
|
|
with mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.'
|
|
'set_db_attribute',
|
|
return_value=True):
|
|
with mock.patch.object(self.agent.int_br,
|
|
'delete_flows') as delete_flows_func:
|
|
self.agent.port_bound(port, net_uuid, 'local', None, None)
|
|
self.assertEqual(delete_flows_func.called, ofport != -1)
|
|
|
|
def test_port_bound_deletes_flows_for_valid_ofport(self):
|
|
self._mock_port_bound(ofport=1)
|
|
|
|
def test_port_bound_ignores_flows_for_invalid_ofport(self):
|
|
self._mock_port_bound(ofport=-1)
|
|
|
|
def test_port_dead(self):
|
|
with mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.'
|
|
'set_db_attribute',
|
|
return_value=True):
|
|
with mock.patch.object(self.agent.int_br,
|
|
'add_flow') as add_flow_func:
|
|
self.agent.port_dead(mock.Mock())
|
|
self.assertTrue(add_flow_func.called)
|
|
|
|
def mock_update_ports(self, vif_port_set=None, registered_ports=None):
|
|
with mock.patch.object(self.agent.int_br, 'get_vif_port_set',
|
|
return_value=vif_port_set):
|
|
return self.agent.update_ports(registered_ports)
|
|
|
|
def test_update_ports_returns_none_for_unchanged_ports(self):
|
|
self.assertIsNone(self.mock_update_ports())
|
|
|
|
def test_update_ports_returns_port_changes(self):
|
|
vif_port_set = set([1, 3])
|
|
registered_ports = set([1, 2])
|
|
expected = dict(current=vif_port_set, added=set([3]), removed=set([2]))
|
|
actual = self.mock_update_ports(vif_port_set, registered_ports)
|
|
self.assertEqual(expected, actual)
|
|
|
|
def test_treat_devices_added_returns_true_for_missing_device(self):
|
|
with mock.patch.object(self.agent.plugin_rpc, 'get_device_details',
|
|
side_effect=Exception()):
|
|
self.assertTrue(self.agent.treat_devices_added([{}]))
|
|
|
|
def _mock_treat_devices_added(self, details, port, func_name):
|
|
"""Mock treat devices added.
|
|
|
|
:param details: the details to return for the device
|
|
:param port: the port that get_vif_port_by_id should return
|
|
:param func_name: the function that should be called
|
|
:returns: whether the named function was called
|
|
"""
|
|
with contextlib.nested(
|
|
mock.patch.object(self.agent.plugin_rpc, 'get_device_details',
|
|
return_value=details),
|
|
mock.patch.object(self.agent.int_br, 'get_vif_port_by_id',
|
|
return_value=port),
|
|
mock.patch.object(self.agent.plugin_rpc, 'update_device_up'),
|
|
mock.patch.object(self.agent, func_name)
|
|
) as (get_dev_fn, get_vif_func, upd_dev_up, func):
|
|
self.assertFalse(self.agent.treat_devices_added([{}]))
|
|
return func.called
|
|
|
|
def test_treat_devices_added_ignores_invalid_ofport(self):
|
|
port = mock.Mock()
|
|
port.ofport = -1
|
|
self.assertFalse(self._mock_treat_devices_added(mock.MagicMock(), port,
|
|
'port_dead'))
|
|
|
|
def test_treat_devices_added_marks_unknown_port_as_dead(self):
|
|
port = mock.Mock()
|
|
port.ofport = 1
|
|
self.assertTrue(self._mock_treat_devices_added(mock.MagicMock(), port,
|
|
'port_dead'))
|
|
|
|
def test_treat_devices_added_updates_known_port(self):
|
|
details = mock.MagicMock()
|
|
details.__contains__.side_effect = lambda x: True
|
|
self.assertTrue(self._mock_treat_devices_added(details,
|
|
mock.Mock(),
|
|
'treat_vif_port'))
|
|
|
|
def test_treat_devices_removed_returns_true_for_missing_device(self):
|
|
with mock.patch.object(self.agent.plugin_rpc, 'update_device_down',
|
|
side_effect=Exception()):
|
|
self.assertTrue(self.agent.treat_devices_removed([{}]))
|
|
|
|
def _mock_treat_devices_removed(self, port_exists):
|
|
details = dict(exists=port_exists)
|
|
with mock.patch.object(self.agent.plugin_rpc, 'update_device_down',
|
|
return_value=details):
|
|
with mock.patch.object(self.agent, 'port_unbound') as port_unbound:
|
|
self.assertFalse(self.agent.treat_devices_removed([{}]))
|
|
self.assertEqual(port_unbound.called, not port_exists)
|
|
|
|
def test_treat_devices_removed_unbinds_port(self):
|
|
self._mock_treat_devices_removed(True)
|
|
|
|
def test_treat_devices_removed_ignores_missing_port(self):
|
|
self._mock_treat_devices_removed(False)
|
|
|
|
def test_process_network_ports(self):
|
|
reply = {'current': set(['tap0']),
|
|
'removed': set(['eth0']),
|
|
'added': set(['eth1'])}
|
|
with mock.patch.object(self.agent, 'treat_devices_added',
|
|
return_value=False) as device_added:
|
|
with mock.patch.object(self.agent, 'treat_devices_removed',
|
|
return_value=False) as device_removed:
|
|
self.assertFalse(self.agent.process_network_ports(reply))
|
|
self.assertTrue(device_added.called)
|
|
self.assertTrue(device_removed.called)
|
|
|
|
def test_report_state(self):
|
|
with mock.patch.object(self.agent.state_rpc,
|
|
"report_state") as report_st:
|
|
self.agent.int_br_device_count = 5
|
|
self.agent._report_state()
|
|
report_st.assert_called_with(self.agent.context,
|
|
self.agent.agent_state)
|
|
self.assertNotIn("start_flag", self.agent.agent_state)
|
|
self.assertEqual(
|
|
self.agent.agent_state["configurations"]["devices"],
|
|
self.agent.int_br_device_count
|
|
)
|
|
|
|
def test_network_delete(self):
|
|
with contextlib.nested(
|
|
mock.patch.object(self.agent, "reclaim_local_vlan"),
|
|
mock.patch.object(self.agent.tun_br, "cleanup_tunnel_port")
|
|
) as (recl_fn, clean_tun_fn):
|
|
self.agent.network_delete("unused_context",
|
|
network_id="123")
|
|
self.assertFalse(recl_fn.called)
|
|
self.agent.local_vlan_map["123"] = "LVM object"
|
|
self.agent.network_delete("unused_context",
|
|
network_id="123")
|
|
self.assertFalse(clean_tun_fn.called)
|
|
recl_fn.assert_called_with("123")
|
|
|
|
def test_port_update(self):
|
|
with contextlib.nested(
|
|
mock.patch.object(self.agent.int_br, "get_vif_port_by_id"),
|
|
mock.patch.object(self.agent, "treat_vif_port"),
|
|
mock.patch.object(self.agent.plugin_rpc, "update_device_up"),
|
|
mock.patch.object(self.agent.plugin_rpc, "update_device_down")
|
|
) as (getvif_fn, treatvif_fn, updup_fn, upddown_fn):
|
|
port = {"id": "123",
|
|
"network_id": "124",
|
|
"admin_state_up": False}
|
|
getvif_fn.return_value = "vif_port_obj"
|
|
self.agent.port_update("unused_context",
|
|
port=port,
|
|
network_type="vlan",
|
|
segmentation_id="1",
|
|
physical_network="physnet")
|
|
treatvif_fn.assert_called_with("vif_port_obj", "123",
|
|
"124", "vlan", "physnet",
|
|
"1", False)
|
|
upddown_fn.assert_called_with(self.agent.context,
|
|
"123", self.agent.agent_id,
|
|
cfg.CONF.host)
|
|
|
|
port["admin_state_up"] = True
|
|
self.agent.port_update("unused_context",
|
|
port=port,
|
|
network_type="vlan",
|
|
segmentation_id="1",
|
|
physical_network="physnet")
|
|
updup_fn.assert_called_with(self.agent.context,
|
|
"123", self.agent.agent_id,
|
|
cfg.CONF.host)
|
|
|
|
def test_port_update_plugin_rpc_failed(self):
|
|
port = {'id': 1,
|
|
'network_id': 1,
|
|
'admin_state_up': True}
|
|
with contextlib.nested(
|
|
mock.patch.object(ovs_neutron_agent.LOG, 'error'),
|
|
mock.patch.object(self.agent.int_br, "get_vif_port_by_id"),
|
|
mock.patch.object(self.agent.plugin_rpc, 'update_device_up'),
|
|
mock.patch.object(self.agent, 'port_bound'),
|
|
mock.patch.object(self.agent.plugin_rpc, 'update_device_down'),
|
|
mock.patch.object(self.agent, 'port_dead')
|
|
) as (log, _, device_up, _, device_down, _):
|
|
device_up.side_effect = rpc_common.Timeout
|
|
self.agent.port_update(mock.Mock(), port=port)
|
|
self.assertTrue(device_up.called)
|
|
self.assertEqual(log.call_count, 1)
|
|
|
|
log.reset_mock()
|
|
port['admin_state_up'] = False
|
|
device_down.side_effect = rpc_common.Timeout
|
|
self.agent.port_update(mock.Mock(), port=port)
|
|
self.assertTrue(device_down.called)
|
|
self.assertEqual(log.call_count, 1)
|
|
|
|
def test_setup_physical_bridges(self):
|
|
with contextlib.nested(
|
|
mock.patch.object(ip_lib, "device_exists"),
|
|
mock.patch.object(sys, "exit"),
|
|
mock.patch.object(utils, "execute"),
|
|
mock.patch.object(ovs_lib.OVSBridge, "remove_all_flows"),
|
|
mock.patch.object(ovs_lib.OVSBridge, "add_flow"),
|
|
mock.patch.object(ovs_lib.OVSBridge, "add_port"),
|
|
mock.patch.object(ovs_lib.OVSBridge, "delete_port"),
|
|
mock.patch.object(self.agent.int_br, "add_port"),
|
|
mock.patch.object(self.agent.int_br, "delete_port"),
|
|
mock.patch.object(ip_lib.IPWrapper, "add_veth"),
|
|
mock.patch.object(ip_lib.IpLinkCommand, "delete"),
|
|
mock.patch.object(ip_lib.IpLinkCommand, "set_up"),
|
|
mock.patch.object(ip_lib.IpLinkCommand, "set_mtu")
|
|
) as (devex_fn, sysexit_fn, utilsexec_fn, remflows_fn, ovs_addfl_fn,
|
|
ovs_addport_fn, ovs_delport_fn, br_addport_fn,
|
|
br_delport_fn, addveth_fn, linkdel_fn, linkset_fn, linkmtu_fn):
|
|
devex_fn.return_value = True
|
|
parent = mock.MagicMock()
|
|
parent.attach_mock(utilsexec_fn, 'utils_execute')
|
|
parent.attach_mock(linkdel_fn, 'link_delete')
|
|
parent.attach_mock(addveth_fn, 'add_veth')
|
|
addveth_fn.return_value = (ip_lib.IPDevice("int-br-eth1"),
|
|
ip_lib.IPDevice("phy-br-eth1"))
|
|
ovs_addport_fn.return_value = "int_ofport"
|
|
br_addport_fn.return_value = "phys_veth"
|
|
self.agent.setup_physical_bridges({"physnet1": "br-eth"})
|
|
expected_calls = [mock.call.link_delete(),
|
|
mock.call.utils_execute(['/sbin/udevadm',
|
|
'settle',
|
|
'--timeout=10']),
|
|
mock.call.add_veth('int-br-eth',
|
|
'phy-br-eth')]
|
|
parent.assert_has_calls(expected_calls, any_order=False)
|
|
self.assertEqual(self.agent.int_ofports["physnet1"],
|
|
"phys_veth")
|
|
self.assertEqual(self.agent.phys_ofports["physnet1"],
|
|
"int_ofport")
|
|
|
|
def test_port_unbound(self):
|
|
with mock.patch.object(self.agent, "reclaim_local_vlan") as reclvl_fn:
|
|
self.agent.enable_tunneling = True
|
|
lvm = mock.Mock()
|
|
lvm.network_type = "gre"
|
|
lvm.vif_ports = {"vif1": mock.Mock()}
|
|
self.agent.local_vlan_map["netuid12345"] = lvm
|
|
self.agent.port_unbound("vif1", "netuid12345")
|
|
self.assertTrue(reclvl_fn.called)
|
|
reclvl_fn.called = False
|
|
|
|
lvm.vif_ports = {}
|
|
self.agent.port_unbound("vif1", "netuid12345")
|
|
self.assertEqual(reclvl_fn.call_count, 2)
|
|
|
|
lvm.vif_ports = {"vif1": mock.Mock()}
|
|
self.agent.port_unbound("vif3", "netuid12345")
|
|
self.assertEqual(reclvl_fn.call_count, 2)
|
|
|
|
def _check_ovs_vxlan_version(self, installed_usr_version,
|
|
installed_klm_version, min_vers,
|
|
expecting_ok):
|
|
with mock.patch(
|
|
'neutron.agent.linux.ovs_lib.get_installed_ovs_klm_version'
|
|
) as klm_cmd:
|
|
with mock.patch(
|
|
'neutron.agent.linux.ovs_lib.get_installed_ovs_usr_version'
|
|
) as usr_cmd:
|
|
try:
|
|
klm_cmd.return_value = installed_klm_version
|
|
usr_cmd.return_value = installed_usr_version
|
|
self.agent.tunnel_types = 'vxlan'
|
|
ovs_neutron_agent.check_ovs_version(min_vers,
|
|
root_helper='sudo')
|
|
version_ok = True
|
|
except SystemExit as e:
|
|
self.assertEqual(e.code, 1)
|
|
version_ok = False
|
|
self.assertEqual(version_ok, expecting_ok)
|
|
|
|
def test_check_minimum_version(self):
|
|
self._check_ovs_vxlan_version('1.10', '1.10',
|
|
constants.MINIMUM_OVS_VXLAN_VERSION,
|
|
expecting_ok=True)
|
|
|
|
def test_check_future_version(self):
|
|
self._check_ovs_vxlan_version('1.11', '1.11',
|
|
constants.MINIMUM_OVS_VXLAN_VERSION,
|
|
expecting_ok=True)
|
|
|
|
def test_check_fail_version(self):
|
|
self._check_ovs_vxlan_version('1.9', '1.9',
|
|
constants.MINIMUM_OVS_VXLAN_VERSION,
|
|
expecting_ok=False)
|
|
|
|
def test_check_fail_no_version(self):
|
|
self._check_ovs_vxlan_version(None, None,
|
|
constants.MINIMUM_OVS_VXLAN_VERSION,
|
|
expecting_ok=False)
|
|
|
|
def test_check_fail_klm_version(self):
|
|
self._check_ovs_vxlan_version('1.10', '1.9',
|
|
constants.MINIMUM_OVS_VXLAN_VERSION,
|
|
expecting_ok=False)
|
|
|
|
def _prepare_l2_pop_ofports(self):
|
|
lvm1 = mock.Mock()
|
|
lvm1.network_type = 'gre'
|
|
lvm1.vlan = 'vlan1'
|
|
lvm1.segmentation_id = 'seg1'
|
|
lvm1.tun_ofports = set(['1'])
|
|
lvm2 = mock.Mock()
|
|
lvm2.network_type = 'gre'
|
|
lvm2.vlan = 'vlan2'
|
|
lvm2.segmentation_id = 'seg2'
|
|
lvm2.tun_ofports = set(['1', '2'])
|
|
self.agent.local_vlan_map = {'net1': lvm1, 'net2': lvm2}
|
|
self.agent.tun_br_ofports = {'gre':
|
|
{'ip_agent_1': '1', 'ip_agent_2': '2'}}
|
|
|
|
def test_fdb_ignore_network(self):
|
|
self._prepare_l2_pop_ofports()
|
|
fdb_entry = {'net3': {}}
|
|
with contextlib.nested(
|
|
mock.patch.object(self.agent.tun_br, 'add_flow'),
|
|
mock.patch.object(self.agent.tun_br, 'delete_flows'),
|
|
mock.patch.object(self.agent, 'setup_tunnel_port'),
|
|
mock.patch.object(self.agent, 'cleanup_tunnel_port')
|
|
) as (add_flow_fn, del_flow_fn, add_tun_fn, clean_tun_fn):
|
|
self.agent.fdb_add(None, fdb_entry)
|
|
self.assertFalse(add_flow_fn.called)
|
|
self.assertFalse(add_tun_fn.called)
|
|
self.agent.fdb_remove(None, fdb_entry)
|
|
self.assertFalse(del_flow_fn.called)
|
|
self.assertFalse(clean_tun_fn.called)
|
|
|
|
def test_fdb_ignore_self(self):
|
|
self._prepare_l2_pop_ofports()
|
|
self.agent.local_ip = 'agent_ip'
|
|
fdb_entry = {'net2':
|
|
{'network_type': 'gre',
|
|
'segment_id': 'tun2',
|
|
'ports':
|
|
{'agent_ip':
|
|
[['mac', 'ip'],
|
|
n_const.FLOODING_ENTRY]}}}
|
|
with mock.patch.object(self.agent.tun_br,
|
|
"defer_apply_on") as defer_fn:
|
|
self.agent.fdb_add(None, fdb_entry)
|
|
self.assertFalse(defer_fn.called)
|
|
|
|
self.agent.fdb_remove(None, fdb_entry)
|
|
self.assertFalse(defer_fn.called)
|
|
|
|
def test_fdb_add_flows(self):
|
|
self._prepare_l2_pop_ofports()
|
|
fdb_entry = {'net1':
|
|
{'network_type': 'gre',
|
|
'segment_id': 'tun1',
|
|
'ports':
|
|
{'ip_agent_2':
|
|
[['mac', 'ip'],
|
|
n_const.FLOODING_ENTRY]}}}
|
|
with contextlib.nested(
|
|
mock.patch.object(self.agent.tun_br, 'add_flow'),
|
|
mock.patch.object(self.agent.tun_br, 'mod_flow'),
|
|
mock.patch.object(self.agent.tun_br, 'setup_tunnel_port'),
|
|
) as (add_flow_fn, mod_flow_fn, add_tun_fn):
|
|
add_tun_fn.return_value = '2'
|
|
self.agent.fdb_add(None, fdb_entry)
|
|
add_flow_fn.assert_called_with(table=constants.UCAST_TO_TUN,
|
|
priority=2,
|
|
dl_vlan='vlan1',
|
|
dl_dst='mac',
|
|
actions='strip_vlan,'
|
|
'set_tunnel:seg1,output:2')
|
|
mod_flow_fn.assert_called_with(table=constants.FLOOD_TO_TUN,
|
|
priority=1,
|
|
dl_vlan='vlan1',
|
|
actions='strip_vlan,'
|
|
'set_tunnel:seg1,output:1,2')
|
|
|
|
def test_fdb_del_flows(self):
|
|
self._prepare_l2_pop_ofports()
|
|
fdb_entry = {'net2':
|
|
{'network_type': 'gre',
|
|
'segment_id': 'tun2',
|
|
'ports':
|
|
{'ip_agent_2':
|
|
[['mac', 'ip'],
|
|
n_const.FLOODING_ENTRY]}}}
|
|
with contextlib.nested(
|
|
mock.patch.object(self.agent.tun_br, 'mod_flow'),
|
|
mock.patch.object(self.agent.tun_br, 'delete_flows'),
|
|
) as (mod_flow_fn, del_flow_fn):
|
|
self.agent.fdb_remove(None, fdb_entry)
|
|
del_flow_fn.assert_called_with(table=constants.UCAST_TO_TUN,
|
|
dl_vlan='vlan2',
|
|
dl_dst='mac')
|
|
mod_flow_fn.assert_called_with(table=constants.FLOOD_TO_TUN,
|
|
priority=1,
|
|
dl_vlan='vlan2',
|
|
actions='strip_vlan,'
|
|
'set_tunnel:seg2,output:1')
|
|
|
|
def test_fdb_add_port(self):
|
|
self._prepare_l2_pop_ofports()
|
|
fdb_entry = {'net1':
|
|
{'network_type': 'gre',
|
|
'segment_id': 'tun1',
|
|
'ports': {'ip_agent_1': [['mac', 'ip']]}}}
|
|
with contextlib.nested(
|
|
mock.patch.object(self.agent.tun_br, 'add_flow'),
|
|
mock.patch.object(self.agent.tun_br, 'mod_flow'),
|
|
mock.patch.object(self.agent, 'setup_tunnel_port')
|
|
) as (add_flow_fn, mod_flow_fn, add_tun_fn):
|
|
self.agent.fdb_add(None, fdb_entry)
|
|
self.assertFalse(add_tun_fn.called)
|
|
fdb_entry['net1']['ports']['ip_agent_3'] = [['mac', 'ip']]
|
|
self.agent.fdb_add(None, fdb_entry)
|
|
add_tun_fn.assert_called_with('gre-ip_agent_3', 'ip_agent_3',
|
|
'gre')
|
|
|
|
def test_fdb_del_port(self):
|
|
self._prepare_l2_pop_ofports()
|
|
fdb_entry = {'net2':
|
|
{'network_type': 'gre',
|
|
'segment_id': 'tun2',
|
|
'ports': {'ip_agent_2': [n_const.FLOODING_ENTRY]}}}
|
|
with contextlib.nested(
|
|
mock.patch.object(self.agent.tun_br, 'delete_flows'),
|
|
mock.patch.object(self.agent.tun_br, 'delete_port')
|
|
) as (del_flow_fn, del_port_fn):
|
|
self.agent.fdb_remove(None, fdb_entry)
|
|
del_port_fn.assert_called_once_with('gre-ip_agent_2')
|
|
|
|
def test_recl_lv_port_to_preserve(self):
|
|
self._prepare_l2_pop_ofports()
|
|
self.agent.l2_pop = True
|
|
self.agent.enable_tunneling = True
|
|
with mock.patch.object(
|
|
self.agent.tun_br, 'cleanup_tunnel_port'
|
|
) as clean_tun_fn:
|
|
self.agent.reclaim_local_vlan('net1')
|
|
self.assertFalse(clean_tun_fn.called)
|
|
|
|
def test_recl_lv_port_to_remove(self):
|
|
self._prepare_l2_pop_ofports()
|
|
self.agent.l2_pop = True
|
|
self.agent.enable_tunneling = True
|
|
with contextlib.nested(
|
|
mock.patch.object(self.agent.tun_br, 'delete_port'),
|
|
mock.patch.object(self.agent.tun_br, 'delete_flows')
|
|
) as (del_port_fn, del_flow_fn):
|
|
self.agent.reclaim_local_vlan('net2')
|
|
del_port_fn.assert_called_once_with('gre-ip_agent_2')
|
|
|
|
def test_daemon_loop_uses_polling_manager(self):
|
|
with mock.patch(
|
|
'neutron.agent.linux.polling.get_polling_manager') as mock_get_pm:
|
|
with mock.patch.object(self.agent, 'rpc_loop') as mock_loop:
|
|
self.agent.daemon_loop()
|
|
mock_get_pm.assert_called_with(False, 'sudo')
|
|
mock_loop.called_once()
|
|
|
|
|
|
class AncillaryBridgesTest(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(AncillaryBridgesTest, self).setUp()
|
|
self.addCleanup(cfg.CONF.reset)
|
|
self.addCleanup(mock.patch.stopall)
|
|
notifier_p = mock.patch(NOTIFIER)
|
|
notifier_cls = notifier_p.start()
|
|
self.notifier = mock.Mock()
|
|
notifier_cls.return_value = self.notifier
|
|
# Avoid rpc initialization for unit tests
|
|
cfg.CONF.set_override('rpc_backend',
|
|
'neutron.openstack.common.rpc.impl_fake')
|
|
cfg.CONF.set_override('report_interval', 0, 'AGENT')
|
|
self.kwargs = ovs_neutron_agent.create_agent_config_map(cfg.CONF)
|
|
|
|
def _test_ancillary_bridges(self, bridges, ancillary):
|
|
device_ids = ancillary[:]
|
|
|
|
def pullup_side_effect(self, *args):
|
|
result = device_ids.pop(0)
|
|
return result
|
|
|
|
with contextlib.nested(
|
|
mock.patch('neutron.plugins.openvswitch.agent.ovs_neutron_agent.'
|
|
'OVSNeutronAgent.setup_integration_br',
|
|
return_value=mock.Mock()),
|
|
mock.patch('neutron.agent.linux.utils.get_interface_mac',
|
|
return_value='00:00:00:00:00:01'),
|
|
mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.'
|
|
'get_local_port_mac',
|
|
return_value='00:00:00:00:00:01'),
|
|
mock.patch('neutron.agent.linux.ovs_lib.get_bridges',
|
|
return_value=bridges),
|
|
mock.patch(
|
|
'neutron.agent.linux.ovs_lib.get_bridge_external_bridge_id',
|
|
side_effect=pullup_side_effect)):
|
|
self.agent = ovs_neutron_agent.OVSNeutronAgent(**self.kwargs)
|
|
self.assertEqual(len(ancillary), len(self.agent.ancillary_brs))
|
|
if ancillary:
|
|
bridges = [br.br_name for br in self.agent.ancillary_brs]
|
|
for br in ancillary:
|
|
self.assertIn(br, bridges)
|
|
|
|
def test_ancillary_bridges_single(self):
|
|
bridges = ['br-int', 'br-ex']
|
|
self._test_ancillary_bridges(bridges, ['br-ex'])
|
|
|
|
def test_ancillary_bridges_none(self):
|
|
bridges = ['br-int']
|
|
self._test_ancillary_bridges(bridges, [])
|
|
|
|
def test_ancillary_bridges_multiple(self):
|
|
bridges = ['br-int', 'br-ex1', 'br-ex2']
|
|
self._test_ancillary_bridges(bridges, ['br-ex1', 'br-ex2'])
|