openstack/charm-neutron-openvswitch
Code Issues Proposed changes

Merge "Deprecate linux bridge usage in data-port config"

Browse Source
This commit is contained in:
Zuul 2021-06-28 09:14:59 +00:00 committed by Gerrit Code Review
commit 3fc68108af
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/neutron_ovs_utils.py
View File

@ -700,6 +700,10 @@ def configure_ovs():
ifdata=generate_external_ids(br), ifdata=generate_external_ids(br),
portdata=generate_external_ids(br)) portdata=generate_external_ids(br))
else: else:
log('{} is a Linux bridge: using Linux bridges in the '
'data-port config is deprecated for removal after '
'21.10 release of OpenStack charms.'.format(port),
level=WARNING)
add_ovsbridge_linuxbridge( add_ovsbridge_linuxbridge(
br, port, ifdata=generate_external_ids(br), br, port, ifdata=generate_external_ids(br),
portdata=generate_external_ids(br)) portdata=generate_external_ids(br))

17
unit_tests/test_neutron_ovs_utils.py
View File

@ -70,6 +70,7 @@ TO_PATCH = [
'is_container', 'is_container',
'is_unit_paused_set', 'is_unit_paused_set',
'deferrable_svc_restart', 'deferrable_svc_restart',
'log',
] ]
head_pkg = 'linux-headers-3.15.0-5-generic' head_pkg = 'linux-headers-3.15.0-5-generic'
@ -660,8 +661,22 @@ class TestNeutronOVSUtils(CharmTestCase):
_nics.return_value = ['br-juju'] _nics.return_value = ['br-juju']
self.add_bridge.reset_mock() self.add_bridge.reset_mock()
self.add_bridge_port.reset_mock() self.add_bridge_port.reset_mock()
expected_ifdata = {
'external-ids': {
'charm-neutron-openvswitch': 'br-foo'
}
}
nutils.configure_ovs() nutils.configure_ovs()
self.assertTrue(self.add_ovsbridge_linuxbridge.called) self.add_ovsbridge_linuxbridge.assert_called_once_with(
'br-foo',
'br-juju',
ifdata=expected_ifdata,
portdata=expected_ifdata,
)
self.log.assert_called_with(
'br-juju is a Linux bridge: using Linux bridges in the data-port '
'config is deprecated for removal after 21.10 release of OpenStack'
' charms.', level='WARNING')
@patch.object(nutils, 'use_dvr') @patch.object(nutils, 'use_dvr')
@patch('charmhelpers.contrib.network.ovs.charm_name') @patch('charmhelpers.contrib.network.ovs.charm_name')