Merge lp:~jtv/maas/warn-unconfigured-ip into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Warn on the Node page if a node has static IPv6 addresses that can't be configured on the node. IPv6 address configuration is currently only supported with Ubuntu, using the fast installer.

The warning shows up in two places: a big colourful detailed message at the top of the page, and a warning triangle next to the “IP addresses” heading with a tooltip that says the node's IPv6 addresses are not configured. It's terse, but hopefully it combines well with the full notice at the top of the page.

I chose to show the warning only while the node has an owner. Otherwise, the node's operating-system property is meaningless: it will be reset before the node is ever deployed.

Eventually, we hope this notice can go away as we will support IPv6 on all operating systems.

Jeroen

[Gavin Panella (allenap)]

Grand. It's cool to watch the IPv6 work progressing.

review: Approve

[Jeroen T. Vermeulen (jtv)]

Implemented your suggestion using any(). Much better, thanks!

=== modified file 'src/maasserver/templates/maasserver/node_view.html'
--- src/maasserver/templates/maasserver/node_view.html	2014-09-15 14:28:28 +0000
+++ src/maasserver/templates/maasserver/node_view.html	2014-09-20 02:25:09 +0000
@@ -159,8 +159,15 @@
     </li>
     {% with ip_addresses=node.ip_addresses %}
     {% if ip_addresses|length %}
-    <li class="block size3">
-      <h4>IP addresses</h4>
+    <li class="block size3" id="ip-addresses">
+      <h4>IP addresses
+          {% if unconfigured_ips_warning %}
+          <img
+            src="{{ STATIC_URL }}img/warning.png"
+            title="This node's IPv6 addresses are not automatically configured."
+            id="unconfigured-ips-warning" />
+          {% endif %}
+      </h4>
       <span>
           {% for ip in ip_addresses %}
           {{ ip }}{% if not forloop.last %}, {% endif %}

=== modified file 'src/maasserver/views/nodes.py'
--- src/maasserver/views/nodes.py	2014-09-11 17:45:02 +0000
+++ src/maasserver/views/nodes.py	2014-09-20 02:25:09 +0000
@@ -54,6 +54,7 @@
 from maasserver import logger
 from maasserver.clusterrpc.power_parameters import get_power_types
 from maasserver.enum import (
+    NODE_BOOT,
     NODE_PERMISSION,
     NODE_STATUS,
     )
@@ -72,6 +73,7 @@
 from maasserver.models import (
     MACAddress,
     Node,
+    StaticIPAddress,
     Tag,
     )
 from maasserver.models.config import Config
@@ -96,6 +98,7 @@
 from metadataserver.models import NodeResult
 from netaddr import (
     EUI,
+    IPAddress,
     NotRegisteredError,
     )
 from provisioningserver.tags import merge_details_cleanly
@@ -497,6 +500,12 @@
     href="%s#third_party_drivers">settings</a> page.
     """)
 
+UNCONFIGURED_IPS_NOTICE = dedent("""
+    Automatic configuration of IPv6 addresses is currently only supported on
+    Ubuntu, using the fast installer.  To activate the IPv6 address(es) shown
+    here, configure them in the installed operating system.
+    """)
+
 
 def construct_third_party_drivers_notice(user_is_admin):
     """Build and return the notice about third party drivers.
@@ -529,6 +538,29 @@
     # The number of events shown on the node view page.
     number_of_events_shown = 5
 
+    def warn_unconfigured_ip_addresses(self, node):
+        """Should the UI warn about unconfigured IPv6 addresses on the node?
+
+        Static IPv6 addresses are configured on the node using Curtin.  But
+        this is not yet supported for all operating systems and installers.
+        If a node has IPv6 addresses assigned but is not being deployed in a
+        way that supports configuring them, the node page should show a warning
+        to say that the user will need to configure the node to use those
+        addresses.
+
+        :return: Bool: should the UI show this warning?
+        """
+        if node.osystem == 'ubuntu' and node.boot_type == NODE_BOOT.FASTPATH:
+            # MAAS knows how to configure IPv6 addresses on an Ubuntu node
+            # installed with the fast installer.  No warning needed.
+            return False
+        # For other installs, we need the warning if and only if the node has
+        # static IPv6 addresses.
+        static_ips = StaticIPAddress.objects.filter(macaddress__node=node)
+        return any(
+            IPAddress(static_ip.ip).version == 6
+            for static_ip in static_ips)
+
     def get_context_data(self, **kwargs):
         context = super(NodeView, self).get_context_data(**kwargs)
         node = self.get_object()
@@ -538,6 +570,10 @@
             messages.info(self.request, NODE_BOOT_INFO)
         if node.power_type == '':
             messages.error(self.request, NO_POWER_SET)
+        if self.warn_unconfigured_ip_addresses(node):
+            messages.warning(self.request, UNCONFIGURED_IPS_NOTICE)
+            context['unconfigured_ips_warning'] = UNCONFIGURED_IPS_NOTICE
+
         context['error_text'] = (
             node.error if node.status == NODE_STATUS.FAILED_COMMISSIONING
             else None)

=== modified file 'src/maasserver/views/tests/test_nodes.py'
--- src/maasserver/views/tests/test_nodes.py	2014-09-18 12:44:38 +0000
+++ src/maasserver/views/tests/test_nodes.py	2014-09-20 02:25:09 +0000
@@ -18,7 +18,10 @@
 import httplib
 from operator import attrgetter
 import os
-from random import randint
+from random import (
+    choice,
+    randint,
+    )
 from textwrap import dedent
 from urlparse import (
     parse_qsl,
@@ -34,6 +37,7 @@
 import maasserver.api
 from maasserver.clusterrpc.testing.boot_images import make_rpc_boot_image
 from maasserver.enum import (
+    NODE_BOOT,
     NODE_STATUS,
     NODEGROUP_STATUS,
     NODEGROUPINTERFACE_MANAGEMENT,
@@ -86,7 +90,11 @@
     )
 from provisioningserver.utils.enum import map_enum
 from provisioningserver.utils.text import normalise_whitespace
-from testtools.matchers import ContainsAll
+from testtools.matchers import (
+    ContainsAll,
+    HasLength,
+    Not,
+    )
 
 
 class TestGenerateJSPowerTypes(MAASServerTestCase):
@@ -478,6 +486,34 @@
         response = self.client.get(node_link)
         self.assertNotIn("IP addresses", response.content)
 
+    def test_view_node_warns_about_unconfigured_IPv6_addresses(self):
+        self.client_log_in()
+        ipv6_network = factory.make_ipv6_network()
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            owner=self.logged_in_user, network=ipv6_network,
+            osystem='windows')
+        factory.make_StaticIPAddress(
+            ip=factory.pick_ip_in_network(ipv6_network),
+            mac=node.get_primary_mac())
+        node_link = reverse('node-view', args=[node.system_id])
+        page = fromstring(self.client.get(node_link).content)
+        [addresses_section] = page.cssselect('#ip-addresses')
+        self.expectThat(
+            addresses_section.cssselect('#unconfigured-ips-warning'),
+            Not(HasLength(0)))
+
+    def test_view_node_does_not_warn_if_no_unconfigured_IPv6_addresses(self):
+        self.client_log_in()
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            owner=self.logged_in_user)
+        factory.make_StaticIPAddress(mac=node.get_primary_mac())
+        node_link = reverse('node-view', args=[node.system_id])
+        page = fromstring(self.client.get(node_link).content)
+        [addresses_section] = page.cssselect('#ip-addresses')
+        self.assertEqual(
+            [],
+            addresses_section.cssselect('#unconfigured-ip-warning'))
+
     def test_view_node_displays_node_info_no_owner(self):
         # If the node has no owner, the Owner 'slot' does not exist.
         self.client_log_in()
@@ -1276,6 +1312,49 @@
         self.assertIn(node_event_list, get_content_links(response))
 
 
+class TestWarnUnconfiguredIPAddresses(MAASServerTestCase):
+
+    def test__warns_for_IPv6_address_on_non_ubuntu_OS(self):
+        network = factory.make_ipv6_network()
+        osystem = choice(['windows', 'centos', 'suse'])
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            osystem=osystem, network=network)
+        factory.make_StaticIPAddress(
+            ip=factory.pick_ip_in_network(network), mac=node.get_primary_mac())
+        self.assertTrue(NodeView().warn_unconfigured_ip_addresses(node))
+
+    def test__warns_for_IPv6_address_on_debian_installer(self):
+        network = factory.make_ipv6_network()
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            osystem='ubuntu', network=network, boot_type=NODE_BOOT.DEBIAN)
+        factory.make_StaticIPAddress(
+            ip=factory.pick_ip_in_network(network), mac=node.get_primary_mac())
+        self.assertTrue(NodeView().warn_unconfigured_ip_addresses(node))
+
+    def test__does_not_warn_for_ubuntu_fast_installer(self):
+        network = factory.make_ipv6_network()
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            osystem='ubuntu', network=network, boot_type=NODE_BOOT.FASTPATH)
+        factory.make_StaticIPAddress(
+            ip=factory.pick_ip_in_network(network), mac=node.get_primary_mac())
+        self.assertFalse(NodeView().warn_unconfigured_ip_addresses(node))
+
+    def test__does_not_warn_for_just_IPv4_address(self):
+        network = factory.make_ipv4_network()
+        osystem = choice(['windows', 'centos', 'suse'])
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            osystem=osystem, network=network)
+        factory.make_StaticIPAddress(
+            ip=factory.pick_ip_in_network(network), mac=node.get_primary_mac())
+        self.assertFalse(NodeView().warn_unconfigured_ip_addresses(node))
+
+    def test__does_not_warn_without_static_address(self):
+        osystem = choice(['windows', 'centos', 'suse'])
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            osystem=osystem)
+        self.assertFalse(NodeView().warn_unconfigured_ip_addresses(node))
+
+
 class NodeEventLogTest(MAASServerTestCase):
 
     def test_event_log_shows_event_list(self):