Merge lp:~james-page/charm-helpers/ovs-datapath-type into lp:charm-helpers

[James Page]

[David Ames (thedac)]

Looks good. Merging.

review: Approve

=== modified file 'charmhelpers/contrib/network/ovs/__init__.py'
--- charmhelpers/contrib/network/ovs/__init__.py	2015-01-22 06:06:03 +0000
+++ charmhelpers/contrib/network/ovs/__init__.py	2016-04-05 14:44:48 +0000
@@ -25,10 +25,14 @@
 )
 
 
-def add_bridge(name):
+def add_bridge(name, datapath_type=None):
     ''' Add the named bridge to openvswitch '''
     log('Creating bridge {}'.format(name))
-    subprocess.check_call(["ovs-vsctl", "--", "--may-exist", "add-br", name])
+    cmd = ["ovs-vsctl", "--", "--may-exist", "add-br", name]
+    if datapath_type is not None:
+        cmd += ['--', 'set', 'bridge', name,
+                'datapath_type={}'.format(datapath_type)]
+    subprocess.check_call(cmd)
 
 
 def del_bridge(name):

=== modified file 'tests/contrib/network/test_ovs.py'
--- tests/contrib/network/test_ovs.py	2014-07-15 14:45:50 +0000
+++ tests/contrib/network/test_ovs.py	2016-04-05 14:44:48 +0000
@@ -119,6 +119,15 @@
 
     @patch.object(ovs, 'log')
     @patch('subprocess.check_call')
+    def test_add_bridge_datapath_type(self, check_call, log):
+        ovs.add_bridge('test', datapath_type='netdev')
+        check_call.assert_called_with(["ovs-vsctl", "--", "--may-exist",
+                                       "add-br", 'test', "--", "set",
+                                       "bridge", "test", "datapath_type=netdev"])
+        self.assertTrue(log.call_count == 1)
+
+    @patch.object(ovs, 'log')
+    @patch('subprocess.check_call')
     def test_del_bridge(self, check_call, log):
         ovs.del_bridge('test')
         check_call.assert_called_with(["ovs-vsctl", "--", "--if-exists",