Merge lp:~gnuoy/charm-helpers/mtu-functions into lp:charm-helpers

[Liam Young]

[Tom Haddon (mthaddon)]

Looks good. Approved.

review: Approve

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2013-09-26 14:36:33 +0000
+++ charmhelpers/core/host.py	2013-11-14 10:38:45 +0000
@@ -245,3 +245,37 @@
     random_chars = [
         random.choice(alphanumeric_chars) for _ in range(length)]
     return(''.join(random_chars))
+
+
+def list_nics(nic_type):
+    '''Return a list of nics of given type(s)'''
+    if isinstance(nic_type, basestring):
+        int_types = [nic_type]
+    else:
+        int_types = nic_type
+    interfaces = []
+    for int_type in int_types:
+        cmd = ['ip', 'addr', 'show', 'label', int_type + '*']
+        ip_output = subprocess.check_output(cmd).split('\n')
+        ip_output = (line for line in ip_output if line)
+        for line in ip_output:
+            if line.split()[1].startswith(int_type):
+                interfaces.append(line.split()[1].replace(":", ""))
+    return interfaces
+
+
+def set_nic_mtu(nic, mtu):
+    '''Set MTU on a network interface'''
+    cmd = ['ip', 'link', 'set', nic, 'mtu', mtu]
+    subprocess.check_call(cmd)
+
+
+def get_nic_mtu(nic):
+    cmd = ['ip', 'addr', 'show', nic]
+    ip_output = subprocess.check_output(cmd).split('\n')
+    mtu = ""
+    for line in ip_output:
+        words = line.split()
+        if 'mtu' in words:
+            mtu = words[words.index("mtu") + 1]
+    return mtu

=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2013-10-20 16:03:15 +0000
+++ tests/core/test_host.py	2013-11-14 10:38:45 +0000
@@ -24,6 +24,18 @@
 DISTRIB_DESCRIPTION="Ubuntu Saucy Salamander (development branch)"
 '''
 
+IP_LINE_ETH0 = ("""
+2: eth0: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc mq master bond0 state UP qlen 1000
+    link/ether e4:11:5b:ab:a7:3c brd ff:ff:ff:ff:ff:ff
+""")
+
+IP_LINE_ETH1 = ("""
+3: eth1: <BROADCAST,MULTICAST> mtu 1546 qdisc noop state DOWN qlen 1000
+    link/ether e4:11:5b:ab:a7:3c brd ff:ff:ff:ff:ff:ff
+""")
+
+IP_LINES = IP_LINE_ETH0 + IP_LINE_ETH1
+
 
 class HelpersTest(TestCase):
     @patch('subprocess.call')
@@ -645,3 +657,27 @@
 
         pw2 = host.pwgen(10)
         self.assertNotEqual(pw, pw2, 'Duplicated password')
+
+    @patch('subprocess.check_output')
+    def test_list_nics(self, check_output):
+        check_output.return_value = IP_LINES
+        nics = host.list_nics('eth')
+        self.assertEqual(nics, ['eth0', 'eth1'])
+        nics = host.list_nics(['eth'])
+        self.assertEqual(nics, ['eth0', 'eth1'])
+
+    @patch('subprocess.check_call')
+    def test_set_nic_mtu(self, mock_call):
+        mock_call.return_value = 0
+        nic = 'eth7'
+        mtu = '1546'
+        #result = host.set_nic_mtu(nic, mtu)
+        host.set_nic_mtu(nic, mtu)
+        mock_call.assert_called_with(['ip', 'link', 'set', nic, 'mtu', mtu])
+
+    @patch('subprocess.check_output')
+    def test_get_nic_mtu(self, check_output):
+        check_output.return_value = IP_LINE_ETH0
+        nic = "eth0"
+        mtu = host.get_nic_mtu(nic)
+        self.assertEqual(mtu, '1500')