openstack/charm-neutron-openvswitch
Code Issues Proposed changes

Merge "Do not create MTU upstart scripts on xenial+"

Browse Source
This commit is contained in:
Jenkins 2017-01-25 10:08:41 +00:00 committed by Gerrit Code Review
commit cd5fb8b51b
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hooks/neutron_ovs_utils.py
View File

@ -271,6 +271,7 @@ def resource_map():
Dynamically generate a map of resources that will be managed for a single Dynamically generate a map of resources that will be managed for a single
hook execution. hook execution.
''' '''
drop_config = []
resource_map = deepcopy(BASE_RESOURCE_MAP) resource_map = deepcopy(BASE_RESOURCE_MAP)
if use_dvr(): if use_dvr():
resource_map.update(DVR_RESOURCE_MAP) resource_map.update(DVR_RESOURCE_MAP)
@ -285,7 +286,7 @@ def resource_map():
# Remap any service names as required # Remap any service names as required
if os_release('neutron-common', base='icehouse') >= 'mitaka': if os_release('neutron-common', base='icehouse') >= 'mitaka':
# ml2_conf.ini -> openvswitch_agent.ini # ml2_conf.ini -> openvswitch_agent.ini
del resource_map[ML2_CONF] drop_config.append(ML2_CONF)
# drop of -plugin from service name # drop of -plugin from service name
resource_map[NEUTRON_CONF]['services'].remove( resource_map[NEUTRON_CONF]['services'].remove(
'neutron-plugin-openvswitch-agent' 'neutron-plugin-openvswitch-agent'
@ -294,10 +295,20 @@ def resource_map():
'neutron-openvswitch-agent' 'neutron-openvswitch-agent'
) )
if not use_dpdk(): if not use_dpdk():
del resource_map[DPDK_INTERFACES] drop_config.append(DPDK_INTERFACES)
else: else:
del resource_map[OVS_CONF] drop_config.extend([OVS_CONF, DPDK_INTERFACES])
del resource_map[DPDK_INTERFACES]
# Use MAAS1.9 for MTU and external port config on xenial and above
if float(lsb_release()['DISTRIB_RELEASE']) >= 16.04:
drop_config.extend([EXT_PORT_CONF, PHY_NIC_MTU_CONF])
for _conf in drop_config:
try:
del resource_map[_conf]
except KeyError:
pass
return resource_map return resource_map

26
unit_tests/test_neutron_ovs_utils.py
View File

@ -274,6 +274,32 @@ class TestNeutronOVSUtils(CharmTestCase):
[self.assertIn(q_conf, _map.keys()) for q_conf in confs] [self.assertIn(q_conf, _map.keys()) for q_conf in confs]
self.assertEqual(_map[nutils.NEUTRON_CONF]['services'], svcs) self.assertEqual(_map[nutils.NEUTRON_CONF]['services'], svcs)
@patch.object(nutils, 'use_dvr')
def test_resource_map_mtu_trusty(self, _use_dvr):
_use_dvr.return_value = False
self.os_release.return_value = 'mitaka'
self.lsb_release.return_value = {'DISTRIB_RELEASE': '14.04'}
_map = nutils.resource_map()
self.assertTrue(nutils.NEUTRON_CONF in _map.keys())
self.assertTrue(nutils.PHY_NIC_MTU_CONF in _map.keys())
self.assertFalse(nutils.EXT_PORT_CONF in _map.keys())
_use_dvr.return_value = True
_map = nutils.resource_map()
self.assertTrue(nutils.EXT_PORT_CONF in _map.keys())
@patch.object(nutils, 'use_dvr')
def test_resource_map_mtu_xenial(self, _use_dvr):
_use_dvr.return_value = False
self.os_release.return_value = 'mitaka'
self.lsb_release.return_value = {'DISTRIB_RELEASE': '16.04'}
_map = nutils.resource_map()
self.assertTrue(nutils.NEUTRON_CONF in _map.keys())
self.assertFalse(nutils.PHY_NIC_MTU_CONF in _map.keys())
self.assertFalse(nutils.EXT_PORT_CONF in _map.keys())
_use_dvr.return_value = True
_map = nutils.resource_map()
self.assertFalse(nutils.EXT_PORT_CONF in _map.keys())
@patch.object(nutils, 'use_dvr') @patch.object(nutils, 'use_dvr')
def test_restart_map(self, _use_dvr): def test_restart_map(self, _use_dvr):
_use_dvr.return_value = False _use_dvr.return_value = False