Merge lp:~james-page/charm-helpers/ovs-upstart-fix into lp:charm-helpers

Proposed by James Page
Status: Merged
Approved by: Adam Gandelman
Approved revision: 81
Merged at revision: 86
Proposed branch: lp:~james-page/charm-helpers/ovs-upstart-fix
Merge into: lp:charm-helpers
Diff against target: 34 lines (+14/-2)
2 files modified
charmhelpers/contrib/network/ovs/__init__.py (+4/-1)
tests/contrib/network/test_ovs.py (+10/-1)
To merge this branch: bzr merge lp:~james-page/charm-helpers/ovs-upstart-fix
Reviewer Review Type Date Requested Status
Charm Helper Maintainers Pending
Review via email: mp+191921@code.launchpad.net

Description of the change

Add support for new upstart versions of openvswitch which have
a separate configuration for force-reloading kernel modules.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/network/ovs/__init__.py'
2--- charmhelpers/contrib/network/ovs/__init__.py 2013-07-01 09:53:08 +0000
3+++ charmhelpers/contrib/network/ovs/__init__.py 2013-10-20 16:10:57 +0000
4@@ -69,4 +69,7 @@
5
6 def full_restart():
7 ''' Full restart and reload of openvswitch '''
8- service('force-reload-kmod', 'openvswitch-switch')
9+ if os.path.exists('/etc/init/openvswitch-force-reload-kmod.conf'):
10+ service('start', 'openvswitch-force-reload-kmod')
11+ else:
12+ service('force-reload-kmod', 'openvswitch-switch')
13
14=== modified file 'tests/contrib/network/test_ovs.py'
15--- tests/contrib/network/test_ovs.py 2013-09-23 17:27:56 +0000
16+++ tests/contrib/network/test_ovs.py 2013-10-20 16:10:57 +0000
17@@ -180,7 +180,16 @@
18 self.assertIsNone(ovs.get_certificate())
19 self.assertTrue(log.call_count == 1)
20
21+ @patch('os.path.exists')
22 @patch.object(ovs, 'service')
23- def test_full_restart(self, service):
24+ def test_full_restart(self, service, exists):
25+ exists.return_value = False
26 ovs.full_restart()
27 service.assert_called_with('force-reload-kmod', 'openvswitch-switch')
28+
29+ @patch('os.path.exists')
30+ @patch.object(ovs, 'service')
31+ def test_full_restart_upstart(self, service, exists):
32+ exists.return_value = True
33+ ovs.full_restart()
34+ service.assert_called_with('start', 'openvswitch-force-reload-kmod')

Subscribers

People subscribed via source and target branches