Ensure package install failures are fatal
This commit is contained in:
commit
67e61c7d61
@ -19,10 +19,11 @@ PACKAGES = ['neutron-common', 'neutron-plugin-ml2']
|
||||
|
||||
|
||||
def install_packages(servicename):
|
||||
pkgs = filter_installed_packages(determine_packages())
|
||||
pkgs = determine_packages()
|
||||
if os_release('neutron-common') >= 'kilo':
|
||||
pkgs.extend(['python-networking-odl'])
|
||||
apt_install(pkgs)
|
||||
pkgs = filter_installed_packages(pkgs)
|
||||
apt_install(pkgs, fatal=True)
|
||||
|
||||
|
||||
def determine_packages(node_type=None):
|
||||
|
@ -132,24 +132,24 @@ class ConfigTranslationTest(CharmTestCase):
|
||||
|
||||
def test_config_default(self):
|
||||
ctxt = odl_data.ConfigTranslation()
|
||||
self.assertEqual(ctxt, {'use_syslog': False,
|
||||
'vlan_ranges': 'physnet1:1000:2000',
|
||||
'overlay_network_type': 'gre'})
|
||||
self.assertEqual(ctxt, {'vlan_ranges': 'physnet1:1000:2000',
|
||||
'overlay_network_type': 'gre',
|
||||
'security_groups': False})
|
||||
|
||||
self.test_config.set('use-syslog', True)
|
||||
self.test_config.set('security-groups', True)
|
||||
ctxt = odl_data.ConfigTranslation()
|
||||
self.assertEqual(ctxt, {'use_syslog': True,
|
||||
'vlan_ranges': 'physnet1:1000:2000',
|
||||
'overlay_network_type': 'gre'})
|
||||
self.assertEqual(ctxt, {'vlan_ranges': 'physnet1:1000:2000',
|
||||
'overlay_network_type': 'gre',
|
||||
'security_groups': True})
|
||||
|
||||
self.test_config.set('vlan-ranges', 'physnet1:1000:3000')
|
||||
ctxt = odl_data.ConfigTranslation()
|
||||
self.assertEqual(ctxt, {'use_syslog': True,
|
||||
'vlan_ranges': 'physnet1:1000:3000',
|
||||
'overlay_network_type': 'gre'})
|
||||
self.assertEqual(ctxt, {'vlan_ranges': 'physnet1:1000:3000',
|
||||
'overlay_network_type': 'gre',
|
||||
'security_groups': True})
|
||||
|
||||
self.test_config.set('overlay-network-type', 'vxlan')
|
||||
ctxt = odl_data.ConfigTranslation()
|
||||
self.assertEqual(ctxt, {'use_syslog': True,
|
||||
'vlan_ranges': 'physnet1:1000:3000',
|
||||
'overlay_network_type': 'vxlan'})
|
||||
self.assertEqual(ctxt, {'vlan_ranges': 'physnet1:1000:3000',
|
||||
'overlay_network_type': 'vxlan',
|
||||
'security_groups': True})
|
||||
|
@ -3,8 +3,8 @@ import odl_utils
|
||||
|
||||
TO_PATCH = [
|
||||
'apt_install',
|
||||
'config',
|
||||
'filter_installed_packages',
|
||||
'os_release',
|
||||
]
|
||||
|
||||
|
||||
@ -12,7 +12,6 @@ class VPPUtilsTest(CharmTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(VPPUtilsTest, self).setUp(odl_utils, TO_PATCH)
|
||||
self.config.side_effect = self.test_config.get
|
||||
|
||||
def tearDown(self):
|
||||
super(VPPUtilsTest, self).tearDown()
|
||||
@ -21,9 +20,22 @@ class VPPUtilsTest(CharmTestCase):
|
||||
def _filter(pkg_list):
|
||||
return pkg_list
|
||||
self.filter_installed_packages.side_effect = _filter
|
||||
self.os_release.return_value = 'icehouse'
|
||||
odl_utils.install_packages('neutron-api')
|
||||
self.apt_install.assert_called_with(['neutron-common',
|
||||
'neutron-plugin-ml2'])
|
||||
'neutron-plugin-ml2'],
|
||||
fatal=True)
|
||||
|
||||
def test_install_packages_kilo(self):
|
||||
def _filter(pkg_list):
|
||||
return pkg_list
|
||||
self.filter_installed_packages.side_effect = _filter
|
||||
self.os_release.return_value = 'kilo'
|
||||
odl_utils.install_packages('neutron-api')
|
||||
self.apt_install.assert_called_with(['neutron-common',
|
||||
'neutron-plugin-ml2',
|
||||
'python-networking-odl'],
|
||||
fatal=True)
|
||||
|
||||
def test_determine_packages(self):
|
||||
self.assertEqual(odl_utils.determine_packages(),
|
||||
|
Loading…
Reference in New Issue
Block a user