Merge ~mfo/maas:3.1 into maas:3.1

[Mauricio Faria de Oliveira]

Please ignore and do not merge; only for tests.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 3.1 lp:~mfo/maas/+git/maas into -b 3.1 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 9a57e03fb199af5a1dd141440b2ed6e7bd6ea678

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 3.1 lp:~mfo/maas/+git/maas into -b 3.1 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 209cc3eb6038b5e6f3dc673b847eb5fdb2ac3120

review: Approve

[Mauricio Faria de Oliveira (mfo)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 3.1 lp:~mfo/maas/+git/maas into -b 3.1 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 2761b73c5d63e3dfb95de363a9ec3f50b998e0c6

review: Approve

[Mauricio Faria de Oliveira (mfo)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 3.1 lp:~mfo/maas/+git/maas into -b 3.1 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 5ad7060e524668a7eff438fa21fe5bd2199e4ff1

review: Approve

diff --git a/creds.yaml b/creds.yaml
 deleted file mode 100644
index e69de29..0000000
--- a/creds.yaml
+++ /dev/null
diff --git a/debian/changelog b/debian/changelog
index 204172d..39b080c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+maas (1:3.1.2-0ubuntu1) focal; urgency=medium
+
+  * New upstream release, MAAS 3.1.2.
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Mon, 04 Sep 2023 14:14:22 -0300
+
 maas (1:3.1.2~rc1-0ubuntu1) focal; urgency=medium
 
   * New upstream release, MAAS 3.1.2 RC1.
diff --git a/setup.cfg b/setup.cfg
index ca76a6a..4a59a2d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = maas
-version = 3.1.2rc1
+version = 3.1.2
 description = Metal As A Service
 long_description = file: README.rst
 url = https://maas.io/
diff --git a/src/maasserver/dhcp.py b/src/maasserver/dhcp.py
index f1bcd74..ac30d84 100644
--- a/src/maasserver/dhcp.py
+++ b/src/maasserver/dhcp.py
@@ -224,17 +224,15 @@ def ip_is_on_vlan(ip_address, vlan):
     )
 
 
-def get_ip_address_for_interface(interface, vlan, ip_version: int):
+def get_ip_address_for_interface(interface, vlan):
     """Return the IP address for `interface` on `vlan`."""
     for ip_address in interface.ip_addresses.all():
-        if ip_is_version(ip_address, ip_version) and ip_is_on_vlan(
-            ip_address, vlan
-        ):
+        if ip_is_on_vlan(ip_address, vlan):
             return ip_address
     return None
 
 
-def get_ip_address_for_rack_controller(rack_controller, vlan, ip_version: int):
+def get_ip_address_for_rack_controller(rack_controller, vlan):
     """Return the IP address for `rack_controller` on `vlan`."""
     # First we build a list of all interfaces that have an IP address
     # on that vlan. Then we pick the best interface for that vlan
@@ -245,12 +243,10 @@ def get_ip_address_for_rack_controller(rack_controller, vlan, ip_version: int):
     matching_interfaces = set()
     for interface in interfaces:
         for ip_address in interface.ip_addresses.all():
-            if ip_is_version(ip_address, ip_version) and ip_is_on_vlan(
-                ip_address, vlan
-            ):
+            if ip_is_on_vlan(ip_address, vlan):
                 matching_interfaces.add(interface)
     interface = get_best_interface(matching_interfaces)
-    return get_ip_address_for_interface(interface, vlan, ip_version)
+    return get_ip_address_for_interface(interface, vlan)
 
 
 @typed
@@ -493,19 +489,17 @@ def make_subnet_config(
     return subnet_config
 
 
-def make_failover_peer_config(vlan, rack_controller, ip_version: int):
+def make_failover_peer_config(vlan, rack_controller):
     """Return DHCP failover peer configuration dict for a rack controller."""
     is_primary = vlan.primary_rack_id == rack_controller.id
     interface_ip_address = get_ip_address_for_rack_controller(
-        rack_controller, vlan, ip_version
+        rack_controller, vlan
     )
     if is_primary:
         peer_rack = vlan.secondary_rack
     else:
         peer_rack = vlan.primary_rack
-    peer_address = get_ip_address_for_rack_controller(
-        peer_rack, vlan, ip_version
-    )
+    peer_address = get_ip_address_for_rack_controller(peer_rack, vlan)
     name = "failover-vlan-%d" % vlan.id
     return (
         name,
@@ -659,7 +653,7 @@ def get_dhcp_configure_for(
     if has_secondary:
         # Generate the failover peer for this VLAN.
         peer_name, peer_config, peer_rack = make_failover_peer_config(
-            vlan, rack_controller, ip_version
+            vlan, rack_controller
         )
     else:
         peer_name, peer_config, peer_rack = None, None, None
diff --git a/src/maasserver/tests/test_dhcp.py b/src/maasserver/tests/test_dhcp.py
index 6383535..dc2975a 100644
--- a/src/maasserver/tests/test_dhcp.py
+++ b/src/maasserver/tests/test_dhcp.py
@@ -815,16 +815,10 @@ class TestGetIPAddressForInterface(MAASServerTestCase):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, vlan=vlan)
         subnet = factory.make_Subnet(vlan=vlan)
         ip_address = factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet),
-            alloc_type=IPADDRESS_TYPE.AUTO,
-            subnet=subnet,
-            interface=interface,
+            alloc_type=IPADDRESS_TYPE.AUTO, subnet=subnet, interface=interface
         )
         self.assertEqual(
-            ip_address,
-            dhcp.get_ip_address_for_interface(
-                interface, vlan, subnet.get_ip_version()
-            ),
+            ip_address, dhcp.get_ip_address_for_interface(interface, vlan)
         )
 
     def test_returns_None(self):
@@ -832,15 +826,10 @@ class TestGetIPAddressForInterface(MAASServerTestCase):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, vlan=vlan)
         subnet = factory.make_Subnet(vlan=vlan)
         factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet),
-            alloc_type=IPADDRESS_TYPE.AUTO,
-            subnet=subnet,
-            interface=interface,
+            alloc_type=IPADDRESS_TYPE.AUTO, subnet=subnet, interface=interface
         )
         self.assertIsNone(
-            dhcp.get_ip_address_for_interface(
-                interface, factory.make_VLAN(), subnet.get_ip_version()
-            )
+            dhcp.get_ip_address_for_interface(interface, factory.make_VLAN())
         )
 
 
@@ -855,16 +844,11 @@ class TestGetIPAddressForRackController(MAASServerTestCase):
         )
         subnet = factory.make_Subnet(vlan=vlan)
         ip_address = factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet),
-            alloc_type=IPADDRESS_TYPE.AUTO,
-            subnet=subnet,
-            interface=interface,
+            alloc_type=IPADDRESS_TYPE.AUTO, subnet=subnet, interface=interface
         )
         self.assertEqual(
             ip_address,
-            dhcp.get_ip_address_for_rack_controller(
-                rack_controller, vlan, subnet.get_ip_version()
-            ),
+            dhcp.get_ip_address_for_rack_controller(rack_controller, vlan),
         )
 
     def test_returns_ip_address_from_best_interface_on_rack_controller(self):
@@ -884,10 +868,7 @@ class TestGetIPAddressForRackController(MAASServerTestCase):
         )
         subnet = factory.make_Subnet(vlan=vlan)
         factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet),
-            alloc_type=IPADDRESS_TYPE.AUTO,
-            subnet=subnet,
-            interface=interface,
+            alloc_type=IPADDRESS_TYPE.AUTO, subnet=subnet, interface=interface
         )
         bond_ip_address = factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.AUTO,
@@ -896,9 +877,7 @@ class TestGetIPAddressForRackController(MAASServerTestCase):
         )
         self.assertEqual(
             bond_ip_address,
-            dhcp.get_ip_address_for_rack_controller(
-                rack_controller, vlan, subnet.get_ip_version()
-            ),
+            dhcp.get_ip_address_for_rack_controller(rack_controller, vlan),
         )
 
 
@@ -2104,12 +2083,11 @@ class TestMakeFailoverPeerConfig(MAASServerTestCase):
             primary_rack=primary_rack,
             secondary_rack=secondary_rack,
         )
-        subnet = factory.make_Subnet(vlan=vlan, version=4)
+        subnet = factory.make_Subnet(vlan=vlan)
         primary_interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=primary_rack, vlan=vlan
         )
         primary_ip = factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet),
             alloc_type=IPADDRESS_TYPE.AUTO,
             subnet=subnet,
             interface=primary_interface,
@@ -2118,7 +2096,6 @@ class TestMakeFailoverPeerConfig(MAASServerTestCase):
             INTERFACE_TYPE.PHYSICAL, node=secondary_rack, vlan=vlan
         )
         secondary_ip = factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet),
             alloc_type=IPADDRESS_TYPE.AUTO,
             subnet=subnet,
             interface=secondary_interface,
@@ -2135,7 +2112,7 @@ class TestMakeFailoverPeerConfig(MAASServerTestCase):
                 },
                 secondary_rack,
             ),
-            dhcp.make_failover_peer_config(vlan, primary_rack, 4),
+            dhcp.make_failover_peer_config(vlan, primary_rack),
         )
 
     def test_renders_config_for_secondary(self):
@@ -2146,12 +2123,11 @@ class TestMakeFailoverPeerConfig(MAASServerTestCase):
             primary_rack=primary_rack,
             secondary_rack=secondary_rack,
         )
-        subnet = factory.make_Subnet(vlan=vlan, version=4)
+        subnet = factory.make_Subnet(vlan=vlan)
         primary_interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=primary_rack, vlan=vlan
         )
         primary_ip = factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet),
             alloc_type=IPADDRESS_TYPE.AUTO,
             subnet=subnet,
             interface=primary_interface,
@@ -2160,7 +2136,6 @@ class TestMakeFailoverPeerConfig(MAASServerTestCase):
             INTERFACE_TYPE.PHYSICAL, node=secondary_rack, vlan=vlan
         )
         secondary_ip = factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet),
             alloc_type=IPADDRESS_TYPE.AUTO,
             subnet=subnet,
             interface=secondary_interface,
@@ -2177,78 +2152,7 @@ class TestMakeFailoverPeerConfig(MAASServerTestCase):
                 },
                 primary_rack,
             ),
-            dhcp.make_failover_peer_config(vlan, secondary_rack, 4),
-        )
-
-    # See https://bugs.launchpad.net/maas/+bug/2027621
-    def test_renders_config_for_secondary_should_not_mix_v4_and_v6_addresses(
-        self,
-    ):
-        primary_rack = factory.make_RackController()
-        secondary_rack = factory.make_RackController()
-        vlan = factory.make_VLAN(
-            dhcp_on=True,
-            primary_rack=primary_rack,
-            secondary_rack=secondary_rack,
-        )
-        subnet_v4 = factory.make_Subnet(vlan=vlan, version=4)
-        subnet_v6 = factory.make_Subnet(vlan=vlan, version=6)
-        primary_interface = factory.make_Interface(
-            INTERFACE_TYPE.PHYSICAL, node=primary_rack, vlan=vlan
-        )
-        primary_ip_v4 = factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet_v4),
-            alloc_type=IPADDRESS_TYPE.AUTO,
-            subnet=subnet_v4,
-            interface=primary_interface,
-        )
-        primary_ip_v6 = factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet_v6),
-            alloc_type=IPADDRESS_TYPE.AUTO,
-            subnet=subnet_v6,
-            interface=primary_interface,
-        )
-        secondary_interface = factory.make_Interface(
-            INTERFACE_TYPE.PHYSICAL, node=secondary_rack, vlan=vlan
-        )
-        secondary_ip_v4 = factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet_v4),
-            alloc_type=IPADDRESS_TYPE.AUTO,
-            subnet=subnet_v4,
-            interface=secondary_interface,
-        )
-        secondary_ip_v6 = factory.make_StaticIPAddress(
-            ip=factory.pick_ip_in_Subnet(subnet_v6),
-            alloc_type=IPADDRESS_TYPE.AUTO,
-            subnet=subnet_v6,
-            interface=secondary_interface,
-        )
-        failover_peer_name = "failover-vlan-%d" % vlan.id
-        self.assertEqual(
-            (
-                failover_peer_name,
-                {
-                    "name": failover_peer_name,
-                    "mode": "secondary",
-                    "address": str(secondary_ip_v4.ip),
-                    "peer_address": str(primary_ip_v4.ip),
-                },
-                primary_rack,
-            ),
-            dhcp.make_failover_peer_config(vlan, secondary_rack, 4),
-        )
-        self.assertEqual(
-            (
-                failover_peer_name,
-                {
-                    "name": failover_peer_name,
-                    "mode": "secondary",
-                    "address": str(secondary_ip_v6.ip),
-                    "peer_address": str(primary_ip_v6.ip),
-                },
-                primary_rack,
-            ),
-            dhcp.make_failover_peer_config(vlan, secondary_rack, 6),
+            dhcp.make_failover_peer_config(vlan, secondary_rack),
         )
 
 
diff --git a/src/metadataserver/builtin_scripts/commissioning_scripts/bmc_config.py b/src/metadataserver/builtin_scripts/commissioning_scripts/bmc_config.py
index 221289a..4da0512 100755
--- a/src/metadataserver/builtin_scripts/commissioning_scripts/bmc_config.py
+++ b/src/metadataserver/builtin_scripts/commissioning_scripts/bmc_config.py
@@ -162,7 +162,7 @@ class IPMI(BMCConfig):
         password=None,
         ipmi_k_g="",
         ipmi_privilege_level="",
-        **kwargs,
+        **kwargs
     ):
         self.username = username
         self.password = password
@@ -174,7 +174,7 @@ class IPMI(BMCConfig):
     def _bmc_get_config(self, section=None):
         """Fetch and cache all BMC settings."""
         print("INFO: Reading current IPMI BMC values...")
-        cmd = ["bmc-config", "--checkout", "--verbose"]
+        cmd = ["bmc-config", "--checkout"]
         if section:
             cmd += ["-S", section]
         try:
@@ -438,53 +438,41 @@ class IPMI(BMCConfig):
     def _config_ipmi_lan_channel_settings(self):
         """Enable IPMI-over-Lan (Lan_Channel) if it is disabled"""
         print("INFO: Configuring IPMI Lan_Channel...")
+        lan_channel = self._bmc_config.get("Lan_Channel", {})
 
-        for channel in [
-            "Lan_Channel",
-            "Lan_Channel_Channel_1",
-            "Lan_Channel_Channel_2",
-            "Lan_Channel_Channel_3",
+        for key in [
+            "Volatile_Access_Mode",
+            "Non_Volatile_Access_Mode",
         ]:
-            lan_channel = self._bmc_config.get(channel, {})
-
-            if not lan_channel:
-                continue
-
-            for key in [
-                "Volatile_Access_Mode",
-                "Non_Volatile_Access_Mode",
-            ]:
-                if lan_channel.get(key) != "Always_Available":
+            if lan_channel.get(key) != "Always_Available":
+                print(
+                    "INFO: Enabling BMC network access - Lan_Channel:%s" % key
+                )
+                # 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:
+                    self._bmc_set("Lan_Channel", key, "Always_Available")
+                except Exception:
                     print(
-                        "INFO: Enabling BMC network access - %s:%s"
-                        % (channel, key)
+                        "WARNING: Unable to set Lan_Channel:%s. "
+                        "BMC may be unavailable over the network!" % key
                     )
-                    # 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:
-                        self._bmc_set(channel, key, "Always_Available")
-                    except Exception:
-                        print(
-                            "WARNING: Unable to set %s:%s. "
-                            "BMC may be unavailable over the network!"
-                            % (channel, key)
-                        )
-
-            self._bmc_set_keys(
-                channel,
-                [
-                    f"{auth_type}_{volatility}"
-                    for auth_type in [
-                        "Enable_User_Level_Auth",
-                        "Enable_Per_Message_Auth",
-                        "Enable_Pef_Alerting",
-                    ]
-                    for volatility in ["Volatile", "Non_Volatile"]
-                ],
-                "Yes",
-            )
+
+        self._bmc_set_keys(
+            "Lan_Channel",
+            [
+                "%s_%s" % (auth_type, volatility)
+                for auth_type in [
+                    "Enable_User_Level_Auth",
+                    "Enable_Per_Message_Auth",
+                    "Enable_Pef_Alerting",
+                ]
+                for volatility in ["Volatile", "Non_Volatile"]
+            ],
+            "Yes",
+        )
 
     def _config_lan_conf_auth(self):
         """Configure Lan_Conf_Auth."""
@@ -719,9 +707,6 @@ class IPMI(BMCConfig):
         mac_address = None
         for section_name, key in [
             ("Lan_Conf", "IP_Address"),
-            ("Lan_Conf_Channel_1", "IP_Address"),
-            ("Lan_Conf_Channel_2", "IP_Address"),
-            ("Lan_Conf_Channel_3", "IP_Address"),
             ("Lan6_Conf", "IPv6_Static_Addresses"),
             ("Lan6_Conf", "IPv6_Dynamic_Addresses"),
         ]:
@@ -744,28 +729,28 @@ class IPMI(BMCConfig):
                     time.sleep(2)
                     continue
                 if section_name.startswith("Lan6_"):
-                    return section_name, "[%s]" % ip, mac_address
-                return section_name, ip, mac_address
+                    return "[%s]" % ip, mac_address
+                return ip, mac_address
             # No valid IP address was found.
-        return None, None, mac_address
+        return None, mac_address
 
     def get_bmc_ip(self):
         """Configure and retreive IPMI BMC IP."""
-        section_name, ip_address, mac_address = self._get_bmc_ip()
+        ip_address, mac_address = self._get_bmc_ip()
         if ip_address:
             return ip_address, mac_address
         print("INFO: Attempting to enable preconfigured static IP on BMC...")
-        self._bmc_set(section_name, "IP_Address_Source", "Static")
+        self._bmc_set("Lan_Conf", "IP_Address_Source", "Static")
         for _ in range(6):
             time.sleep(10)
-            _, ip_address, mac_address = self._get_bmc_ip(True)
+            ip_address, mac_address = self._get_bmc_ip(True)
             if ip_address:
                 return ip_address, mac_address
         print("INFO: Attempting to enable DHCP on BMC...")
-        self._bmc_set(section_name, "IP_Address_Source", "Use_DHCP")
+        self._bmc_set("Lan_Conf", "IP_Address_Source", "Use_DHCP")
         for _ in range(6):
             time.sleep(10)
-            _, ip_address, mac_address = self._get_bmc_ip(True)
+            ip_address, mac_address = self._get_bmc_ip(True)
             if ip_address:
                 print("WARNING: BMC is configured to use DHCP!")
                 return ip_address, mac_address
diff --git a/src/metadataserver/builtin_scripts/commissioning_scripts/tests/test_bmc_config.py b/src/metadataserver/builtin_scripts/commissioning_scripts/tests/test_bmc_config.py
index 73e84b0..90f4af1 100644
--- a/src/metadataserver/builtin_scripts/commissioning_scripts/tests/test_bmc_config.py
+++ b/src/metadataserver/builtin_scripts/commissioning_scripts/tests/test_bmc_config.py
@@ -538,25 +538,20 @@ EndSection
         self.assertRaises(SystemExit, self.ipmi.add_bmc_user)
 
     def test_set_ipmi_lan_channel_setting_verifies(self):
-
-        for channel in [
-            "Lan_Channel",
-            "Lan_Channel_Channel_1",
-            "Lan_Channel_Channel_2",
-            "Lan_Channel_Channel_3",
-        ]:
-            self.ipmi._bmc_config = {
-                channel: {
-                    "Volatile_Access_Mode": "Always_Available",
-                    "Non_Volatile_Access_Mode": "Always_Available",
-                },
+        self.ipmi._bmc_config = {
+            "Lan_Channel": {
+                "Volatile_Access_Mode": "Always_Available",
+                "Non_Volatile_Access_Mode": "Always_Available",
             }
-            mock_bmc_set = self.patch(self.ipmi, "_bmc_set")
-            mock_bmc_set_keys = self.patch(self.ipmi, "_bmc_set_keys")
-            self.ipmi._config_ipmi_lan_channel_settings()
-            self.assertFalse(mock_bmc_set.called)
-            mock_bmc_set_keys.assert_called_once_with(
-                channel,
+        }
+        mock_bmc_set = self.patch(self.ipmi, "_bmc_set")
+        mock_bmc_set_keys = self.patch(self.ipmi, "_bmc_set_keys")
+        self.ipmi._config_ipmi_lan_channel_settings()
+        self.assertThat(mock_bmc_set, MockNotCalled())
+        self.assertThat(
+            mock_bmc_set_keys,
+            MockCalledOnceWith(
+                "Lan_Channel",
                 [
                     "%s_%s" % (auth_type, volatility)
                     for auth_type in [
@@ -567,36 +562,36 @@ EndSection
                     for volatility in ["Volatile", "Non_Volatile"]
                 ],
                 "Yes",
-            )
+            ),
+        )
 
     def test_set_ipmi_lan_channel_setting_enables(self):
-        for channel in [
-            "Lan_Channel",
-            "Lan_Channel_Channel_1",
-            "Lan_Channel_Channel_2",
-            "Lan_Channel_Channel_3",
-        ]:
-            self.ipmi._bmc_config = {
-                channel: {
-                    "Volatile_Access_Mode": "Disabled",
-                    "Non_Volatile_Access_Mode": "Pre_Boot_only",
-                },
+        self.ipmi._bmc_config = {
+            "Lan_Channel": {
+                "Volatile_Access_Mode": "Disabled",
+                "Non_Volatile_Access_Mode": "Pre_Boot_only",
             }
-            mock_bmc_set = self.patch(self.ipmi, "_bmc_set")
-            mock_bmc_set_keys = self.patch(self.ipmi, "_bmc_set_keys")
-            self.ipmi._config_ipmi_lan_channel_settings()
-            mock_bmc_set.assert_has_calls(
-                (
-                    call(channel, "Volatile_Access_Mode", "Always_Available"),
-                    call(
-                        channel,
-                        "Non_Volatile_Access_Mode",
-                        "Always_Available",
-                    ),
-                )
-            )
-            mock_bmc_set_keys.assert_called_once_with(
-                channel,
+        }
+        mock_bmc_set = self.patch(self.ipmi, "_bmc_set")
+        mock_bmc_set_keys = self.patch(self.ipmi, "_bmc_set_keys")
+        self.ipmi._config_ipmi_lan_channel_settings()
+        self.assertThat(
+            mock_bmc_set,
+            MockCallsMatch(
+                call(
+                    "Lan_Channel", "Volatile_Access_Mode", "Always_Available"
+                ),
+                call(
+                    "Lan_Channel",
+                    "Non_Volatile_Access_Mode",
+                    "Always_Available",
+                ),
+            ),
+        )
+        self.assertThat(
+            mock_bmc_set_keys,
+            MockCalledOnceWith(
+                "Lan_Channel",
                 [
                     "%s_%s" % (auth_type, volatility)
                     for auth_type in [
@@ -607,7 +602,8 @@ EndSection
                     for volatility in ["Volatile", "Non_Volatile"]
                 ],
                 "Yes",
-            )
+            ),
+        )
 
     def test_config_lan_conf_auth(self):
         self.ipmi._bmc_config = {"Lan_Channel_Auth": {}}
@@ -947,9 +943,7 @@ EndSection
                 "MAC_Address": mac_address,
             }
         }
-        self.assertEqual(
-            ("Lan_Conf", ip, mac_address), self.ipmi._get_bmc_ip()
-        )
+        self.assertEqual((ip, mac_address), self.ipmi._get_bmc_ip())
 
     def test_get_bmc_ipv6_static(self):
         ip = factory.make_ipv6_address()
@@ -960,9 +954,7 @@ EndSection
                 "MAC_Address": mac_address,
             }
         }
-        self.assertEqual(
-            ("Lan6_Conf", f"[{ip}]", mac_address), self.ipmi._get_bmc_ip()
-        )
+        self.assertEqual((f"[{ip}]", mac_address), self.ipmi._get_bmc_ip())
 
     def test_get_bmc_ipv6_dynamic(self):
         ip = factory.make_ipv6_address()
@@ -973,9 +965,7 @@ EndSection
                 "MAC_Address": mac_address,
             }
         }
-        self.assertEqual(
-            ("Lan6_Conf", f"[{ip}]", mac_address), self.ipmi._get_bmc_ip()
-        )
+        self.assertEqual((f"[{ip}]", mac_address), self.ipmi._get_bmc_ip())
 
     def test_get_bmc_ipv6_gets_mac_From_ipv4(self):
         ip = factory.make_ipv6_address()
@@ -984,20 +974,18 @@ EndSection
             "Lan_Conf": {"MAC_Address": mac_address},
             "Lan6_Conf": {"IPv6_Dynamic_Addresses": ip},
         }
-        self.assertEqual(
-            ("Lan6_Conf", f"[{ip}]", mac_address), self.ipmi._get_bmc_ip()
-        )
+        self.assertEqual((f"[{ip}]", mac_address), self.ipmi._get_bmc_ip())
 
     def test_get_bmc_ip_finds_none(self):
         self.patch(self.ipmi, "_bmc_get").return_value = ""
-        self.assertEqual((None, None, None), self.ipmi._get_bmc_ip())
+        self.assertEqual((None, None), self.ipmi._get_bmc_ip())
 
     def test_get_bmc_ip(self):
         ip = factory.make_ip_address()
         mac_address = factory.make_mac_address()
         mock_bmc_set = self.patch(self.ipmi, "_bmc_set")
         mock_get_bmc_ip = self.patch(self.ipmi, "_get_bmc_ip")
-        mock_get_bmc_ip.return_value = None, ip, mac_address
+        mock_get_bmc_ip.return_value = ip, mac_address
 
         self.assertEqual((ip, mac_address), self.ipmi.get_bmc_ip())
         self.assertThat(mock_bmc_set, MockNotCalled())
@@ -1009,9 +997,9 @@ EndSection
         mock_bmc_set = self.patch(self.ipmi, "_bmc_set")
         mock_get_bmc_ip = self.patch(self.ipmi, "_get_bmc_ip")
         mock_get_bmc_ip.side_effect = (
-            ("Lan_Conf", None, mac_address),
-            ("Lan_Conf", None, mac_address),
-            ("Lan_Conf", ip, mac_address),
+            (None, mac_address),
+            (None, mac_address),
+            (ip, mac_address),
         )
 
         self.assertEqual((ip, mac_address), self.ipmi.get_bmc_ip())
@@ -1029,8 +1017,8 @@ EndSection
         mock_bmc_set = self.patch(self.ipmi, "_bmc_set")
         mock_get_bmc_ip = self.patch(self.ipmi, "_get_bmc_ip")
         mock_get_bmc_ip.side_effect = (
-            *[("Lan_Conf", None, mac_address) for _ in range(8)],
-            ("Lan_Conf", ip, mac_address),
+            *[(None, mac_address) for _ in range(8)],
+            (ip, mac_address),
         )
 
         self.assertEqual((ip, mac_address), self.ipmi.get_bmc_ip())
@@ -1041,7 +1029,6 @@ EndSection
                 call("Lan_Conf", "IP_Address_Source", "Use_DHCP"),
             ),
         )
-
         self.assertThat(
             mock_get_bmc_ip,
             MockCallsMatch(call(), *[call(True) for _ in range(8)]),
@@ -1050,7 +1037,7 @@ EndSection
     def test_get_bmc_ip_fails(self):
         mock_bmc_set = self.patch(self.ipmi, "_bmc_set")
         mock_get_bmc_ip = self.patch(self.ipmi, "_get_bmc_ip")
-        mock_get_bmc_ip.return_value = ("Lan_Conf", None, None)
+        mock_get_bmc_ip.return_value = (None, None)
 
         self.assertRaises(SystemExit, self.ipmi.get_bmc_ip)
         self.assertThat(