Merge lp:~mpontillo/maas/show-nodes-on-subnet-page-1567150 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Show link to node or controller details page (if possible) on subnet IP address listing.

Here's a couple more options, based on discussions with design. What do people prefer?

Interface and Node in the same column:
    https://imgur.com/MugFeWx

Interface and node in two separate columns:
    https://imgur.com/Zbo2oQj

[Mike Pontillo (mpontillo)]

This was an easy fix. We already had the data in the controller; just had to expose it on the view.

[Blake Rouse (blake-rouse)]

review: Needs Fixing

[Mike Pontillo (mpontillo)]

I agree it's a bit weird, though I think it's a big improvement over what we have now. Let's take another look at the design and try a few things before this lands, then.

[Andres Rodriguez (andreserl)]

I actually believe rwe should have the source, because that differentiates the actual machine. You may have devices called:

machine1

and a machine

machine2

So it is good for differentiation.

review: Approve

[Blake Rouse (blake-rouse)]

Node and Usage is a repeat, this is not correct.

review: Disapprove

[Mike Pontillo (mpontillo)]

Well, there isn't a repeat. Though I think the presentation can still be improved.

https://imgur.com/cEOt11z

[Andres Rodriguez (andreserl)]

Just one comment inline, otherwise it lgtm!

review: Approve

[Mike Pontillo (mpontillo)]

Replied to your comment below. Also, which option do you like?

Interface and Node in the same column:
    https://imgur.com/MugFeWx

Interface and node in two separate columns:
    https://imgur.com/Zbo2oQj

[Mike Pontillo (mpontillo)]

Another option (node and interface swapped):

https://imgur.com/jCQIVfA

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

Attempt to merge into lp:maas failed due to conflicts:

text conflict in src/maasserver/static/partials/subnet-details.html

=== modified file 'src/maasserver/models/staticipaddress.py'
--- src/maasserver/models/staticipaddress.py	2016-04-22 19:34:44 +0000
+++ src/maasserver/models/staticipaddress.py	2016-04-27 18:24:27 +0000
@@ -473,14 +473,23 @@
         return "%s:type=%s" % (self.ip, strtype)
 
     def get_node(self):
-        """Return the Node of the first interface connected to this IP
+        """Return the Node of the first Interface connected to this IP
         address."""
-        interface = self.interface_set.first()
+        interface = self.get_interface()
         if interface is not None:
             return interface.get_node()
         else:
             return None
 
+    def get_interface(self):
+        """Return the first Interface connected to this IP address."""
+        # Note that, while this relationship is modeled as a many-to-many,
+        # MAAS currently only relates a single interface per IP address
+        # at this time. In the future, we may want to model virtual IPs, in
+        # which case this will need to change.
+        interface = self.interface_set.first()
+        return interface
+
     def get_interface_link_type(self):
         """Return the `INTERFACE_LINK_TYPE`."""
         if self.alloc_type == IPADDRESS_TYPE.AUTO:
@@ -650,13 +659,17 @@
         if with_username and self.user is not None:
             data["user"] = self.user.username
         if with_node_summary:
+            iface = self.get_interface()
             node = self.get_node()
             if node is not None:
                 data["node_summary"] = {
                     "system_id": node.system_id,
                     "node_type": node.node_type,
                     "fqdn": node.fqdn,
+                    "hostname": node.hostname,
                 }
+                if iface is not None:
+                    data["node_summary"]["via"] = iface.get_name()
                 if (with_username and
                         self.alloc_type != IPADDRESS_TYPE.DISCOVERED):
                     # If a user owns this node, overwrite any username we found

=== modified file 'src/maasserver/models/tests/test_staticipaddress.py'
--- src/maasserver/models/tests/test_staticipaddress.py	2016-04-27 12:15:51 +0000
+++ src/maasserver/models/tests/test_staticipaddress.py	2016-04-27 18:24:27 +0000
@@ -905,6 +905,21 @@
         self.expectThat(json, Not(Contains("user")))
         self.expectThat(json, Contains("node_summary"))
 
+    def test__node_summary_includes_interface_name(self):
+        user = factory.make_User()
+        subnet = factory.make_Subnet()
+        node = factory.make_Node_with_Interface_on_Subnet(
+            disable_ipv4=False, subnet=subnet)
+        self.expectThat(node.interface_set.count(), Equals(1))
+        iface = node.interface_set.first()
+        ip = factory.make_StaticIPAddress(
+            ip=factory.pick_ip_in_Subnet(subnet), user=user,
+            interface=node.get_boot_interface())
+        json = ip.render_json(with_node_summary=True)
+        self.expectThat(json, Not(Contains("user")))
+        self.expectThat(json, Contains("node_summary"))
+        self.expectThat(json['node_summary']['via'], Equals(iface.name))
+
     def test__data_is_accurate_and_complete(self):
         user = factory.make_User()
         hostname = factory.make_name('hostname')

=== modified file 'src/maasserver/static/partials/subnet-details.html'
--- src/maasserver/static/partials/subnet-details.html	2016-04-27 02:20:00 +0000
+++ src/maasserver/static/partials/subnet-details.html	2016-04-27 18:24:27 +0000
@@ -266,10 +266,11 @@
                     <thead>
                         <tr class="table-listing__row">
                             <th class="table-listing__header table-col--20">IP Address</th>
-                            <th class="table-listing__header table-col--20">Node</th>
+                            <th class="table-listing__header table-col--10">Type</th>
+                            <th class="table-listing__header table-col--15">Node</th>
+                            <th class="table-listing__header table-col--10">Interface</th>
+                            <th class="table-listing__header table-col--10">Usage</th>
                             <th class="table-listing__header table-col--10">Owner</th>
-                            <th class="table-listing__header table-col--10">Usage</th>
-                            <th class="table-listing__header table-col--15">Type</th>
                             <th class="table-listing__header table-col--25">Last seen</th>
                             <!-- XXX mpontillo need data for this -->
                             <!--
@@ -286,15 +287,29 @@
                     <tbody>
                         <tr data-ng-repeat="ip in subnet.ip_addresses">
                             <td class="table-col--20">{$ ip.ip $}</td>
-                            <td class="table-col--20" data-ng-switch="ip.node_summary.node_type">
-                                <span data-ng-switch-when="0"><a href="#/node/{$ ip.node_summary.system_id $}">{$ ip.node_summary.fqdn $}</a></span>
-                                <span data-ng-switch-when="1">{$ ip.node_summary.fqdn $}</span>
-                                <span data-ng-switch-when="2"><a href="#/node/controller/{$ ip.node_summary.system_id $}">{$ ip.node_summary.fqdn $}</a></span>
-                                <span data-ng-switch-when="3"><a href="#/node/controller/{$ ip.node_summary.system_id $}">{$ ip.node_summary.fqdn $}</a></span>
-                                <span data-ng-switch-when="4"><a href="#/node/controller/{$ ip.node_summary.system_id $}">{$ ip.node_summary.fqdn $}</a></span>
-                                <span data-ng-switch-default>Unknown</span>
-                            </td>
-                            <td class="table-col--10">{$ ip.user ? ip.user : "MAAS" $}</td>
+                            <td class="table-col--10" data-ng-switch="ip.alloc_type">
+                                <span data-ng-switch-when="0">Automatic</span>
+                                <span data-ng-switch-when="1">Static</span>
+                                <span data-ng-switch-when="4">User reserved</span>
+                                <span data-ng-switch-when="5">DHCP</span>
+                                <span data-ng-switch-when="6">Observed</span>
+                                <span data-ng-switch-default>Unknown</span>
+                            </td>
+                            <td class="table-col--15" data-ng-switch="ip.node_summary.node_type">
+                                <span data-ng-switch-when="0"><a href="#/node/{$ ip.node_summary.system_id $}">{$ ip.node_summary.hostname $}</a></span>
+                                <span data-ng-switch-when="1">{$ ip.node_summary.hostname $}</span>
+                                <span data-ng-switch-when="2"><a href="#/node/controller/{$ ip.node_summary.system_id $}">{$ ip.node_summary.hostname $}</a></span>
+                                <span data-ng-switch-when="3"><a href="#/node/controller/{$ ip.node_summary.system_id $}">{$ ip.node_summary.hostname $}</a></span>
+                                <span data-ng-switch-when="4"><a href="#/node/controller/{$ ip.node_summary.system_id $}">{$ ip.node_summary.hostname $}</a></span>
+                            </td>
+                            <td class="table-col--10" data-ng-switch="ip.node_summary.node_type">
+                                <span data-ng-switch-when="0">{$ ip.node_summary.via $}</span>
+                                <span data-ng-switch-when="1">{$ ip.node_summary.via $}</span>
+                                <span data-ng-switch-when="2">{$ ip.node_summary.via $}</span>
+                                <span data-ng-switch-when="3">{$ ip.node_summary.via $}</span>
+                                <span data-ng-switch-when="4">{$ ip.node_summary.via $}</span>
+                                <span data-ng-switch-default>Unknown</span>
+                            </td>
                             <td class="table-col--10" data-ng-switch="ip.node_summary.node_type">
                                 <span data-ng-switch-when="0">Machine</span>
                                 <span data-ng-switch-when="1">Device</span>
@@ -303,14 +318,7 @@
                                 <span data-ng-switch-when="4">Rack and region controller</span>
                                 <span data-ng-switch-default>Unknown</span>
                             </td>
-                            <td class="table-col--15" data-ng-switch="ip.alloc_type">
-                                <span data-ng-switch-when="0">Automatic</span>
-                                <span data-ng-switch-when="1">Static</span>
-                                <span data-ng-switch-when="4">User reserved</span>
-                                <span data-ng-switch-when="5">DHCP</span>
-                                <span data-ng-switch-when="6">Observed</span>
-                                <span data-ng-switch-default>Unknown</span>
-                            </td>
+                            <td class="table-col--10">{$ ip.user ? ip.user : "MAAS" $}</td>
                             <td class="table-col--25">
                                 <time>{$ ip.updated $}</time>
                             </td>