Merge lp:~trapnine/maas/fix-1576267 into lp:~maas-committers/maas/trunk

[Jeffrey C Jones]

Adding new subnets now auto-updates controller details 'Served VLANs' Table.

Adding new subnets now auto-updates controller details 'Served VLANs' Table.

[Blake Rouse (blake-rouse)]

Looks good. Very well test that is really nice to see. I do have a few comments.

review: Approve

[Jeffrey C Jones (trapnine)]

review: Approve

=== modified file 'src/maasserver/static/js/angular/controllers/node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/node_details_networking.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/controllers/node_details_networking.js	2016-05-04 16:20:37 +0000
@@ -279,7 +279,8 @@
                             var vlanRecord = {
                                 "fabric": nic.fabric,
                                 "vlan": nic.vlan,
-                                "subnets": VLANsManager.getSubnets(nic.vlan),
+                                "subnets": $filter('filter')(
+                                    $scope.subnets, {vlan:nic.vlan.id}, true),
                                 "primary_rack": null,
                                 "secondary_rack": null,
                                 "sort_key": nic.fabric.name + "|" +
@@ -502,7 +503,10 @@
         // Called by $parent when the node has been loaded.
         $scope.nodeLoaded = function() {
             $scope.$watch("node.interfaces", updateInterfaces);
-            $scope.$watchCollection($scope.subnets, updateInterfaces);
+            // Watch subnets for the served VLANs section.
+            if ($scope.$parent.isController) {
+                $scope.$watch("subnets", updateInterfaces, true);
+            }
             $scope.nodeHasLoaded = true;
             updateLoaded();
         };
@@ -955,7 +959,8 @@
             // Alias used defaults based from its parent.
             if(type === INTERFACE_TYPE.ALIAS) {
                 defaultVLAN = nic.vlan;
-                defaultSubnet = VLANsManager.getSubnets(defaultVLAN)[0];
+                defaultSubnet = $filter('filter')(
+                    $scope.subnets, {vlan:defaultVLAN.id}, true)[0];
                 defaultMode = LINK_MODE.AUTO;
             }
 
@@ -996,8 +1001,9 @@
         $scope.addTypeChanged = function() {
             if($scope.newInterface.type === INTERFACE_TYPE.ALIAS) {
                 $scope.newInterface.vlan = $scope.newInterface.parent.vlan;
-                $scope.newInterface.subnet = VLANsManager.getSubnets(
-                    $scope.newInterface.vlan)[0];
+                $scope.newInterface.subnet = $filter('filter')(
+                    $scope.subnets,
+                    {vlan:$scope.newInterface.vlan.id}, true)[0];
                 $scope.newInterface.mode = LINK_MODE.AUTO;
             } else if($scope.newInterface.type === INTERFACE_TYPE.VLAN) {
                 var vlans = getUnusedVLANs($scope.newInterface.parent);

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_fabric_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_fabric_details.js	2016-04-27 03:53:55 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_fabric_details.js	2016-05-04 16:20:37 +0000
@@ -182,7 +182,6 @@
         ];
         fabric.vlan_ids = [1];
         spaces[0].subnet_ids = [0];
-        vlans[0].subnet_ids = [0];
         SpacesManager._items.push(spaces[0]);
         VLANsManager._items.push(vlans[0]);
         SubnetsManager._items.push(subnets[0]);

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2016-05-04 16:20:37 +0000
@@ -420,7 +420,29 @@
         }
 
         expect(watches).toEqual(["node.interfaces"]);
-        expect(watchCollections).toEqual([ $scope.subnets ]);
+        expect(watchCollections).toEqual([]);
+    });
+
+    it("watches interfaces and subnets once nodeLoaded called", function() {
+        var controller = makeController();
+        spyOn($scope, "$watch");
+        spyOn($scope, "$watchCollection");
+        $parentScope.isController = true;
+        $scope.nodeLoaded();
+
+        var watches = [];
+        var i, calls = $scope.$watch.calls.allArgs();
+        for(i = 0; i < calls.length; i++) {
+            watches.push(calls[i][0]);
+        }
+        var watchCollections = [];
+        calls = $scope.$watchCollection.calls.allArgs();
+        for(i = 0; i < calls.length; i++) {
+            watchCollections.push(calls[i][0]);
+        }
+
+        expect(watches).toEqual(["node.interfaces", "subnets"]);
+        expect(watchCollections).toEqual([]);
     });
 
     describe("updateInterfaces", function() {
@@ -799,7 +821,6 @@
                 vlan_id: 0
             };
             SubnetsManager._items = [];
-            spyOn(VLANsManager, "getSubnets").and.returnValue([]);
             FabricsManager._items = [fabric0];
             VLANsManager._items = [vlan0];
             node.interfaces = [nic0];
@@ -819,14 +840,13 @@
         });
 
         it("renders single entry vlanTable", function() {
-            var subnet0 = { id: 0 };
+            var subnet0 = { id: 0, vlan: 0 };
             var fabric0 = {
                 id: 0
             };
             var vlan0 = {
                 id: 0,
-                fabric: 0,
-                subnet_ids: [0]
+                fabric: 0
             };
             var nic0 = {
                 id: 0,
@@ -857,27 +877,27 @@
             ]);
         });
 
-        it("renders multi-entry vlanTable", function() {
-            var subnet0 = { id: 0 };
-            var subnet1 = { id: 1 };
-            var subnet2 = { id: 2 };
-            var fabric0 = {
+        var makeInterestingNetwork = function() {
+            var net = {};
+            net.space0 = { id: 0 };
+            net.subnet0 = { id: 0, vlan:0, cidr: "10.0.0.0/16" };
+            net.subnet1 = { id: 1, vlan:0, cidr: "10.10.0.0/16" };
+            net.subnet2 = { id: 2, vlan:1, cidr: "10.20.0.0/16" };
+            net.fabric0 = {
                 id: 0
             };
-            var fabric1 = {
+            net.fabric1 = {
                 id: 1
             };
-            var vlan0 = {
+            net.vlan0 = {
                 id: 0,
-                fabric: 0,
-                subnet_ids: [0, 1]
+                fabric: 0
             };
-            var vlan1 = {
+            net.vlan1 = {
                 id: 1,
-                fabric: 1,
-                subnet_ids: [2]
+                fabric: 1
             };
-            var nic0 = {
+            net.nic0 = {
                 id: 0,
                 name: "eth0",
                 type: "physical",
@@ -886,7 +906,7 @@
                 links: [],
                 vlan_id: 0
             };
-            var nic1 = {
+            net.nic1 = {
                 id: 1,
                 name: "eth1",
                 type: "physical",
@@ -895,30 +915,37 @@
                 links: [],
                 vlan_id: 1
             };
-            SubnetsManager._items = [subnet0, subnet1, subnet2];
-            FabricsManager._items = [fabric0, fabric1];
-            VLANsManager._items = [vlan0, vlan1];
-            node.interfaces = [nic0, nic1];
+            //SpacesManager._items = [net.space0];
+            SubnetsManager._items = [net.subnet0, net.subnet1, net.subnet2];
+            FabricsManager._items = [net.fabric0, net.fabric1];
+            VLANsManager._items = [net.vlan0, net.vlan1];
+            node.interfaces = [net.nic0, net.nic1];
+            return net;
+        };
 
+        it("renders multi-entry vlanTable", function() {
+            var net = makeInterestingNetwork();
             // Should not blank for a controller.
             $parentScope.isController = true;
             updateInterfaces();
             expect($scope.vlanTable).toEqual([
                 {
-                    fabric: fabric0,
-                    vlan: vlan0,
-                    subnets: [subnet0, subnet1],
+                    fabric: net.fabric0,
+                    vlan: net.vlan0,
+                    subnets: [net.subnet0, net.subnet1],
                     primary_rack: null,
                     secondary_rack: null,
-                    sort_key: fabric0.name + "|" + $scope.getVLANText(vlan0)
+                    sort_key: net.fabric0.name + "|" +
+                        $scope.getVLANText(net.vlan0)
                 },
                 {
-                    fabric: fabric1,
-                    vlan: vlan1,
-                    subnets: [subnet2],
+                    fabric: net.fabric1,
+                    vlan: net.vlan1,
+                    subnets: [net.subnet2],
                     primary_rack: null,
                     secondary_rack: null,
-                    sort_key: fabric0.name + "|" + $scope.getVLANText(vlan1)
+                    sort_key: net.fabric0.name + "|" +
+                        $scope.getVLANText(net.vlan1)
                 }
             ]);
         });
@@ -926,14 +953,13 @@
         it("no duplicate vlans", function() {
             // Regression for https://bugs.launchpad.net/maas/+bug/1559332.
             // Same vlan on two nics shouldn't result in two vlans in table.
-            var subnet0 = { id: 0 };
+            var subnet0 = { id: 0, vlan:0 };
             var fabric0 = {
                 id: 0
             };
             var vlan0 = {
                 id: 0,
-                fabric: 0,
-                subnet_ids: [0, 1]
+                fabric: 0
             };
             var nic0 = {
                 id: 0,
@@ -973,6 +999,117 @@
             ]);
         });
 
+        // Regression for https://bugs.launchpad.net/maas/+bug/1576267.
+        it("updates vlanTable when add subnet", function() {
+            var net = makeInterestingNetwork();
+
+            // Should not blank for a controller.
+            $parentScope.isController = true;
+            updateInterfaces();
+            expect($scope.vlanTable).toEqual([
+                {
+                    fabric: net.fabric0,
+                    vlan: net.vlan0,
+                    subnets: [net.subnet0, net.subnet1],
+                    primary_rack: null,
+                    secondary_rack: null,
+                    sort_key: net.fabric0.name + "|" +
+                        $scope.getVLANText(net.vlan0)
+                },
+                {
+                    fabric: net.fabric1,
+                    vlan: net.vlan1,
+                    subnets: [net.subnet2],
+                    primary_rack: null,
+                    secondary_rack: null,
+                    sort_key: net.fabric0.name + "|" +
+                        $scope.getVLANText(net.vlan1)
+                }
+            ]);
+
+            // Add subnet and make sure it shows up in vlanTable.
+            var subnet = {
+                id: 3, name:"subnet3", vlan: 0, space: 0, cidr: "10.30.0.0/16"
+            };
+            SubnetsManager._items.push(subnet);
+            $scope.$digest();
+            expect($scope.vlanTable).toEqual([
+                {
+                    fabric: net.fabric0,
+                    vlan: net.vlan0,
+                    subnets: [net.subnet0, net.subnet1, subnet],
+                    primary_rack: null,
+                    secondary_rack: null,
+                    sort_key: net.fabric0.name + "|" +
+                        $scope.getVLANText(net.vlan0)
+                },
+                {
+                    fabric: net.fabric1,
+                    vlan: net.vlan1,
+                    subnets: [net.subnet2],
+                    primary_rack: null,
+                    secondary_rack: null,
+                    sort_key: net.fabric0.name + "|" +
+                        $scope.getVLANText(net.vlan1)
+                }
+            ]);
+        });
+
+        // Regression for https://bugs.launchpad.net/maas/+bug/1576267.
+        it("updates empty vlanTable when add subnet", function() {
+            var fabric0 = {
+                id: 0,
+                name: 'fabric0'
+            };
+            var vlan0 = {
+                id: 0,
+                fabric: 0,
+                name: 'vlan0'
+            };
+            var nic0 = {
+                id: 0,
+                name: "eth0",
+                type: "physical",
+                parents: [],
+                children: [],
+                links: [],
+                vlan_id: 0
+            };
+            SubnetsManager._items = [];
+            FabricsManager._items = [fabric0];
+            VLANsManager._items = [vlan0];
+            node.interfaces = [nic0];
+
+            $parentScope.isController = true;
+            updateInterfaces();
+            expect($scope.vlanTable).toEqual([
+                {
+                    fabric: fabric0,
+                    vlan: vlan0,
+                    subnets: [],
+                    primary_rack: null,
+                    secondary_rack: null,
+                    sort_key: fabric0.name + "|" + $scope.getVLANText(vlan0)
+                }
+            ]);
+            // Add subnet and make sure it shows up in vlanTable.
+            var subnet = {
+                id: 3, name:"subnet3", vlan: 0, space: 0, cidr: "10.30.0.0/16"
+            };
+            SubnetsManager._items.push(subnet);
+            $scope.$digest();
+            expect($scope.vlanTable).toEqual([
+                {
+                    fabric: fabric0,
+                    vlan: vlan0,
+                    subnets: [subnet],
+                    primary_rack: null,
+                    secondary_rack: null,
+                    sort_key: fabric0.name + "|" + $scope.getVLANText(vlan0)
+                }
+            ]);
+        });
+
         it("creates interfaceLinksMap", function() {
             var links = [
                 {
@@ -2679,7 +2816,9 @@
 
         it("sets up newInterface for alias", function() {
             var controller = makeController();
-            var vlan = {};
+            var vlan = {id:0};
+            var subnet = {id:0, vlan:0};
+            $scope.subnets = [subnet];
             var nic = {
                 id: makeInteger(0, 100),
                 type: "physical",
@@ -2687,9 +2826,6 @@
                 vlan: vlan
             };
 
-            var subnet = {};
-            spyOn(VLANsManager, "getSubnets").and.returnValue([subnet]);
-
             $scope.add('alias', nic);
             expect($scope.newInterface).toEqual({
                 type: "alias",
@@ -2847,15 +2983,15 @@
 
         it("reset properties based on the new type alias", function() {
             var controller = makeController();
-            var vlan = {};
-            var subnet = {};
+            var vlan = {id:0};
+            var subnet = {id:0, vlan:0};
+            $scope.subnets = [subnet];
             var parent = {
                 id: makeInteger(0, 100),
                 name: name,
                 link_id: makeInteger(0, 100),
                 vlan: vlan
             };
-            spyOn(VLANsManager, "getSubnets").and.returnValue([subnet]);
             $scope.newInterface = {
                 type: "alias",
                 parent: parent

=== modified file 'src/maasserver/static/js/angular/factories/tests/test_vlans.js'
--- src/maasserver/static/js/angular/factories/tests/test_vlans.js	2016-04-22 17:28:15 +0000
+++ src/maasserver/static/js/angular/factories/tests/test_vlans.js	2016-05-04 16:20:37 +0000
@@ -31,31 +31,6 @@
         expect(VLANsManager._handler).toBe("vlan");
     });
 
-    describe("getSubnets", function() {
-
-        it("returns subnet objects", function() {
-            var i, subnets = [], vlan_subnets = [];
-            for(i = 0; i < 6; i++) {
-                var subnet = makeSubnet();
-                subnets.push(subnet);
-                if(i < 3) {
-                    vlan_subnets.push(subnet);
-                }
-            }
-
-            var subnet_ids = [];
-            angular.forEach(vlan_subnets, function(subnet) {
-                subnet_ids.push(subnet.id);
-            });
-
-            SubnetsManager._items = subnets;
-            var vlan = {
-                "subnet_ids": subnet_ids
-            };
-            expect(vlan_subnets).toEqual(VLANsManager.getSubnets(vlan));
-        });
-    });
-
     describe("configureDHCP", function() {
 
         it("calls the region with expected parameters", function() {

=== modified file 'src/maasserver/static/js/angular/factories/vlans.js'
--- src/maasserver/static/js/angular/factories/vlans.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/factories/vlans.js	2016-05-04 16:20:37 +0000
@@ -29,20 +29,6 @@
 
         VLANsManager.prototype = new Manager();
 
-        // Return the Subnet objects that are part of this VLAN. The returned
-        // array is calculated on each call, you should not watch this array,
-        // instead you should watch this function.
-        VLANsManager.prototype.getSubnets = function(vlan) {
-            var subnets = [];
-            angular.forEach(vlan.subnet_ids, function(subnet_id) {
-                var subnet = SubnetsManager.getItemFromList(subnet_id);
-                if(angular.isObject(subnet)) {
-                    subnets.push(subnet);
-                }
-            });
-            return subnets;
-        };
-
         VLANsManager.prototype.getName = function(vlan) {
             var name = vlan.vid;
             if(vlan.vid === 0) {

=== modified file 'src/maasserver/websockets/handlers/tests/test_vlan.py'
--- src/maasserver/websockets/handlers/tests/test_vlan.py	2016-04-28 13:34:34 +0000
+++ src/maasserver/websockets/handlers/tests/test_vlan.py	2016-05-04 16:20:37 +0000
@@ -36,10 +36,6 @@
             "external_dhcp": vlan.external_dhcp,
             "primary_rack": vlan.primary_rack,
             "secondary_rack": vlan.secondary_rack,
-            "subnet_ids": sorted([
-                subnet.id
-                for subnet in vlan.subnet_set.all()
-            ]),
         }
         data['rack_sids'] = sorted(list({
             interface.node.system_id

=== modified file 'src/maasserver/websockets/handlers/vlan.py'
--- src/maasserver/websockets/handlers/vlan.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/websockets/handlers/vlan.py	2016-05-04 16:20:37 +0000
@@ -58,10 +58,6 @@
             data["primary_rack_sid"] = obj.primary_rack.system_id
         if obj.secondary_rack is not None:
             data["secondary_rack_sid"] = obj.secondary_rack.system_id
-        data["subnet_ids"] = sorted([
-            subnet.id
-            for subnet in obj.subnet_set.all()
-        ])
         nodes = {
             interface.node
             for interface in obj.interface_set.all()