Merge lp:~blake-rouse/maas/fix-1503474 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Add the children devices on the node details page.

[Andres Rodriguez (andreserl)]

Codewise, this lgtm! I have not tested it though. just one quick question. This section will only show up when there are containers associated right?

review: Approve

[Andres Rodriguez (andreserl)]

Oh, and for what I can see, we are showing device name, mac address, right? What about the IP address?

[Blake Rouse (blake-rouse)]

It only shows up when atleast one exists. Yes IP address is shown.

=== modified file 'src/maasserver/static/js/angular/controllers/node_details.js'
--- src/maasserver/static/js/angular/controllers/node_details.js	2015-11-02 03:34:34 +0000
+++ src/maasserver/static/js/angular/controllers/node_details.js	2015-11-05 02:32:14 +0000
@@ -38,7 +38,7 @@
             skipStorage: false
         };
         $scope.checkingPower = false;
-
+        $scope.devices = [];
 
         // Holds errors that are displayed on the details page.
         $scope.errors = {
@@ -361,6 +361,56 @@
             }
         }
 
+        // Update the devices array on the scope based on the device children
+        // on the node.
+        function updateDevices() {
+            $scope.devices = [];
+            angular.forEach($scope.node.devices, function(child) {
+                var device = {
+                    name: child.fqdn
+                };
+
+                // Add the interfaces to the device object if any exists.
+                if(angular.isArray(child.interfaces) &&
+                    child.interfaces.length > 0) {
+                    angular.forEach(child.interfaces, function(nic, nicIdx) {
+                        var deviceWithMAC = angular.copy(device);
+                        deviceWithMAC.mac_address = nic.mac_address;
+
+                        // Remove device name so it is not duplicated in the
+                        // table since this is another MAC address on this
+                        // device.
+                        if(nicIdx > 0) {
+                            deviceWithMAC.name = "";
+                        }
+
+                        // Add this links to the device object if any exists.
+                        if(angular.isArray(nic.links) &&
+                            nic.links.length > 0) {
+                            angular.forEach(nic.links, function(link, lIdx) {
+                                var deviceWithLink = angular.copy(
+                                    deviceWithMAC);
+                                deviceWithLink.ip_address = link.ip_address;
+
+                                // Remove the MAC address so it is not
+                                // duplicated in the table since this is
+                                // another link on this interface.
+                                if(lIdx > 0) {
+                                    deviceWithLink.mac_address = "";
+                                }
+
+                                $scope.devices.push(deviceWithLink);
+                            });
+                        } else {
+                            $scope.devices.push(deviceWithMAC);
+                        }
+                    });
+                } else {
+                    $scope.devices.push(device);
+                }
+            });
+        }
+
         // Starts the watchers on the scope.
         function startWatching() {
             // Update the title and name when the node fqdn changes.
@@ -369,6 +419,9 @@
                 updateName();
             });
 
+            // Update the devices on the node.
+            $scope.$watch("node.devices", updateDevices);
+
             // Update the availableActionOptions when the node actions change.
             $scope.$watch("node.actions", updateAvailableActionOptions);
 

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2015-11-02 03:34:34 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2015-11-05 02:32:14 +0000
@@ -204,6 +204,8 @@
             skipNetworking: false,
             skipStorage: false
         });
+        expect($scope.checkingPower).toBe(false);
+        expect($scope.devices).toEqual([]);
     });
 
     it("sets initial values for summary section", function() {
@@ -625,6 +627,7 @@
 
         expect(watches).toEqual([
             "node.fqdn",
+            "node.devices",
             "node.actions",
             "node.nodegroup.id",
             "node.architecture",
@@ -668,6 +671,87 @@
             [["architectures"], ["hwe_kernels"], ["osinfo"]]);
     });
 
+    it("updates $scope.devices", function() {
+        var setActiveDefer = $q.defer();
+        spyOn(NodesManager, "setActiveItem").and.returnValue(
+            setActiveDefer.promise);
+        var defer = $q.defer();
+        var controller = makeController(defer);
+
+        node.devices = [
+            {
+                fqdn: "device1.maas",
+                interfaces: []
+            },
+            {
+                fqdn: "device2.maas",
+                interfaces: [
+                    {
+                        mac_address: "00:11:22:33:44:55",
+                        links: []
+                    }
+                ]
+            },
+            {
+                fqdn: "device3.maas",
+                interfaces: [
+                    {
+                        mac_address: "00:11:22:33:44:66",
+                        links: []
+                    },
+                    {
+                        mac_address: "00:11:22:33:44:77",
+                        links: [
+                            {
+                                ip_address: "192.168.122.1"
+                            },
+                            {
+                                ip_address: "192.168.122.2"
+                            },
+                            {
+                                ip_address: "192.168.122.3"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ];
+
+        defer.resolve();
+        $rootScope.$digest();
+        setActiveDefer.resolve(node);
+        $rootScope.$digest();
+
+        expect($scope.devices).toEqual([
+            {
+                name: "device1.maas"
+            },
+            {
+                name: "device2.maas",
+                mac_address: "00:11:22:33:44:55"
+            },
+            {
+                name: "device3.maas",
+                mac_address: "00:11:22:33:44:66"
+            },
+            {
+                name: "",
+                mac_address: "00:11:22:33:44:77",
+                ip_address: "192.168.122.1"
+            },
+            {
+                name: "",
+                mac_address: "",
+                ip_address: "192.168.122.2"
+            },
+            {
+                name: "",
+                mac_address: "",
+                ip_address: "192.168.122.3"
+            }
+        ]);
+    });
+
     describe("tagsAutocomplete", function() {
 
         it("calls TagsManager.autocomplete with query", function() {

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2015-11-04 19:22:30 +0000
+++ src/maasserver/static/partials/node-details.html	2015-11-05 02:32:14 +0000
@@ -272,6 +272,31 @@
             </form>
         </div>
     </div>
+    <div class="row" data-ng-show="devices.length">
+        <div class="inner-wrapper">
+            <div class="twelve-col">
+                <h2 class="title">Containers and VMs</h2>
+            </div>
+            <div class="twelve-col">
+                <div class="table">
+                    <header class="table__head">
+                        <div class="table__row">
+                            <div class="table__header table__column--30">Name</div>
+                            <div class="table__header table__column--30">MAC</div>
+                            <div class="table__header table__column--40">IP Address</div>
+                        </div>
+                    </header>
+                    <main class="table__body" data-selected-rows>
+                        <div class="table__row" data-ng-repeat="device in devices">
+                            <div class="table__data table__column--30">{$ device.name $}</div>
+                            <div class="table__data table__column--30">{$ device.mac_address $}</div>
+                            <div class="table__data table__column--40">{$ device.ip_address $}</div>
+                        </div>
+                    </main>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="row ng-hide" data-ng-show="isSuperUser()">
         <div class="inner-wrapper">
             <form class="disabled">