Merge ~cberner/maas/+git/maas:lan_channel into maas:master

[Christopher Berner]

Fix for https://bugs.launchpad.net/maas/+bug/1742299

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lan_channel lp:~cberner/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1231/console
COMMIT: 0388bec1e989356397778c757173d5e7798d2763

review: Needs Fixing

[Newell Jensen (newell-jensen)]

Chris,

Thanks for this merge proposal. We unit test virtually everything in MAAS so you will need to update the unit test for this file as well, test_ipmi_maas_autodetect.py. To run the unit tests for this portion of the code you can issue the command from the branch root directory as such:

bin/test.region metadataserver.user_data.templates.snippets.tests.test_maas_ipmi_autodetect

You will need to run make before this to generate the testing infrastructure.

See HACKING.txt as well for more details on this.

Let me know if you have any further questions. Additionally, Andres was the one that claimed this review so he may have more comments to add as well.

Cheers.

review: Needs Fixing

[Mike Pontillo (mpontillo)]

To add to what Newell said, if you run 'make install-dependencies' and then 'make', the requirements to run the unit tests should be pulled in. Thanks for your contribution!

f2fd477... by Christopher Berner on 2018-01-14

Fix tests

ca7718f... by Christopher Berner on 2018-01-14

Add test for multiple LAN channels

[Christopher Berner (cberner)]

Thanks for the pointers! Think I got the tests fixed, and added one to check the multiple lan channel functionality. Let me know if there are other changes needed.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lan_channel lp:~cberner/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1247/console
COMMIT: ca7718f5add13cc6c10bb7233896dce1bc9d72d5

review: Needs Fixing

[Christopher Berner (cberner)]

Hmm, are there more that need fixing? Tried running all the tests with "make test", but many fail for me even on the upstream master branch

[Newell Jensen (newell-jensen)]

> Hmm, are there more that need fixing? Tried running all the tests with "make
> test", but many fail for me even on the upstream master branch

There are some randomly failing tests that we have been trying to address in master so this may be what you are seeing.

[Newell Jensen (newell-jensen)]

Something I just noticed when taking a closer look at the manual page for bmc-config (and ipmi-config for that matter) command is that it doesn't have a "--lan-channel" parameter but instead has a "--lan-channel-number" parameter. Am I missing something here?

Additionally, might be a better idea to pick a random lan channel number instead of having '1' hardcoded everywhere in your unit tests.

e.g.

lan_channel = random.randint(1, 8)

review: Needs Information

bd5ce06... by Christopher Berner on 2018-05-02

Fix linter errors

LP: #1742299

affd2d7... by Christopher Berner on 2018-05-02

Use documented --lan-channel-number flag

Seems that --lan-channel works, but is undocumented

08281c3... by Christopher Berner on 2018-05-02

Change lan channel tests to use more randomization

[Christopher Berner (cberner)]

Thanks for the feedback, Newell, and sorry about the slow turn around here!

I updated this PR to address your comments, let me know if there's anything else you'd like to see changed.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lan_channel lp:~cberner/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: bd5ce06535ef54f990922e7629268867e42a305e

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lan_channel lp:~cberner/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 08281c34e3ff0746f6bca50ad5ac33a731b876a8

review: Approve

[Newell Jensen (newell-jensen)]

See comment/suggestion inline.

review: Needs Information

[Christopher Berner (cberner)]

Replied inline. The current behavior seemed correct to me, but let me know if my assumption is wrong and I'll definitely change it

[Newell Jensen (newell-jensen)]

Andres, this branch has been dangling for some time and we should do something about it. You mentioned that you wanted to review it as well. Will ping you directly about this as well.

[Blake Rouse (blake-rouse)]

Rejecting due to inactivity.

Unmerged commits

08281c3... by Christopher Berner on 2018-05-02

Change lan channel tests to use more randomization

affd2d7... by Christopher Berner on 2018-05-02

Use documented --lan-channel-number flag

Seems that --lan-channel works, but is undocumented

bd5ce06... by Christopher Berner on 2018-05-02

Fix linter errors

LP: #1742299

ca7718f... by Christopher Berner on 2018-01-14

Add test for multiple LAN channels

f2fd477... by Christopher Berner on 2018-01-14

Fix tests

0388bec... by Christopher Berner on 2018-01-10

Add LAN channel auto detection

This allows IPMI detection to work even when the LAN channel used is
not the default channel

diff --git a/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py b/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
index e2c3ce5..268e77a 100644
--- a/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
+++ b/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
@@ -40,16 +40,22 @@ def run_command(command_args):
     return output.decode('utf-8')
 
 
-def bmc_get(key):
+def bmc_get(key, lan_channel):
     """Fetch the output of a key via bmc-config checkout."""
-    command = ('bmc-config', '--checkout', '--key-pair=%s' % key)
+    command = ('bmc-config',
+               '--lan-channel-number=%d' % lan_channel,
+               '--checkout',
+               '--key-pair=%s' % key)
     output = run_command(command)
     return output
 
 
-def bmc_set(key, value):
+def bmc_set(key, value, lan_channel):
     """Set the value of a key via bmc-config commit."""
-    command = ('bmc-config', '--commit', '--key-pair=%s=%s' % (key, value))
+    command = ('bmc-config',
+               '--lan-channel-number=%d' % lan_channel,
+               '--commit',
+               '--key-pair=%s=%s' % (key, value))
     run_command(command)
 
 
@@ -58,10 +64,10 @@ def format_user_key(user_number, parameter):
     return '%s:%s' % (user_number, parameter)
 
 
-def bmc_user_get(user_number, parameter):
+def bmc_user_get(user_number, parameter, lan_channel):
     """Get a user parameter via bmc-config commit."""
     key = format_user_key(user_number, parameter)
-    raw = bmc_get(key)
+    raw = bmc_get(key, lan_channel)
     pattern = r'^\s*%s(?:[ \t])+([^#\s]+[^\n]*)$' % (re.escape(parameter))
     match = re.search(pattern, raw, re.MULTILINE)
     if match is None:
@@ -69,29 +75,29 @@ def bmc_user_get(user_number, parameter):
     return match.group(1)
 
 
-def bmc_user_set(user_number, parameter, value):
+def bmc_user_set(user_number, parameter, value, lan_channel):
     """Set a user parameter via bmc-config commit."""
     key = format_user_key(user_number, parameter)
-    bmc_set(key, value)
+    bmc_set(key, value, lan_channel)
 
 
-def bmc_list_sections():
+def bmc_list_sections(lan_channel):
     """Retrieve the names of config sections from the BMC."""
-    command = ('bmc-config', '-L')
+    command = ('bmc-config', '-L', '--lan-channel-number=%d' % lan_channel)
     output = run_command(command)
     return output
 
 
-def list_user_numbers():
+def list_user_numbers(lan_channel):
     """List the user numbers on the BMC."""
-    output = bmc_list_sections()
+    output = bmc_list_sections(lan_channel)
     pattern = r'^(User\d+)$'
     users = re.findall(pattern, output, re.MULTILINE)
 
     return users
 
 
-def pick_user_number_from_list(search_username, user_numbers):
+def pick_user_number_from_list(search_username, user_numbers, lan_channel):
     """Pick the best user number for a user from a list of user numbers.
 
     If any any existing user's username matches the search username, pick
@@ -108,7 +114,7 @@ def pick_user_number_from_list(search_username, user_numbers):
         if user_number == 'User1':
             continue
 
-        username = bmc_user_get(user_number, 'Username')
+        username = bmc_user_get(user_number, 'Username', lan_channel)
 
         if username == search_username:
             return user_number
@@ -121,10 +127,11 @@ def pick_user_number_from_list(search_username, user_numbers):
     return first_unused
 
 
-def pick_user_number(search_username):
+def pick_user_number(search_username, lan_channel):
     """Pick the best user number for a username."""
-    user_numbers = list_user_numbers()
-    user_number = pick_user_number_from_list(search_username, user_numbers)
+    user_numbers = list_user_numbers(lan_channel)
+    user_number = pick_user_number_from_list(
+        search_username, user_numbers, lan_channel)
 
     if not user_number:
         raise IPMIError('No IPMI user slots available.')
@@ -132,49 +139,72 @@ def pick_user_number(search_username):
     return user_number
 
 
-def is_ipmi_dhcp():
-    output = bmc_get('Lan_Conf:IP_Address_Source')
+def get_lan_channels():
+    lan_channels = []
+    show_re = re.compile('IP_Address_Source')
+    for channel in range(1, 12):
+        try:
+            output = bmc_get('Lan_Conf:IP_Address_Source', channel)
+        # Not all channels are LAN channels
+        except subprocess.CalledProcessError:
+            continue
+        if show_re.search(output) is not None:
+            lan_channels.append(channel)
+    return lan_channels
+
+
+def is_ipmi_dhcp(lan_channels):
+    found_dhcp = False
     show_re = re.compile('IP_Address_Source\s+Use_DHCP')
-    return show_re.search(output) is not None
+    for channel in lan_channels:
+        output = bmc_get('Lan_Conf:IP_Address_Source', channel)
+        if show_re.search(output) is None:
+            return False
+        else:
+            found_dhcp = True
+    return found_dhcp
 
 
-def set_ipmi_network_source(source):
-    bmc_set('Lan_Conf:IP_Address_Source', source)
+def set_ipmi_network_source(source, lan_channels):
+    for channel in lan_channels:
+        bmc_set('Lan_Conf:IP_Address_Source', source, channel)
 
 
-def _bmc_get_ipmi_addresses(address_type):
+def _bmc_get_ipmi_addresses(address_type, lan_channel):
     try:
-        return bmc_get(address_type)
+        return bmc_get(address_type, lan_channel)
     except subprocess.CalledProcessError:
         return ""
 
 
-def get_ipmi_ip_address():
+def get_ipmi_ip_address(lan_channels):
     show_re = re.compile(
         '((?:[0-9]{1,3}\.){3}[0-9]{1,3}|[0-9a-fA-F]*:[0-9a-fA-F:.]+)')
-    for address_type in [
-            'Lan_Conf:IP_Address',
-            'Lan6_Conf:IPv6_Static_Addresses',
-            'Lan6_Conf:IPv6_Dynamic_Addresses']:
-        output = _bmc_get_ipmi_addresses(address_type)
-        # Loop through the addreses by preference: IPv4, static IPv6, dynamic
-        # IPv6.  Return the first valid, non-link-local address we find.
-        # While we could conceivably allow link-local addresses, we would need
-        # to devine which of our interfaces is the correct link, and then we
-        # would need support for link-local addresses in freeipmi-tools.
-        res = show_re.findall(output)
-        for ip in res:
-            if ip.lower().startswith('fe80::') or ip == '0.0.0.0':
-                time.sleep(2)
-                continue
-            if address_type.startswith('Lan6_'):
-                return '[%s]' % ip
-            return ip
+    for channel in lan_channels:
+        for address_type in [
+                'Lan_Conf:IP_Address',
+                'Lan6_Conf:IPv6_Static_Addresses',
+                'Lan6_Conf:IPv6_Dynamic_Addresses']:
+            output = _bmc_get_ipmi_addresses(address_type, channel)
+            # Loop through the addreses by preference: IPv4, static IPv6,
+            # dynamic IPv6. Return the first valid, non-link-local address we
+            # find. While we could conceivably allow link-local addresses, we
+            # would need to devine which of our interfaces is the correct link,
+            # and then we # would need support for link-local addresses in
+            # freeipmi-tools.
+            res = show_re.findall(output)
+            for ip in res:
+                if ip.lower().startswith('fe80::') or ip == '0.0.0.0':
+                    time.sleep(2)
+                    continue
+                if address_type.startswith('Lan6_'):
+                    return '[%s]' % ip
+                return ip
     # No valid IP address was found.
     return None
 
 
-def verify_ipmi_user_settings(user_number, user_settings):
+def verify_ipmi_user_settings(user_number, user_settings, lan_channel):
     """Verify user settings were applied correctly."""
 
     bad_values = {}
@@ -183,7 +213,7 @@ def verify_ipmi_user_settings(user_number, user_settings):
         # Password isn't included in checkout. Plus,
         # some older BMCs may not support Enable_User.
         if key not in ['Enable_User', 'Password']:
-            value = bmc_user_get(user_number, key)
+            value = bmc_user_get(user_number, key, lan_channel)
             if value != expected_value:
                 bad_values[key] = value
 
@@ -199,15 +229,16 @@ def verify_ipmi_user_settings(user_number, user_settings):
     raise IPMIError(message)
 
 
-def apply_ipmi_user_settings(user_settings):
+def apply_ipmi_user_settings(user_settings, lan_channels):
     """Commit and verify IPMI user settings."""
-    username = user_settings['Username']
-    ipmi_user_number = pick_user_number(username)
+    for channel in lan_channels:
+        username = user_settings['Username']
+        ipmi_user_number = pick_user_number(username, channel)
 
-    for key, value in user_settings.items():
-        bmc_user_set(ipmi_user_number, key, value)
+        for key, value in user_settings.items():
+            bmc_user_set(ipmi_user_number, key, value, channel)
 
-    verify_ipmi_user_settings(ipmi_user_number, user_settings)
+        verify_ipmi_user_settings(ipmi_user_number, user_settings, channel)
 
 
 def make_ipmi_user_settings(username, password):
@@ -229,38 +260,45 @@ def make_ipmi_user_settings(username, password):
     return user_settings
 
 
-def configure_ipmi_user(username):
+def configure_ipmi_user(username, lan_channels):
     """Create or configure an IPMI user for remote use."""
     for password in [generate_random_password(),
                      generate_random_password(with_special_chars=True)]:
         user_settings = make_ipmi_user_settings(username, password)
         try:
-            apply_ipmi_user_settings(user_settings)
+            apply_ipmi_user_settings(user_settings, lan_channels)
             return password
         except subprocess.CalledProcessError:
             pass
     raise IPMIError("Unable to set BMC password.")
 
 
-def set_ipmi_lan_channel_settings():
+def set_ipmi_lan_channel_settings(lan_channels):
     """Enable IPMI-over-Lan (Lan_Channel) if it is disabled"""
     for mode in ['Lan_Channel:Volatile_Access_Mode',
                  'Lan_Channel:Non_Volatile_Access_Mode']:
-        output = bmc_get(mode)
-        show_re = re.compile('%s\s+Always_Available' % mode.split(':')[1])
-        if show_re.search(output) is None:
-            # Some BMC's don't support setting Lan_Channel (see LP: #1287274).
-            # If that happens, it would cause the script to fail preventing
-            # the script from continuing. To address this, simply catch the
-            # error, return and allow the script to continue.
-            try:
-                bmc_set(mode, 'Always_Available')
-            except subprocess.CalledProcessError:
-                return
-
-
-def commit_ipmi_settings(config):
-    run_command(('bmc-config', '--commit', '--filename', config))
+        for channel in lan_channels:
+            output = bmc_get(mode, channel)
+            show_re = re.compile('%s\s+Always_Available' % mode.split(':')[1])
+            if show_re.search(output) is None:
+                # Some BMC's don't support setting Lan_Channel
+                # (see LP: #1287274).
+                # If that happens, it would cause the script to fail preventing
+                # the script from continuing. To address this, simply catch the
+                # error, return and allow the script to continue.
+                try:
+                    bmc_set(mode, 'Always_Available', channel)
+                except subprocess.CalledProcessError:
+                    return
+
+
+def commit_ipmi_settings(config, lan_channels):
+    for channel in lan_channels:
+        run_command(('bmc-config',
+                     '--lan-channel-number=%d' % channel,
+                     '--commit',
+                     '--filename',
+                     config))
 
 
 def get_maas_power_settings(user, password, ipaddress, version, boot_type):
@@ -346,42 +384,45 @@ def main():
 
     args = parser.parse_args()
 
+    IPMI_LAN_CHANNELS = get_lan_channels()
+
     # Check whether IPMI is being set to DHCP. If it is not, and
     # '--dhcp-if-static' has been passed,  Set it to IPMI to DHCP.
-    if not is_ipmi_dhcp() and args.dhcp:
-        set_ipmi_network_source("Use_DHCP")
+    if not is_ipmi_dhcp(IPMI_LAN_CHANNELS) and args.dhcp:
+        set_ipmi_network_source("Use_DHCP", IPMI_LAN_CHANNELS)
         # allow IPMI 120 seconds to obtain an IP address
         time.sleep(120)
 
+    # get the IP address
+    IPMI_IP_ADDRESS = get_ipmi_ip_address(IPMI_LAN_CHANNELS)
+    if IPMI_IP_ADDRESS is None:
+        # if IPMI_IP_ADDRESS not set (or reserved), wait 60 seconds and retry.
+        set_ipmi_network_source("Static", IPMI_LAN_CHANNELS)
+        time.sleep(2)
+        set_ipmi_network_source("Use_DHCP", IPMI_LAN_CHANNELS)
+        time.sleep(60)
+        IPMI_IP_ADDRESS = get_ipmi_ip_address(IPMI_LAN_CHANNELS)
+
+    if IPMI_IP_ADDRESS is None:
+        # Exit (to not set power params in MAAS) if no IPMI_IP_ADDRESS
+        # has been detected
+        exit(1)
+
     # create user/pass
     IPMI_MAAS_USER = "maas"
     IPMI_MAAS_PASSWORD = None
 
-    IPMI_MAAS_PASSWORD = configure_ipmi_user(IPMI_MAAS_USER)
+    IPMI_MAAS_PASSWORD = configure_ipmi_user(IPMI_MAAS_USER, IPMI_LAN_CHANNELS)
 
     # Attempt to enable IPMI Over Lan. If it is disabled, MAAS won't
     # be able to remotely communicate to the BMC.
-    set_ipmi_lan_channel_settings()
+    set_ipmi_lan_channel_settings(IPMI_LAN_CHANNELS)
 
     # Commit other IPMI settings
     if args.configdir:
         for file in os.listdir(args.configdir):
-            commit_ipmi_settings(os.path.join(args.configdir, file))
-
-    # get the IP address
-    IPMI_IP_ADDRESS = get_ipmi_ip_address()
-    if IPMI_IP_ADDRESS is None:
-        # if IPMI_IP_ADDRESS not set (or reserved), wait 60 seconds and retry.
-        set_ipmi_network_source("Static")
-        time.sleep(2)
-        set_ipmi_network_source("Use_DHCP")
-        time.sleep(60)
-        IPMI_IP_ADDRESS = get_ipmi_ip_address()
-
-    if IPMI_IP_ADDRESS is None:
-        # Exit (to not set power params in MAAS) if no IPMI_IP_ADDRESS
-        # has been detected
-        exit(1)
+            commit_ipmi_settings(
+                os.path.join(args.configdir, file), IPMI_LAN_CHANNELS)
 
     if bmc_supports_lan2_0():
         IPMI_VERSION = "LAN_2_0"
diff --git a/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py b/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py
index 9d5fc50..4c8584d 100644
--- a/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py
+++ b/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py
@@ -8,6 +8,7 @@ __all__ = []
 from collections import OrderedDict
 import os.path
 import platform
+import random
 import re
 import subprocess
 from unittest.mock import call
@@ -88,16 +89,20 @@ class TestBMCKeyPairMethods(MAASTestCase):
 
     scenarios = [
         ('bmc_get', dict(
-            method_name='bmc_get', args=['Test:Key'],
+            method_name='bmc_get',
+            args=['Test:Key', random.randint(1, 8)],
             key_pair_fmt='--key-pair=%s', direction='--checkout')),
         ('bmc_set', dict(
-            method_name='bmc_set', args=['Test:Key', 'myval'],
+            method_name='bmc_set',
+            args=['Test:Key', 'myval', random.randint(1, 8)],
             key_pair_fmt='--key-pair=%s=%s', direction='--commit')),
         ('bmc_user_get', dict(
-            method_name='bmc_user_get', args=['User10', 'Username'],
+            method_name='bmc_user_get',
+            args=['User10', 'Username', random.randint(1, 8)],
             key_pair_fmt='--key-pair=%s:%s', direction='--checkout')),
         ('bmc_user_set', dict(
-            method_name='bmc_user_set', args=['User10', 'Username', 'maas'],
+            method_name='bmc_user_set',
+            args=['User10', 'Username', 'maas', random.randint(1, 8)],
             key_pair_fmt='--key-pair=%s:%s=%s', direction='--commit'))
     ]
 
@@ -115,9 +120,13 @@ class TestBMCKeyPairMethods(MAASTestCase):
         # Note that the fmt string must use positional argument specifiers
         # if the order of appearance of args in the fmt string doesn't match
         # the order of args to the method.
-        key_pair_string = self.key_pair_fmt % tuple(self.args)
+        key_pair_string = self.key_pair_fmt % tuple(self.args[:-1])
+        lan_channel = self.args[-1]
 
-        expected_args = ('bmc-config', self.direction, key_pair_string)
+        expected_args = ('bmc-config',
+                         '--lan-channel-number=%d' % lan_channel,
+                         self.direction,
+                         key_pair_string)
         self.assertThat(recorder, MockCalledOnceWith(expected_args))
 
 
@@ -127,8 +136,13 @@ class TestBMCListSections(MAASTestCase):
     def test_bmc_list_sections(self):
         """Ensure bmc-config is called with the correct args."""
         recorder = self.patch(maas_ipmi_autodetect, 'run_command')
-        bmc_list_sections()
-        self.assertThat(recorder, MockCalledOnceWith(('bmc-config', '-L')))
+        lan_channel = random.randint(1, 8)
+        bmc_list_sections(lan_channel)
+        self.assertThat(
+            recorder,
+            MockCalledOnceWith(('bmc-config',
+                                '-L',
+                                '--lan-channel-number=%d' % lan_channel)))
 
 
 class TestListUserNumbers(MAASTestCase):
@@ -153,13 +167,13 @@ class TestListUserNumbers(MAASTestCase):
         self.patch(maas_ipmi_autodetect,
                    'bmc_list_sections').return_value = self.section_names
         expected = ['User1', 'User4', 'User3', 'User16']
-        user_numbers = list_user_numbers()
+        user_numbers = list_user_numbers(1)
         self.assertEqual(expected, user_numbers)
 
     def test_empty(self):
         """Ensure an empty list is handled correctly."""
         self.patch(maas_ipmi_autodetect, 'bmc_list_sections').return_value = ''
-        results = list_user_numbers()
+        results = list_user_numbers(1)
         self.assertEqual([], results)
 
 
@@ -210,7 +224,7 @@ class TestBMCUserGet(MAASTestCase):
         self.patch(
             maas_ipmi_autodetect, 'bmc_get').return_value = response
 
-        value = bmc_user_get(user_number, self.key)
+        value = bmc_user_get(user_number, self.key, 1)
         self.assertEqual(self.value, value)
 
 
@@ -290,7 +304,7 @@ class TestPickUserNumberFromList(MAASTestCase):
             expected=None))
     ]
 
-    def bmc_user_get(self, user_number, parameter):
+    def bmc_user_get(self, user_number, parameter, lan_channel):
         """Return mock user data."""
         return self.user_attributes[user_number].get(parameter)
 
@@ -299,7 +313,7 @@ class TestPickUserNumberFromList(MAASTestCase):
         self.patch(maas_ipmi_autodetect,
                    'bmc_user_get').side_effect = self.bmc_user_get
         current_users = list(self.user_attributes.keys())
-        user = pick_user_number_from_list('maas', current_users)
+        user = pick_user_number_from_list('maas', current_users, 1)
         self.assertEqual(self.expected, user)
 
 
@@ -312,13 +326,13 @@ class TestPickUserNumber(MAASTestCase):
                    'list_user_numbers').return_value = ['User1', 'User2']
         self.patch(maas_ipmi_autodetect,
                    'pick_user_number_from_list').return_value = 'User2'
-        user_number = pick_user_number('maas')
+        user_number = pick_user_number('maas', 1)
         self.assertEqual('User2', user_number)
 
     def test_fail_raise_exception(self):
         """Ensure an exception is raised if no acceptable user is found."""
         self.patch(maas_ipmi_autodetect, 'list_user_numbers').return_value = []
-        self.assertRaises(IPMIError, pick_user_number, 'maas')
+        self.assertRaises(IPMIError, pick_user_number, 'maas', 1)
 
 
 class TestVerifyIpmiUserSettings(MAASTestCase):
@@ -331,7 +345,7 @@ class TestVerifyIpmiUserSettings(MAASTestCase):
         expected_settings = {key: value}
         self.patch(maas_ipmi_autodetect, 'bmc_user_get').return_value = None
         ipmi_error = self.assertRaises(IPMIError, verify_ipmi_user_settings,
-                                       'User2', expected_settings)
+                                       'User2', expected_settings, 1)
 
         expected_message = (
             "IPMI user setting verification failures: "
@@ -355,7 +369,7 @@ class TestVerifyIpmiUserSettings(MAASTestCase):
 
         self.patch(maas_ipmi_autodetect, 'bmc_user_get').return_value = 'No'
         ipmi_error = self.assertRaises(IPMIError, verify_ipmi_user_settings,
-                                       'User2', expected_settings)
+                                       'User2', expected_settings, 1)
 
         self.assertRegex(
             str(ipmi_error),
@@ -377,7 +391,7 @@ class TestVerifyIpmiUserSettings(MAASTestCase):
         don't try to verify them.
         """
         expected_settings = {'Password': 'bar', 'Enable_User': 'yes'}
-        value = verify_ipmi_user_settings('User2', expected_settings)
+        value = verify_ipmi_user_settings('User2', expected_settings, 1)
         self.assertIsNone(value)
 
 
@@ -392,8 +406,9 @@ class TestApplyIpmiUserSettings(MAASTestCase):
         self.patch(maas_ipmi_autodetect, 'bmc_user_set')
         self.patch(maas_ipmi_autodetect, 'verify_ipmi_user_settings')
         username = 'foo'
-        apply_ipmi_user_settings({'Username': username})
-        self.assertThat(pun_mock, MockCalledOnceWith(username))
+        lan_channel = random.randint(1, 8)
+        apply_ipmi_user_settings({'Username': username}, [lan_channel])
+        self.assertThat(pun_mock, MockCalledOnceWith(username, lan_channel))
 
     def test_verify_user_settings(self):
         """Ensure the user settings are committed and verified."""
@@ -404,14 +419,16 @@ class TestApplyIpmiUserSettings(MAASTestCase):
         vius_mock = self.patch(maas_ipmi_autodetect,
                                'verify_ipmi_user_settings')
         user_settings = {'Username': user_number, 'b': 2}
-        apply_ipmi_user_settings(user_settings)
+        lan_channel = random.randint(1, 8)
+        apply_ipmi_user_settings(user_settings, [lan_channel])
 
         for key, value in user_settings.items():
-            self.assertThat(bus_mock, MockAnyCall(user_number, key, value))
+            self.assertThat(bus_mock,
+                            MockAnyCall(user_number, key, value, lan_channel))
 
         self.assertThat(
             vius_mock,
-            MockCalledOnceWith(user_number, user_settings))
+            MockCalledOnceWith(user_number, user_settings, lan_channel))
 
     def test_preserves_settings_order(self):
         """Ensure user settings are applied in order of iteration."""
@@ -421,9 +438,10 @@ class TestApplyIpmiUserSettings(MAASTestCase):
         bus_mock = self.patch(maas_ipmi_autodetect, 'bmc_user_set')
         self.patch(maas_ipmi_autodetect, 'verify_ipmi_user_settings')
         user_settings = OrderedDict((('Username', 1), ('b', 2), ('c', 3)))
-        apply_ipmi_user_settings(user_settings)
+        lan_channel = random.randint(1, 8)
+        apply_ipmi_user_settings(user_settings, [lan_channel])
         expected_calls = (
-            call(user_number, key, value)
+            call(user_number, key, value, lan_channel)
             for key, value in user_settings.items()
         )
         self.assertThat(bus_mock, MockCallsMatch(*expected_calls))
@@ -459,8 +477,9 @@ class TestConfigureIPMIUser(MAASTestCase):
         self.patch(maas_ipmi_autodetect,
                    'make_ipmi_user_settings').return_value = expected.copy()
         recorder = self.patch(maas_ipmi_autodetect, 'apply_ipmi_user_settings')
-        configure_ipmi_user('DC')
-        self.assertThat(recorder, MockCalledOnceWith(expected))
+        lan_channel = random.randint(1, 8)
+        configure_ipmi_user('DC', [lan_channel])
+        self.assertThat(recorder, MockCalledOnceWith(expected, [lan_channel]))
 
     def test_configures_user_with_standard_password(self):
         """Test that it returns the configured password if successful"""
@@ -468,7 +487,7 @@ class TestConfigureIPMIUser(MAASTestCase):
         self.patch(maas_ipmi_autodetect,
                    'generate_random_password').return_value = password
         self.patch(maas_ipmi_autodetect, 'apply_ipmi_user_settings')
-        configured_password = configure_ipmi_user('DC')
+        configured_password = configure_ipmi_user('DC', [random.randint(1, 8)])
         self.assertEqual(configured_password, password)
 
     def test_raises_ipmi_error_if_cant_configure_user(self):
@@ -479,7 +498,7 @@ class TestConfigureIPMIUser(MAASTestCase):
             1, 'bmc-set')
         self.patch(maas_ipmi_autodetect, 'configure_ipmi_user')
         self.assertRaises(
-            IPMIError, configure_ipmi_user, 'maas')
+            IPMIError, configure_ipmi_user, 'maas', [random.randint(1, 8)])
 
 
 class TestGeneratesAcceptablePasswords(MAASTestCase):
@@ -542,9 +561,14 @@ class TestCommitIPMISettings(MAASTestCase):
         """Ensure bmc-config is run properly."""
         recorder = self.patch(maas_ipmi_autodetect, 'run_command')
         filename = 'foo'
-        commit_ipmi_settings(filename)
+        lan_channel = random.randint(1, 8)
+        commit_ipmi_settings(filename, [lan_channel])
         self.assertThat(recorder, MockCalledOnceWith(
-            ('bmc-config', '--commit', '--filename', filename)))
+            ('bmc-config',
+             '--lan-channel-number=%d' % lan_channel,
+             '--commit',
+             '--filename',
+             filename)))
 
 
 class TestBMCSupportsLANPlus(MAASTestCase):
@@ -640,13 +664,33 @@ class TestGetIPMIIPAddress(MAASTestCase):
             'Lan6_Conf:IPv6_Dynamic_Addresses': self.output_dy
         }
 
-        def ret_val(arg):
+        def ret_val(arg, lan_channel):
+            return ret_values[arg]
+
+        self.patch(
+            maas_ipmi_autodetect,
+            '_bmc_get_ipmi_addresses').side_effect = ret_val
+        actual = get_ipmi_ip_address([random.randint(1, 8)])
+        self.assertEqual(self.expected, actual)
+
+    def test_get_ipmi_ip_address_multiple_channels(self):
+        ret_values = {
+            'Lan_Conf:IP_Address': self.output4,
+            'Lan6_Conf:IPv6_Static_Addresses': self.output_st,
+            'Lan6_Conf:IPv6_Dynamic_Addresses': self.output_dy
+        }
+
+        connected_lan_channel = random.randint(2, 8)
+
+        def ret_val(arg, lan_channel):
+            if lan_channel != connected_lan_channel:
+                return ""
             return ret_values[arg]
 
         self.patch(
             maas_ipmi_autodetect,
             '_bmc_get_ipmi_addresses').side_effect = ret_val
-        actual = get_ipmi_ip_address()
+        actual = get_ipmi_ip_address([1, connected_lan_channel])
         self.assertEqual(self.expected, actual)
 
 
@@ -668,18 +712,23 @@ class TestEnableLanChannel(MAASTestCase):
         bmc_set_mock = self.patch(
             maas_ipmi_autodetect, 'bmc_set')
 
+        lan_channel = random.randint(1, 8)
         # Call the function
-        set_ipmi_lan_channel_settings()
+        set_ipmi_lan_channel_settings([lan_channel])
 
         # Check that the 'bmc_set_mock' was called
         self.assertThat(
             bmc_set_mock,
             MockAnyCall(
-                'Lan_Channel:Volatile_Access_Mode', 'Always_Available'))
+                'Lan_Channel:Volatile_Access_Mode',
+                'Always_Available',
+                lan_channel))
         self.assertThat(
             bmc_set_mock,
             MockAnyCall(
-                'Lan_Channel:Non_Volatile_Access_Mode', 'Always_Available'))
+                'Lan_Channel:Non_Volatile_Access_Mode',
+                'Always_Available',
+                lan_channel))
 
     def test_dont_enable_lan_channel_if_already_enabled(self):
         """Test that Lan_Channel doesn't get enabled if disabled."""
@@ -698,7 +747,7 @@ class TestEnableLanChannel(MAASTestCase):
             maas_ipmi_autodetect, 'bmc_set')
 
         # Call the function
-        set_ipmi_lan_channel_settings()
+        set_ipmi_lan_channel_settings([random.randint(1, 8)])
 
         # Check that the 'bmc_set' mock function (bmc_set_mock) was not called.
         self.assertThat(
@@ -719,7 +768,7 @@ class TestEnableLanChannel(MAASTestCase):
             maas_ipmi_autodetect, 'bmc_set')
         bmc_set_mock.side_effect = subprocess.CalledProcessError(
             1, 'bmc-set')
-        set_ipmi_lan_channel_settings()
+        set_ipmi_lan_channel_settings([random.randint(1, 8)])
         self.assertRaises(
             subprocess.CalledProcessError, bmc_set_mock)
         self.assertThat(