Merge lp:~lamont/maas/bug-1645912b into lp:~maas-committers/maas/trunk

[LaMont Jones]

Have ipmi_autodetect wrap IPv6 literals in brackets. Parse those correctly.

Have ipmi_autodetect wrap IPv6 literals in brackets. Parse those correctly.

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'src/maasserver/models/bmc.py'
--- src/maasserver/models/bmc.py	2017-01-31 22:19:57 +0000
+++ src/maasserver/models/bmc.py	2017-02-09 21:59:03 +0000
@@ -205,7 +205,10 @@
         parameters has changed. """
         new_ip = BMC.extract_ip_address(self.power_type, self.power_parameters)
         current_ip = None if self.ip_address is None else self.ip_address.ip
-        # Set the ip_address field.
+        # Set the ip_address field.  If we have a bracketed address, assume
+        # it's IPv6, and strip the brackets.
+        if new_ip and new_ip.startswith('[') and new_ip.endswith(']'):
+            new_ip = new_ip[1:-1]
         if new_ip != current_ip:
             if new_ip is None:
                 self.ip_address = None
 
=== modified file 'src/maasserver/models/tests/test_bmc.py'
--- src/maasserver/models/tests/test_bmc.py	2017-01-27 03:02:54 +0000
+++ src/maasserver/models/tests/test_bmc.py	2017-02-09 21:59:03 +0000
@@ -115,6 +115,30 @@
         self.assertEqual(sticky_ip.ip, bmc.ip_address.ip)
         self.assertEqual(subnet, bmc.ip_address.subnet)
 
+    def test_bmc_save_accepts_naked_ipv6_address(self):
+        subnet = factory.make_Subnet(cidr=factory.make_ipv6_network())
+        sticky_ip = factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY, subnet=subnet)
+        power_parameters = {
+            'power_address': '%s' % sticky_ip.ip,
+        }
+        bmc = factory.make_BMC(
+            power_type="ipmi", power_parameters=power_parameters)
+        self.assertEqual(sticky_ip.ip, bmc.ip_address.ip)
+        self.assertEqual(subnet, bmc.ip_address.subnet)
+
+    def test_bmc_save_accepts_bracketed_ipv6_address(self):
+        subnet = factory.make_Subnet(cidr=factory.make_ipv6_network())
+        sticky_ip = factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY, subnet=subnet)
+        power_parameters = {
+            'power_address': '[%s]' % sticky_ip.ip,
+        }
+        bmc = factory.make_BMC(
+            power_type="ipmi", power_parameters=power_parameters)
+        self.assertEqual(sticky_ip.ip, bmc.ip_address.ip)
+        self.assertEqual(subnet, bmc.ip_address.subnet)
+
     def test_bmc_changing_power_parameters_changes_ip(self):
         ip = factory.make_ipv4_address()
         power_parameters = {
 
=== modified file 'src/provisioningserver/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py'
--- src/provisioningserver/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py	2017-02-03 14:51:31 +0000
+++ src/provisioningserver/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py	2017-02-09 21:59:03 +0000
@@ -167,6 +167,8 @@
             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
 
=== modified file 'src/provisioningserver/templates/commissioning-user-data/snippets/tests/test_maas_ipmi_autodetect.py'
--- src/provisioningserver/templates/commissioning-user-data/snippets/tests/test_maas_ipmi_autodetect.py	2017-02-01 22:53:37 +0000
+++ src/provisioningserver/templates/commissioning-user-data/snippets/tests/test_maas_ipmi_autodetect.py	2017-02-09 21:59:03 +0000
@@ -513,34 +513,34 @@
             output4='  IP_Address    0.0.0.0\n\n',
             output_st='  IPv6_Static_Addresses 2001:db8::3\n\n',
             output_dy='',
-            expected='2001:db8::3')),
+            expected='[2001:db8::3]')),
         ('static6 multiple', dict(
             output4='  IP_Address    0.0.0.0\n\n',
             output_st='  IPv6_Static_Addresses fe80::3:7 2001:db8::3\n\n',
             output_dy='',
-            expected='2001:db8::3')),
+            expected='[2001:db8::3]')),
         ('mixed6', dict(
             output4='  IP_Address    0.0.0.0\n\n',
             output_st='  IPv6_Static_Addresses 2001:db8::9:5\n\n',
             output_dy='  ## IPv6_Dynamic_Addresses 2001:db8::3\n\n',
-            expected='2001:db8::9:5')),
+            expected='[2001:db8::9:5]')),
         ('dynamic6', dict(
             output4='  IP_Address    0.0.0.0\n\n',
             output_st='',
             output_dy='  ## IPv6_Dynamic_Addresses 2001:db8::3\n\n',
-            expected='2001:db8::3')),
+            expected='[2001:db8::3]')),
         ('dynamic6 with link-local', dict(
             output4='  IP_Address    0.0.0.0\n\n',
             output_st='',
             output_dy='  ## IPv6_Dynamic_Addresses fe80::3:7 2001:db8::3\n\n',
-            expected='2001:db8::3')),
+            expected='[2001:db8::3]')),
         ('dynamic6 multiple', dict(
             output4='  IP_Address    0.0.0.0\n\n',
             output_st='',
             output_dy=(
                 '  ## IPv6_Dynamic_Addresses fe80::7 2001:db8::3 2001::5\n\n'
             ),
-            expected='2001:db8::3')),
+            expected='[2001:db8::3]')),
         ('link-local', dict(
             output4='',
             output_st='',