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

[James Page]

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

=== modified file 'charmhelpers/contrib/network/ovs/__init__.py'
--- charmhelpers/contrib/network/ovs/__init__.py	2013-07-01 09:53:08 +0000
+++ charmhelpers/contrib/network/ovs/__init__.py	2013-10-20 16:10:57 +0000
@@ -69,4 +69,7 @@
 
 def full_restart():
     ''' Full restart and reload of openvswitch '''
-    service('force-reload-kmod', 'openvswitch-switch')
+    if os.path.exists('/etc/init/openvswitch-force-reload-kmod.conf'):
+        service('start', 'openvswitch-force-reload-kmod')
+    else:
+        service('force-reload-kmod', 'openvswitch-switch')

=== modified file 'tests/contrib/network/test_ovs.py'
--- tests/contrib/network/test_ovs.py	2013-09-23 17:27:56 +0000
+++ tests/contrib/network/test_ovs.py	2013-10-20 16:10:57 +0000
@@ -180,7 +180,16 @@
         self.assertIsNone(ovs.get_certificate())
         self.assertTrue(log.call_count == 1)
 
+    @patch('os.path.exists')
     @patch.object(ovs, 'service')
-    def test_full_restart(self, service):
+    def test_full_restart(self, service, exists):
+        exists.return_value = False
         ovs.full_restart()
         service.assert_called_with('force-reload-kmod', 'openvswitch-switch')
+
+    @patch('os.path.exists')
+    @patch.object(ovs, 'service')
+    def test_full_restart_upstart(self, service, exists):
+        exists.return_value = True
+        ovs.full_restart()
+        service.assert_called_with('start', 'openvswitch-force-reload-kmod')