Merge lp:~rvb/maas/pxe-mac-bug-1399676-view-node into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Display the PXE MAC first on the node view page.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[Raphaël Badin (rvb)]

Thanks for the review!

=== modified file 'src/maasserver/templates/maasserver/node_view.html'
--- src/maasserver/templates/maasserver/node_view.html	2014-12-09 21:38:38 +0000
+++ src/maasserver/templates/maasserver/node_view.html	2014-12-10 14:01:17 +0000
@@ -109,17 +109,11 @@
       <h4>Network interfaces</h4>
       <span>
         <ul class="data-list">
-          {% for mac in node.macaddress_set.all %}
-          <li>
-            {{ mac }}
-            {% if mac.get_networks %}
-            (on
-            {# Per network interface, comma-separated list of networks. #}
-            {% for network in mac.get_networks %}
-            <a href="{% url 'network-view' network.name %}">
-                {{ network.name }}</a>{% if not forloop.last %},
-                {% endif %}{% endfor %}){% endif %}
-          </li>
+          {% with mac=node.get_pxe_mac %}
+            {% include "maasserver/node_view_mac_display.html" %}
+          {% endwith %}
+          {% for mac in node.get_extra_macs %}
+            {% include "maasserver/node_view_mac_display.html" %}
           {% endfor %}
         </ul>
       </span>

=== added file 'src/maasserver/templates/maasserver/node_view_mac_display.html'
--- src/maasserver/templates/maasserver/node_view_mac_display.html	1970-01-01 00:00:00 +0000
+++ src/maasserver/templates/maasserver/node_view_mac_display.html	2014-12-10 14:01:17 +0000
@@ -0,0 +1,10 @@
+<li>
+  {{ mac }}
+  {% if mac.get_networks %}
+  (on
+  {# Per network interface, comma-separated list of networks. #}
+  {% for network in mac.get_networks %}
+  <a href="{% url 'network-view' network.name %}">
+      {{ network.name }}</a>{% if not forloop.last %},
+      {% endif %}{% endfor %}){% endif %}
+</li>

=== modified file 'src/maasserver/views/tests/test_nodes.py'
--- src/maasserver/views/tests/test_nodes.py	2014-12-10 14:01:17 +0000
+++ src/maasserver/views/tests/test_nodes.py	2014-12-10 14:01:17 +0000
@@ -737,11 +737,18 @@
         [listing] = get_one(interfaces_section.cssselect('span'))
         self.assertEqual(mac.mac_address, listing.text_content().strip())
 
-    def test_view_node_lists_macs_as_list_items(self):
+    def test_view_node_lists_macs_as_sorted_list_items(self):
+        # The PXE mac is listed first on the node view page.
         self.client_log_in()
         node = factory.make_Node()
-        factory.make_MACAddress('11:11:11:11:11:11', node=node)
-        factory.make_MACAddress('22:22:22:22:22:22', node=node)
+
+        macs = [
+            factory.make_MACAddress(node=node)
+            for _ in range(4)
+        ]
+        pxe_mac_index = 2
+        node.pxe_mac = macs[pxe_mac_index]
+        node.save()
 
         response = self.client.get(reverse('node-view', args=[node.system_id]))
         self.assertEqual(httplib.OK, response.status_code)
@@ -750,8 +757,12 @@
             '#network-interfaces')
         [interfaces_list] = interfaces_section.cssselect('ul')
         interfaces = interfaces_list.cssselect('li')
+        sorted_macs = (
+            [macs[pxe_mac_index]] +
+            macs[:pxe_mac_index] + macs[pxe_mac_index + 1:]
+        )
         self.assertEqual(
-            ['11:11:11:11:11:11', '22:22:22:22:22:22'],
+            [mac.mac_address.get_raw() for mac in sorted_macs],
             [interface.text_content().strip() for interface in interfaces])
 
     def test_view_node_links_network_interfaces_to_networks(self):