Merge lp:~niedbalski/charm-helpers/fix-lp-1492031 into lp:charm-helpers

[Jorge Niedbalski]

This is an initial support for LP: #1492031

[Felipe Reyes (freyes)]

Jorge, The tests run fine and the logic on the code is pretty straightforward, there are some things I would like you to review tough

Best,

review: Needs Fixing

[lp:~niedbalski/charm-helpers/fix-lp-1492031]

441. By Jorge Niedbalski on 2015-09-03

Addressed @freyes comments

[Jorge Niedbalski (niedbalski)]

Thanks felipe for reviewing, I fixed your comments.

[Felipe Reyes (freyes)]

review: Needs Fixing

[Felipe Reyes (freyes)]

lgtm ;)

review: Approve

=== added directory 'charmhelpers/contrib/mellanox'
=== added file 'charmhelpers/contrib/mellanox/__init__.py'
=== added file 'charmhelpers/contrib/mellanox/infiniband.py'
--- charmhelpers/contrib/mellanox/infiniband.py	1970-01-01 00:00:00 +0000
+++ charmhelpers/contrib/mellanox/infiniband.py	2015-09-03 21:43:00 +0000
@@ -0,0 +1,151 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright 2014-2015 Canonical Limited.
+#
+# This file is part of charm-helpers.
+#
+# charm-helpers is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# charm-helpers is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
+
+
+__author__ = "Jorge Niedbalski <[e-mail]>"
+
+from charmhelpers.fetch import (
+    apt_install,
+    apt_update,
+)
+
+from charmhelpers.core.hookenv import (
+    log,
+    INFO,
+)
+
+try:
+    from netifaces import interfaces as network_interfaces
+except ImportError:
+    apt_install('python-netifaces')
+    from netifaces import interfaces as network_interfaces
+
+import os
+import re
+import subprocess
+
+from charmhelpers.core.kernel import modprobe
+
+REQUIRED_MODULES = (
+    "mlx4_ib",
+    "mlx4_en",
+    "mlx4_core",
+    "ib_ipath",
+    "ib_mthca",
+    "ib_srpt",
+    "ib_srp",
+    "ib_ucm",
+    "ib_isert",
+    "ib_iser",
+    "ib_ipoib",
+    "ib_cm",
+    "ib_uverbs"
+    "ib_umad",
+    "ib_sa",
+    "ib_mad",
+    "ib_core",
+    "ib_addr",
+    "rdma_ucm",
+)
+
+REQUIRED_PACKAGES = (
+    "ibutils",
+    "infiniband-diags",
+    "ibverbs-utils",
+)
+
+IPOIB_DRIVERS = (
+    "ib_ipoib",
+)
+
+ABI_VERSION_FILE = "/sys/class/infiniband_mad/abi_version"
+
+
+class DeviceInfo(object):
+    pass
+
+
+def install_packages():
+    apt_update()
+    apt_install(REQUIRED_PACKAGES, fatal=True)
+
+
+def load_modules():
+    for module in REQUIRED_MODULES:
+        modprobe(module, persist=True)
+
+
+def is_enabled():
+    """Check if infiniband is loaded on the system"""
+    return os.path.exists(ABI_VERSION_FILE)
+
+
+def stat():
+    """Return full output of ibstat"""
+    return subprocess.check_output(["ibstat"])
+
+
+def devices():
+    """Returns a list of IB enabled devices"""
+    return subprocess.check_output(['ibstat', '-l']).splitlines()
+
+
+def device_info(device):
+    """Returns a DeviceInfo object with the current device settings"""
+
+    status = subprocess.check_output([
+        'ibstat', device, '-s']).splitlines()
+
+    regexes = {
+        "CA type: (.*)": "device_type",
+        "Number of ports: (.*)": "num_ports",
+        "Firmware version: (.*)": "fw_ver",
+        "Hardware version: (.*)": "hw_ver",
+        "Node GUID: (.*)": "node_guid",
+        "System image GUID: (.*)": "sys_guid",
+    }
+
+    device = DeviceInfo()
+
+    for line in status:
+        for expression, key in regexes.items():
+            matches = re.search(expression, line)
+            if matches:
+                setattr(device, key, matches.group(1))
+
+    return device
+
+
+def ipoib_interfaces():
+    """Return a list of IPOIB capable ethernet interfaces"""
+    interfaces = []
+
+    for interface in network_interfaces():
+        try:
+            driver = re.search('^driver: (.+)$', subprocess.check_output([
+                'ethtool', '-i',
+                interface]), re.M).group(1)
+
+            if driver in IPOIB_DRIVERS:
+                interfaces.append(interface)
+        except:
+            log("Skipping interface %s" % interface, level=INFO)
+            continue
+
+    return interfaces

=== added directory 'tests/contrib/mellanox'
=== added file 'tests/contrib/mellanox/test_infiniband.py'
--- tests/contrib/mellanox/test_infiniband.py	1970-01-01 00:00:00 +0000
+++ tests/contrib/mellanox/test_infiniband.py	2015-09-03 21:43:00 +0000
@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+
+from charmhelpers.contrib.mellanox import infiniband
+
+from mock import patch, call
+import unittest
+
+TO_PATCH = [
+    "log",
+    "INFO",
+    "apt_install",
+    "apt_update",
+    "modprobe",
+    "network_interfaces"
+]
+
+NETWORK_INTERFACES = [
+    'lo',
+    'eth0',
+    'eth1',
+    'eth2',
+    'eth3',
+    'eth4',
+    'juju-br0',
+    'ib0',
+    'virbr0',
+    'ovs-system',
+    'br-int',
+    'br-ex',
+    'br-data',
+    'phy-br-data',
+    'int-br-data',
+    'br-tun'
+]
+
+
+IBSTAT_OUTPUT = """
+CA 'mlx4_0'
+    CA type: MT4103
+    Number of ports: 2
+    Firmware version: 2.33.5000
+    Hardware version: 0
+    Node GUID: 0xe41d2d03000a1120
+    System image GUID: 0xe41d2d03000a1123
+"""
+
+
+class InfinibandTest(unittest.TestCase):
+
+    def setUp(self):
+        for m in TO_PATCH:
+            setattr(self, m, self._patch(m))
+
+    def _patch(self, method):
+        _m = patch('charmhelpers.contrib.mellanox.infiniband.' + method)
+        mock = _m.start()
+        self.addCleanup(_m.stop)
+        return mock
+
+    def test_load_modules(self):
+        infiniband.load_modules()
+
+        self.modprobe.assert_has_calls(map(lambda x: call(x, persist=True),
+                                           infiniband.REQUIRED_MODULES))
+
+    def test_install_packages(self):
+        infiniband.install_packages()
+
+        self.apt_update.assert_is_called_once()
+        self.apt_install.assert_is_called_once()
+
+    @patch("os.path.exists")
+    def test_is_enabled(self, exists):
+        exists.return_value = True
+        self.assertTrue(infiniband.is_enabled())
+
+    @patch("subprocess.check_output")
+    def test_stat(self, check_output):
+        infiniband.stat()
+
+        check_output.assert_called_with(["ibstat"])
+
+    @patch("subprocess.check_output")
+    def test_devices(self, check_output):
+        infiniband.devices()
+
+        check_output.assert_called_with(["ibstat", "-l"])
+
+    @patch("subprocess.check_output")
+    def test_device_info(self, check_output):
+        check_output.return_value = IBSTAT_OUTPUT
+
+        info = infiniband.device_info("mlx4_0")
+
+        self.assertEquals(info.num_ports, "2")
+        self.assertEquals(info.device_type, "MT4103")
+        self.assertEquals(info.fw_ver, "2.33.5000")
+        self.assertEquals(info.hw_ver, "0")
+        self.assertEquals(info.node_guid, "0xe41d2d03000a1120")
+        self.assertEquals(info.sys_guid, "0xe41d2d03000a1123")
+
+    @patch("subprocess.check_output")
+    def test_ipoib_interfaces(self, check_output):
+        self.network_interfaces.return_value = NETWORK_INTERFACES
+
+        ipoib_nic = "ib0"
+
+        def c(*args, **kwargs):
+            if ipoib_nic in args[0]:
+                return "driver: ib_ipoib"
+            else:
+                return "driver: mock"
+
+        check_output.side_effect = c
+        self.assertEquals(infiniband.ipoib_interfaces(), [ipoib_nic])