Merge "[OVN] Move trunk driver"
This commit is contained in:
Zuul
Gerrit Code Review
commit
3e8abb9a8f
|
|
@ -0,0 +1,180 @@
|
|||
# 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.
|
||||
|
||||
from neutron_lib.api.definitions import portbindings
|
||||
from neutron_lib.callbacks import events
|
||||
from neutron_lib.callbacks import registry
|
||||
from neutron_lib.callbacks import resources
|
||||
from neutron_lib import context as n_context
|
||||
from neutron_lib import exceptions as n_exc
|
||||
from neutron_lib.services.trunk import constants as trunk_consts
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log
|
||||
|
||||
from neutron.common.ovn.constants import OVN_ML2_MECH_DRIVER_NAME
|
||||
from neutron.objects import ports as port_obj
|
||||
from neutron.services.trunk.drivers import base as trunk_base
|
||||
|
||||
|
||||
SUPPORTED_INTERFACES = (
|
||||
portbindings.VIF_TYPE_OVS,
|
||||
portbindings.VIF_TYPE_VHOST_USER,
|
||||
)
|
||||
|
||||
SUPPORTED_SEGMENTATION_TYPES = (
|
||||
trunk_consts.SEGMENTATION_TYPE_VLAN,
|
||||
)
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
class OVNTrunkHandler(object):
|
||||
def __init__(self, plugin_driver):
|
||||
self.plugin_driver = plugin_driver
|
||||
|
||||
def _set_sub_ports(self, parent_port, subports):
|
||||
txn = self.plugin_driver._nb_ovn.transaction
|
||||
context = n_context.get_admin_context()
|
||||
with context.session.begin(subtransactions=True), (
|
||||
txn(check_error=True)) as ovn_txn:
|
||||
for port in subports:
|
||||
self._set_binding_profile(context, port, parent_port, ovn_txn)
|
||||
|
||||
def _unset_sub_ports(self, subports):
|
||||
txn = self.plugin_driver._nb_ovn.transaction
|
||||
context = n_context.get_admin_context()
|
||||
with context.session.begin(subtransactions=True), (
|
||||
txn(check_error=True)) as ovn_txn:
|
||||
for port in subports:
|
||||
self._unset_binding_profile(context, port, ovn_txn)
|
||||
|
||||
def _set_binding_profile(self, context, subport, parent_port, ovn_txn):
|
||||
db_port = port_obj.Port.get_object(context, id=subport.port_id)
|
||||
if not db_port:
|
||||
LOG.debug("Port not found while trying to set "
|
||||
"binding_profile: %s",
|
||||
subport.port_id)
|
||||
return
|
||||
try:
|
||||
for binding in db_port.bindings:
|
||||
binding.profile.update({
|
||||
'parent_name': parent_port,
|
||||
'tag': subport.segmentation_id})
|
||||
# host + port_id is primary key
|
||||
port_obj.PortBinding.update_object(
|
||||
context, {'profile': binding.profile},
|
||||
port_id=subport.port_id,
|
||||
host=binding.host)
|
||||
except n_exc.ObjectNotFound:
|
||||
LOG.debug("Port not found while trying to set "
|
||||
"binding_profile: %s", subport.port_id)
|
||||
return
|
||||
ovn_txn.add(self.plugin_driver._nb_ovn.set_lswitch_port(
|
||||
lport_name=subport.port_id,
|
||||
parent_name=parent_port,
|
||||
tag=subport.segmentation_id))
|
||||
|
||||
def _unset_binding_profile(self, context, subport, ovn_txn):
|
||||
db_port = port_obj.Port.get_object(context, id=subport.port_id)
|
||||
if not db_port:
|
||||
LOG.debug("Port not found while trying to unset "
|
||||
"binding_profile: %s",
|
||||
subport.port_id)
|
||||
return
|
||||
try:
|
||||
for binding in db_port.bindings:
|
||||
binding.profile.pop('tag', None)
|
||||
binding.profile.pop('parent_name', None)
|
||||
# host + port_id is primary key
|
||||
port_obj.PortBinding.update_object(
|
||||
context,
|
||||
{'profile': binding.profile,
|
||||
'vif_type': portbindings.VIF_TYPE_UNBOUND,
|
||||
'vif_details': '',
|
||||
'host': ''},
|
||||
port_id=subport.port_id,
|
||||
host=binding.host)
|
||||
port_obj.PortBindingLevel.delete_objects(
|
||||
context, port_id=subport.port_id, host=binding.host)
|
||||
except n_exc.ObjectNotFound:
|
||||
LOG.debug("Port not found while trying to unset "
|
||||
"binding_profile: %s", subport.port_id)
|
||||
return
|
||||
ovn_txn.add(self.plugin_driver._nb_ovn.set_lswitch_port(
|
||||
lport_name=subport.port_id,
|
||||
parent_name=[],
|
||||
up=False,
|
||||
tag=[]))
|
||||
|
||||
def trunk_created(self, trunk):
|
||||
if trunk.sub_ports:
|
||||
self._set_sub_ports(trunk.port_id, trunk.sub_ports)
|
||||
trunk.update(status=trunk_consts.TRUNK_ACTIVE_STATUS)
|
||||
|
||||
def trunk_deleted(self, trunk):
|
||||
if trunk.sub_ports:
|
||||
self._unset_sub_ports(trunk.sub_ports)
|
||||
|
||||
def subports_added(self, trunk, subports):
|
||||
if subports:
|
||||
self._set_sub_ports(trunk.port_id, subports)
|
||||
trunk.update(status=trunk_consts.TRUNK_ACTIVE_STATUS)
|
||||
|
||||
def subports_deleted(self, trunk, subports):
|
||||
if subports:
|
||||
self._unset_sub_ports(subports)
|
||||
trunk.update(status=trunk_consts.TRUNK_ACTIVE_STATUS)
|
||||
|
||||
def trunk_event(self, resource, event, trunk_plugin, payload):
|
||||
if event == events.AFTER_CREATE:
|
||||
self.trunk_created(payload.current_trunk)
|
||||
elif event == events.AFTER_DELETE:
|
||||
self.trunk_deleted(payload.original_trunk)
|
||||
|
||||
def subport_event(self, resource, event, trunk_plugin, payload):
|
||||
if event == events.AFTER_CREATE:
|
||||
self.subports_added(payload.original_trunk,
|
||||
payload.subports)
|
||||
elif event == events.AFTER_DELETE:
|
||||
self.subports_deleted(payload.original_trunk,
|
||||
payload.subports)
|
||||
|
||||
|
||||
class OVNTrunkDriver(trunk_base.DriverBase):
|
||||
@property
|
||||
def is_loaded(self):
|
||||
try:
|
||||
return OVN_ML2_MECH_DRIVER_NAME in cfg.CONF.ml2.mechanism_drivers
|
||||
except cfg.NoSuchOptError:
|
||||
return False
|
||||
|
||||
@registry.receives(resources.TRUNK_PLUGIN, [events.AFTER_INIT])
|
||||
def register(self, resource, event, trigger, payload=None):
|
||||
super(OVNTrunkDriver, self).register(
|
||||
resource, event, trigger, payload=payload)
|
||||
self._handler = OVNTrunkHandler(self.plugin_driver)
|
||||
for trunk_event in (events.AFTER_CREATE, events.AFTER_DELETE):
|
||||
registry.subscribe(self._handler.trunk_event,
|
||||
resources.TRUNK,
|
||||
trunk_event)
|
||||
registry.subscribe(self._handler.subport_event,
|
||||
resources.SUBPORTS,
|
||||
trunk_event)
|
||||
|
||||
@classmethod
|
||||
def create(cls, plugin_driver):
|
||||
cls.plugin_driver = plugin_driver
|
||||
return cls(OVN_ML2_MECH_DRIVER_NAME,
|
||||
SUPPORTED_INTERFACES,
|
||||
SUPPORTED_SEGMENTATION_TYPES,
|
||||
None,
|
||||
can_trunk_bound_port=True)
|
||||
|
|
@ -0,0 +1,375 @@
|
|||
#
|
||||
# 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 mock
|
||||
from neutron_lib.api.definitions import portbindings
|
||||
from neutron_lib.callbacks import events
|
||||
from neutron_lib.callbacks import registry
|
||||
from neutron_lib.callbacks import resources
|
||||
from neutron_lib import exceptions as n_exc
|
||||
from neutron_lib.services.trunk import constants as trunk_consts
|
||||
from oslo_config import cfg
|
||||
|
||||
from neutron.common.ovn.constants import OVN_ML2_MECH_DRIVER_NAME
|
||||
from neutron.objects.ports import Port
|
||||
from neutron.objects.ports import PortBinding
|
||||
from neutron.services.trunk.drivers.ovn import trunk_driver
|
||||
from neutron.tests import base
|
||||
from neutron.tests.unit import fake_resources
|
||||
|
||||
|
||||
class TestTrunkHandler(base.BaseTestCase):
|
||||
def setUp(self):
|
||||
super(TestTrunkHandler, self).setUp()
|
||||
self.context = mock.Mock()
|
||||
self.plugin_driver = mock.Mock()
|
||||
self.plugin_driver._plugin = mock.Mock()
|
||||
self.plugin_driver._plugin.update_port = mock.Mock()
|
||||
self.plugin_driver._nb_ovn = fake_resources.FakeOvsdbNbOvnIdl()
|
||||
self.handler = trunk_driver.OVNTrunkHandler(self.plugin_driver)
|
||||
self.trunk_1 = mock.Mock()
|
||||
self.trunk_1.port_id = "trunk-1"
|
||||
|
||||
self.trunk_2 = mock.Mock()
|
||||
self.trunk_2.port_id = "trunk-2"
|
||||
|
||||
self.sub_port_1 = mock.Mock()
|
||||
self.sub_port_1.segmentation_id = 40
|
||||
self.sub_port_1.trunk_id = "trunk-1"
|
||||
self.sub_port_1.port_id = "sub_port_1"
|
||||
self.sub_port_1_obj = self._get_fake_port_obj(
|
||||
port_id='sub_port_1')
|
||||
|
||||
self.sub_port_2 = mock.Mock()
|
||||
self.sub_port_2.segmentation_id = 41
|
||||
self.sub_port_2.trunk_id = "trunk-1"
|
||||
self.sub_port_2.port_id = "sub_port_2"
|
||||
self.sub_port_2_obj = self._get_fake_port_obj(
|
||||
port_id='sub_port_1')
|
||||
|
||||
self.sub_port_3 = mock.Mock()
|
||||
self.sub_port_3.segmentation_id = 42
|
||||
self.sub_port_3.trunk_id = "trunk-2"
|
||||
self.sub_port_3.port_id = "sub_port_3"
|
||||
|
||||
self.sub_port_4 = mock.Mock()
|
||||
self.sub_port_4.segmentation_id = 43
|
||||
self.sub_port_4.trunk_id = "trunk-2"
|
||||
self.sub_port_4.port_id = "sub_port_4"
|
||||
|
||||
self.get_trunk_object = mock.patch(
|
||||
"neutron.objects.trunk.Trunk.get_object").start()
|
||||
self.get_trunk_object.side_effect = lambda ctxt, id: \
|
||||
self.trunk_1 if id == 'trunk-1' else self.trunk_2
|
||||
self.mock_get_port = mock.patch(
|
||||
"neutron.objects.ports.Port.get_object").start()
|
||||
self.mock_get_port.side_effect = lambda ctxt, id: (
|
||||
self.sub_port_1_obj if id == 'sub_port_1' else (
|
||||
self.sub_port_2_obj if id == 'sub_port_2' else None))
|
||||
self.mock_update_pb = mock.patch(
|
||||
"neutron.objects.ports.PortBinding.update_object").start()
|
||||
self.mock_clear_levels = mock.patch(
|
||||
"neutron.objects.ports.PortBindingLevel.delete_objects").start()
|
||||
|
||||
def _get_fake_port_obj(self, port_id):
|
||||
with mock.patch('uuid.UUID') as mock_uuid:
|
||||
mock_uuid.return_value = port_id
|
||||
port = Port()
|
||||
port.id = port_id
|
||||
port.bindings = [PortBinding(profile={}, host='foo.com')]
|
||||
return port
|
||||
|
||||
def _assert_calls(self, mock, expected_calls):
|
||||
self.assertEqual(
|
||||
len(expected_calls),
|
||||
mock.call_count)
|
||||
mock.assert_has_calls(
|
||||
expected_calls, any_order=True)
|
||||
|
||||
def test_create_trunk(self):
|
||||
self.trunk_1.sub_ports = []
|
||||
self.handler.trunk_created(self.trunk_1)
|
||||
self.plugin_driver._nb_ovn.set_lswitch_port.assert_not_called()
|
||||
self.mock_update_pb.assert_not_called()
|
||||
|
||||
self.trunk_1.sub_ports = [self.sub_port_1, self.sub_port_2]
|
||||
self.handler.trunk_created(self.trunk_1)
|
||||
|
||||
calls = [
|
||||
mock.call(mock.ANY,
|
||||
{'profile': {'parent_name': trunk.port_id,
|
||||
'tag': s_port.segmentation_id}},
|
||||
host=mock.ANY,
|
||||
port_id=s_port.port_id)
|
||||
for trunk, s_port in [(self.trunk_1, self.sub_port_1),
|
||||
(self.trunk_1, self.sub_port_2)]]
|
||||
self._assert_calls(self.mock_update_pb, calls)
|
||||
|
||||
calls = [mock.call(lport_name=s_port.port_id,
|
||||
parent_name=trunk.port_id,
|
||||
tag=s_port.segmentation_id)
|
||||
for trunk, s_port in [(self.trunk_1, self.sub_port_1),
|
||||
(self.trunk_1, self.sub_port_2)]]
|
||||
self._assert_calls(self.plugin_driver._nb_ovn.set_lswitch_port, calls)
|
||||
self.mock_clear_levels.assert_not_called()
|
||||
|
||||
def test_create_trunk_port_not_found(self):
|
||||
self.trunk_1.sub_ports = [self.sub_port_4]
|
||||
self.handler.trunk_created(self.trunk_1)
|
||||
self.plugin_driver._nb_ovn.set_lswitch_port.assert_not_called()
|
||||
self.mock_update_pb.assert_not_called()
|
||||
|
||||
def test_create_trunk_port_db_exception(self):
|
||||
self.trunk_1.sub_ports = [self.sub_port_1]
|
||||
self.mock_update_pb.side_effect = [n_exc.ObjectNotFound(id=1)]
|
||||
self.handler.trunk_created(self.trunk_1)
|
||||
self.mock_update_pb.assert_called_once_with(
|
||||
mock.ANY, {'profile': {'parent_name': self.sub_port_1.trunk_id,
|
||||
'tag': self.sub_port_1.segmentation_id}},
|
||||
host='foo.com', port_id=self.sub_port_1.port_id)
|
||||
self.plugin_driver._nb_ovn.set_lswitch_port.assert_not_called()
|
||||
|
||||
def test_delete_trunk(self):
|
||||
self.trunk_1.sub_ports = []
|
||||
self.handler.trunk_deleted(self.trunk_1)
|
||||
self.plugin_driver._nb_ovn.set_lswitch_port.assert_not_called()
|
||||
self.mock_update_pb.assert_not_called()
|
||||
self.mock_clear_levels.assert_not_called()
|
||||
|
||||
self.trunk_1.sub_ports = [self.sub_port_1, self.sub_port_2]
|
||||
self.sub_port_1_obj.bindings[0].profile.update({
|
||||
'tag': self.sub_port_1.segmentation_id,
|
||||
'parent_name': self.sub_port_1.trunk_id,
|
||||
'foo_field': self.sub_port_1.trunk_id})
|
||||
self.sub_port_2_obj.bindings[0].profile.update({
|
||||
'tag': self.sub_port_2.segmentation_id,
|
||||
'parent_name': self.sub_port_2.trunk_id,
|
||||
'foo_field': self.sub_port_2.trunk_id})
|
||||
self.handler.trunk_deleted(self.trunk_1)
|
||||
|
||||
calls = [
|
||||
mock.call(
|
||||
mock.ANY,
|
||||
{'profile': {'foo_field': s_port.trunk_id},
|
||||
'host': '',
|
||||
'vif_type': portbindings.VIF_TYPE_UNBOUND,
|
||||
'vif_details': ''},
|
||||
host='foo.com',
|
||||
port_id=s_port.port_id)
|
||||
for trunk, s_port in [(self.trunk_1, self.sub_port_1),
|
||||
(self.trunk_1, self.sub_port_2)]]
|
||||
self._assert_calls(self.mock_update_pb, calls)
|
||||
|
||||
calls = [
|
||||
mock.call(mock.ANY,
|
||||
host='foo.com',
|
||||
port_id=s_port.port_id)
|
||||
for trunk, s_port in [(self.trunk_1, self.sub_port_1),
|
||||
(self.trunk_1, self.sub_port_2)]]
|
||||
self._assert_calls(self.mock_clear_levels, calls)
|
||||
|
||||
calls = [mock.call(lport_name=s_port.port_id,
|
||||
parent_name=[],
|
||||
tag=[],
|
||||
up=False)
|
||||
for trunk, s_port in [(self.trunk_1, self.sub_port_1),
|
||||
(self.trunk_1, self.sub_port_2)]]
|
||||
self._assert_calls(self.plugin_driver._nb_ovn.set_lswitch_port, calls)
|
||||
|
||||
def test_delete_trunk_key_not_found(self):
|
||||
self.sub_port_1_obj.bindings[0].profile.update({
|
||||
'foo_field': self.sub_port_1.trunk_id})
|
||||
self.trunk_1.sub_ports = [self.sub_port_1]
|
||||
self.handler.trunk_deleted(self.trunk_1)
|
||||
calls = [
|
||||
mock.call(mock.ANY,
|
||||
{'profile': {'foo_field': s_port.trunk_id},
|
||||
'host': '',
|
||||
'vif_type': portbindings.VIF_TYPE_UNBOUND,
|
||||
'vif_details': ''},
|
||||
host='foo.com',
|
||||
port_id=s_port.port_id)
|
||||
for trunk, s_port in [(self.trunk_1, self.sub_port_1)]]
|
||||
self._assert_calls(self.mock_update_pb, calls)
|
||||
|
||||
calls = [
|
||||
mock.call(mock.ANY,
|
||||
host='foo.com',
|
||||
port_id=s_port.port_id)
|
||||
for trunk, s_port in [(self.trunk_1, self.sub_port_1)]]
|
||||
self._assert_calls(self.mock_clear_levels, calls)
|
||||
|
||||
calls = [mock.call(lport_name=s_port.port_id,
|
||||
parent_name=[],
|
||||
tag=[],
|
||||
up=False)
|
||||
for trunk, s_port in [(self.trunk_1, self.sub_port_1)]]
|
||||
self._assert_calls(self.plugin_driver._nb_ovn.set_lswitch_port, calls)
|
||||
|
||||
def test_delete_trunk_port_not_found(self):
|
||||
self.trunk_1.sub_ports = [self.sub_port_4]
|
||||
self.handler.trunk_deleted(self.trunk_1)
|
||||
self.plugin_driver._nb_ovn.set_lswitch_port.assert_not_called()
|
||||
self.mock_update_pb.assert_not_called()
|
||||
self.mock_clear_levels.assert_not_called()
|
||||
|
||||
def test_delete_trunk_port_db_exception(self):
|
||||
self.trunk_1.sub_ports = [self.sub_port_1]
|
||||
self.mock_update_pb.side_effect = [n_exc.ObjectNotFound(id=1)]
|
||||
self.handler.trunk_deleted(self.trunk_1)
|
||||
self.mock_update_pb.assert_called_once_with(
|
||||
mock.ANY, {'profile': {},
|
||||
'vif_type': portbindings.VIF_TYPE_UNBOUND,
|
||||
'host': '', 'vif_details': ''},
|
||||
host='foo.com', port_id=self.sub_port_1.port_id)
|
||||
self.plugin_driver._nb_ovn.set_lswitch_port.assert_not_called()
|
||||
self.mock_clear_levels.assert_not_called()
|
||||
|
||||
def test_subports_added(self):
|
||||
with mock.patch.object(self.handler, '_set_sub_ports') as set_s:
|
||||
self.handler.subports_added(self.trunk_1,
|
||||
[self.sub_port_1, self.sub_port_2])
|
||||
set_s.assert_called_once_with(
|
||||
self.trunk_1.port_id, [self.sub_port_1, self.sub_port_2])
|
||||
self.trunk_1.update.assert_called_once_with(
|
||||
status=trunk_consts.TRUNK_ACTIVE_STATUS)
|
||||
|
||||
def test_subports_deleted(self):
|
||||
with mock.patch.object(self.handler, '_unset_sub_ports') as unset_s:
|
||||
self.handler.subports_deleted(self.trunk_1,
|
||||
[self.sub_port_1, self.sub_port_2])
|
||||
unset_s.assert_called_once_with(
|
||||
[self.sub_port_1, self.sub_port_2])
|
||||
self.trunk_1.update.assert_called_once_with(
|
||||
status=trunk_consts.TRUNK_ACTIVE_STATUS)
|
||||
|
||||
def _fake_trunk_event_payload(self):
|
||||
payload = mock.Mock()
|
||||
payload.current_trunk = mock.Mock()
|
||||
payload.current_trunk.port_id = 'current_trunk_port_id'
|
||||
payload.original_trunk = mock.Mock()
|
||||
payload.original_trunk.port_id = 'original_trunk_port_id'
|
||||
current_subport = mock.Mock()
|
||||
current_subport.segmentation_id = 40
|
||||
current_subport.trunk_id = 'current_trunk_port_id'
|
||||
current_subport.port_id = 'current_subport_port_id'
|
||||
original_subport = mock.Mock()
|
||||
original_subport.segmentation_id = 41
|
||||
original_subport.trunk_id = 'original_trunk_port_id'
|
||||
original_subport.port_id = 'original_subport_port_id'
|
||||
payload.current_trunk.sub_ports = [current_subport]
|
||||
payload.original_trunk.sub_ports = [original_subport]
|
||||
return payload
|
||||
|
||||
@mock.patch.object(trunk_driver.OVNTrunkHandler, '_set_sub_ports')
|
||||
def test_trunk_event_create(self, set_subports):
|
||||
fake_payload = self._fake_trunk_event_payload()
|
||||
self.handler.trunk_event(
|
||||
mock.ANY, events.AFTER_CREATE, mock.ANY, fake_payload)
|
||||
set_subports.assert_called_once_with(
|
||||
fake_payload.current_trunk.port_id,
|
||||
fake_payload.current_trunk.sub_ports)
|
||||
fake_payload.current_trunk.update.assert_called_once_with(
|
||||
status=trunk_consts.TRUNK_ACTIVE_STATUS)
|
||||
|
||||
@mock.patch.object(trunk_driver.OVNTrunkHandler, '_unset_sub_ports')
|
||||
def test_trunk_event_delete(self, unset_subports):
|
||||
fake_payload = self._fake_trunk_event_payload()
|
||||
self.handler.trunk_event(
|
||||
mock.ANY, events.AFTER_DELETE, mock.ANY, fake_payload)
|
||||
unset_subports.assert_called_once_with(
|
||||
fake_payload.original_trunk.sub_ports)
|
||||
|
||||
@mock.patch.object(trunk_driver.OVNTrunkHandler, '_set_sub_ports')
|
||||
@mock.patch.object(trunk_driver.OVNTrunkHandler, '_unset_sub_ports')
|
||||
def test_trunk_event_invalid(self, unset_subports, set_subports):
|
||||
fake_payload = self._fake_trunk_event_payload()
|
||||
self.handler.trunk_event(
|
||||
mock.ANY, events.BEFORE_DELETE, mock.ANY, fake_payload)
|
||||
set_subports.assert_not_called()
|
||||
unset_subports.assert_not_called()
|
||||
|
||||
def _fake_subport_event_payload(self):
|
||||
payload = mock.Mock()
|
||||
payload.original_trunk = mock.Mock()
|
||||
payload.original_trunk.port_id = 'original_trunk_port_id'
|
||||
original_subport = mock.Mock()
|
||||
original_subport.segmentation_id = 41
|
||||
original_subport.trunk_id = 'original_trunk_port_id'
|
||||
original_subport.port_id = 'original_subport_port_id'
|
||||
payload.subports = [original_subport]
|
||||
return payload
|
||||
|
||||
@mock.patch.object(trunk_driver.OVNTrunkHandler, 'subports_added')
|
||||
def test_subport_event_create(self, s_added):
|
||||
fake_payload = self._fake_subport_event_payload()
|
||||
self.handler.subport_event(
|
||||
mock.ANY, events.AFTER_CREATE, mock.ANY, fake_payload)
|
||||
s_added.assert_called_once_with(
|
||||
fake_payload.original_trunk, fake_payload.subports)
|
||||
|
||||
@mock.patch.object(trunk_driver.OVNTrunkHandler, 'subports_deleted')
|
||||
def test_subport_event_delete(self, s_deleted):
|
||||
fake_payload = self._fake_subport_event_payload()
|
||||
self.handler.subport_event(
|
||||
mock.ANY, events.AFTER_DELETE, mock.ANY, fake_payload)
|
||||
s_deleted.assert_called_once_with(
|
||||
fake_payload.original_trunk, fake_payload.subports)
|
||||
|
||||
@mock.patch.object(trunk_driver.OVNTrunkHandler, 'subports_added')
|
||||
@mock.patch.object(trunk_driver.OVNTrunkHandler, 'subports_deleted')
|
||||
def test_subport_event_invalid(self, s_deleted, s_added):
|
||||
fake_payload = self._fake_trunk_event_payload()
|
||||
self.handler.subport_event(
|
||||
mock.ANY, events.BEFORE_DELETE, mock.ANY, fake_payload)
|
||||
s_added.assert_not_called()
|
||||
s_deleted.assert_not_called()
|
||||
|
||||
|
||||
class TestTrunkDriver(base.BaseTestCase):
|
||||
def setUp(self):
|
||||
super(TestTrunkDriver, self).setUp()
|
||||
|
||||
def test_is_loaded(self):
|
||||
driver = trunk_driver.OVNTrunkDriver.create(mock.Mock())
|
||||
cfg.CONF.set_override('mechanism_drivers',
|
||||
["logger", OVN_ML2_MECH_DRIVER_NAME],
|
||||
group='ml2')
|
||||
self.assertTrue(driver.is_loaded)
|
||||
|
||||
cfg.CONF.set_override('mechanism_drivers',
|
||||
['ovs', 'logger'],
|
||||
group='ml2')
|
||||
self.assertFalse(driver.is_loaded)
|
||||
|
||||
cfg.CONF.set_override('core_plugin', 'some_plugin')
|
||||
self.assertFalse(driver.is_loaded)
|
||||
|
||||
def test_register(self):
|
||||
driver = trunk_driver.OVNTrunkDriver.create(mock.Mock())
|
||||
with mock.patch.object(registry, 'subscribe') as mock_subscribe:
|
||||
driver.register(mock.ANY, mock.ANY, mock.Mock())
|
||||
calls = [mock.call.mock_subscribe(mock.ANY,
|
||||
resources.TRUNK,
|
||||
events.AFTER_CREATE),
|
||||
mock.call.mock_subscribe(mock.ANY,
|
||||
resources.SUBPORTS,
|
||||
events.AFTER_CREATE),
|
||||
mock.call.mock_subscribe(mock.ANY,
|
||||
resources.TRUNK,
|
||||
events.AFTER_DELETE),
|
||||
mock.call.mock_subscribe(mock.ANY,
|
||||
resources.SUBPORTS,
|
||||
events.AFTER_DELETE)]
|
||||
mock_subscribe.assert_has_calls(calls, any_order=True)
|
||||
Loading…
Reference in New Issue