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

[Jeffrey C Jones]

Add delete button to subnet details page.

Add delete button to subnet details page.

Also added missing 'delete' testing in space and vlan factories/handlers (drive-by).

[Blake Rouse (blake-rouse)]

Looks good. Not going to block you on anything, but please fix the issues before landing.

review: Approve

=== modified file 'src/maasserver/static/js/angular/controllers/add_device.js'
--- src/maasserver/static/js/angular/controllers/add_device.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/controllers/add_device.js	2016-04-20 05:12:39 +0000
@@ -238,7 +238,7 @@
         };
 
         // Convert the Python dict error message to displayed message.
-        $scope.convertPythonDictToErrorMsg = function(pythonError) {
+        $scope.devicePythonDictToErrorMsg = function(pythonError) {
             var elements = pythonError.match(/'([A-Za-z0-9 \.:_\-]+)'/g);
             var result = '', msg = '';
             for (k=0; k < elements.length; ++k) {
@@ -282,7 +282,7 @@
                     $scope.hide();
                 }
             }, function(error) {
-                $scope.error = $scope.convertPythonDictToErrorMsg(error);
+                $scope.error = $scope.devicePythonDictToErrorMsg(error);
             });
         };
 

=== modified file 'src/maasserver/static/js/angular/controllers/domain_details.js'
--- src/maasserver/static/js/angular/controllers/domain_details.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/controllers/domain_details.js	2016-04-20 05:12:39 +0000
@@ -66,29 +66,10 @@
             $scope.confirmingDelete = false;
         };
 
-        // Convert the Python dict error message to displayed message.
-        // We know it's probably a form ValidationError dictionary, so just use
-        // it as such, and recover if that doesn't parse as JSON.
-        $scope.convertPythonDictToErrorMsg = function(pythonError) {
-            var dictionary;
-            try {
-                dictionary = JSON.parse(pythonError);
-            } catch(e) {
-                if (e instanceof SyntaxError) {
-                    return pythonError;
-                } else {
-                    throw e;
-                }
-            }
-            var result = '', msg = '';
-            var key;
-            angular.forEach(dictionary, function(value, key) {
-                result += key + ":  ";
-                angular.forEach(dictionary[key], function(value) {
-                        result += value + "  ";
-                });
-            });
-            return result;
+        // Called when an error message from the Python world needs to be
+        // rendered in the UI.
+        $scope.convertPythonDictToErrorMsg = function(error) {
+            return ManagerHelperService.parseLikelyValidationError(error);
         };
 
         // Called when the confirm delete domain button is pressed.

=== modified file 'src/maasserver/static/js/angular/controllers/fabric_details.js'
--- src/maasserver/static/js/angular/controllers/fabric_details.js	2016-03-25 13:52:27 +0000
+++ src/maasserver/static/js/angular/controllers/fabric_details.js	2016-04-20 05:12:39 +0000
@@ -118,29 +118,10 @@
             $scope.confirmingDelete = false;
         };
 
-        // Convert the Python dict error message to displayed message.
-        // We know it's probably a form ValidationError dictionary, so just use
-        // it as such, and recover if that doesn't parse as JSON.
-        $scope.convertPythonDictToErrorMsg = function(pythonError) {
-            var dictionary;
-            try {
-                dictionary = JSON.parse(pythonError);
-            } catch(e) {
-                if(e instanceof SyntaxError) {
-                    return pythonError;
-                } else {
-                    throw e;
-                }
-            }
-            var result = '', msg = '';
-            var key;
-            angular.forEach(dictionary, function(value, key) {
-                result += key + ":  ";
-                angular.forEach(dictionary[key], function(value) {
-                        result += value + "  ";
-                });
-            });
-            return result;
+        // Called when an error message from the Python world needs to be
+        // rendered in the UI.
+        $scope.convertPythonDictToErrorMsg = function(error) {
+            return ManagerHelperService.parseLikelyValidationError(error);
         };
 
         // Called when the confirm delete fabric button is pressed.

=== modified file 'src/maasserver/static/js/angular/controllers/space_details.js'
--- src/maasserver/static/js/angular/controllers/space_details.js	2016-03-25 13:52:27 +0000
+++ src/maasserver/static/js/angular/controllers/space_details.js	2016-04-20 05:12:39 +0000
@@ -95,29 +95,10 @@
             $scope.confirmingDelete = false;
         };
 
-        // Convert the Python dict error message to displayed message.
-        // We know it's probably a form ValidationError dictionary, so just use
-        // it as such, and recover if that doesn't parse as JSON.
-        $scope.convertPythonDictToErrorMsg = function(pythonError) {
-            var dictionary;
-            try {
-                dictionary = JSON.parse(pythonError);
-            } catch(e) {
-                if(e instanceof SyntaxError) {
-                    return pythonError;
-                } else {
-                    throw e;
-                }
-            }
-            var result = '', msg = '';
-            var key;
-            angular.forEach(dictionary, function(value, key) {
-                result += key + ":  ";
-                angular.forEach(dictionary[key], function(value) {
-                        result += value + "  ";
-                });
-            });
-            return result;
+        // Called when an error message from the Python world needs to be
+        // rendered in the UI.
+        $scope.convertPythonDictToErrorMsg = function(error) {
+            return ManagerHelperService.parseLikelyValidationError(error);
         };
 
         // Called when the confirm delete space button is pressed.

=== modified file 'src/maasserver/static/js/angular/controllers/subnet_details.js'
--- src/maasserver/static/js/angular/controllers/subnet_details.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/controllers/subnet_details.js	2016-04-20 05:12:39 +0000
@@ -7,11 +7,11 @@
 angular.module('MAAS').controller('SubnetDetailsController', [
     '$scope', '$rootScope', '$routeParams', '$filter', '$location',
     'SubnetsManager', 'IPRangesManager', 'SpacesManager', 'VLANsManager',
-    'FabricsManager', 'ManagerHelperService', 'ErrorService',
+    'UsersManager', 'FabricsManager', 'ManagerHelperService', 'ErrorService',
     function(
         $scope, $rootScope, $routeParams, $filter, $location, SubnetsManager,
-        IPRangesManager, SpacesManager, VLANsManager, FabricsManager,
-        ManagerHelperService, ErrorService) {
+        IPRangesManager, SpacesManager, VLANsManager, UsersManager,
+        FabricsManager, ManagerHelperService, ErrorService) {
 
         // Set title and page.
         $rootScope.title = "Loading...";
@@ -63,6 +63,38 @@
             return FabricsManager.getItemFromList(fabric_id).name;
         };
 
+        // Return true if the authenticated user is super user.
+        $scope.isSuperUser = function() {
+            return UsersManager.isSuperUser();
+        };
+
+        // Called when the delete subnet button is pressed.
+        $scope.deleteButton = function() {
+            $scope.error = null;
+            $scope.confirmingDelete = true;
+        };
+
+        // Called when the cancel delete subnet button is pressed.
+        $scope.cancelDeleteButton = function() {
+            $scope.confirmingDelete = false;
+        };
+
+        // Called when an error message from the Python world needs to be
+        // rendered in the UI.
+        $scope.convertPythonDictToErrorMsg = function(error) {
+            return ManagerHelperService.parseLikelyValidationError(error);
+        };
+
+        // Called when the confirm delete subnet button is pressed.
+        $scope.deleteConfirmButton = function() {
+            SubnetsManager.deleteSubnet($scope.subnet).then(function() {
+                $scope.confirmingDelete = false;
+                $location.path("/networks");
+            }, function(error) {
+                $scope.error = $scope.convertPythonDictToErrorMsg(error);
+            });
+        };
+
         // Called when the subnet has been loaded.
         function subnetLoaded(subnet) {
             $scope.subnet = subnet;
@@ -78,7 +110,7 @@
         // Load all the required managers.
         ManagerHelperService.loadManagers([
             SubnetsManager, IPRangesManager, SpacesManager, VLANsManager,
-            FabricsManager
+            UsersManager, FabricsManager
         ]).then(function() {
             // Possibly redirected from another controller that already had
             // this subnet set to active. Only call setActiveItem if not

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_add_device.js'
--- src/maasserver/static/js/angular/controllers/tests/test_add_device.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_add_device.js	2016-04-20 05:12:39 +0000
@@ -763,14 +763,14 @@
             });
     });
 
-    describe("convertPythonDictToErrorMsg", function() {
+    describe("devicePythonDictToErrorMsg", function() {
         it("converts hostname error for display",
             function() {
                 var controller = makeController();
                 var errorMsg = makeName("error");
                 var error = "{'hostname': ['Node " + errorMsg + "']}";
                 var expected = "Device " + errorMsg + "  ";
-                expect($scope.convertPythonDictToErrorMsg(
+                expect($scope.devicePythonDictToErrorMsg(
                         error)).toBe(expected);
         });
 
@@ -780,7 +780,7 @@
                     var errorMsg = makeName("error");
                     var error = "{'mac_addresses': ['" + errorMsg + "']}";
                     var expected = errorMsg + "  ";
-                    expect($scope.convertPythonDictToErrorMsg(
+                    expect($scope.devicePythonDictToErrorMsg(
                             error)).toBe(expected);
         });
 
@@ -792,7 +792,7 @@
                     var error = "{'" + errorSegment1 +
                         "': ['" + errorSegment2 + "']}";
                     var expected = errorSegment1 + errorSegment2;
-                    expect($scope.convertPythonDictToErrorMsg(
+                    expect($scope.devicePythonDictToErrorMsg(
                             error)).toBe(expected);
         });
     });

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_add_domain.js'
--- src/maasserver/static/js/angular/controllers/tests/test_add_domain.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_add_domain.js	2016-04-20 05:12:39 +0000
@@ -270,39 +270,4 @@
                 expect($scope.error).toBe(errorMsg);
             });
     });
-
-    describe("convertPythonDictToErrorMsg", function() {
-        it("converts name error for display",
-            function() {
-                var controller = makeController();
-                var errorMsg = makeName("error");
-                var error = '{"name": ["' + errorMsg + '"]}';
-                var expected = errorMsg;
-                expect($scope.convertPythonDictToErrorMsg(
-                        error)).toBe(expected);
-        });
-
-        it("concatenates array elements",
-                function() {
-                    var controller = makeController();
-                    var errorSegment1 = makeName("key");
-                    var errorSegment2 = makeName("error");
-                    var errorSegment3 = makeName("error");
-                    var error = '{"' + errorSegment1 +
-                        '": ["' + errorSegment2 + '", "' +
-                        errorSegment3 + '"]}';
-                    var expected = errorSegment2 + "  " + errorSegment3;
-                    expect($scope.convertPythonDictToErrorMsg(
-                            error)).toBe(expected);
-        });
-
-        it("converts non-dictionary correctly",
-                function() {
-                    var controller = makeController();
-                    var errorSegment1 = makeName("error");
-                    var expected = errorSegment1;
-                    expect($scope.convertPythonDictToErrorMsg(
-                            errorSegment1)).toBe(expected);
-        });
-    });
 });

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js	2016-04-20 05:12:39 +0000
@@ -221,4 +221,43 @@
         expect($scope.subnet.dns_servers).toEqual(["127.0.0.1", "127.0.0.2"]);
         expect($scope.all_dns_servers).toBe("127.0.0.1 127.0.0.2");
     });
+
+    describe("deleteButton", function() {
+
+        it("confirms delete", function() {
+            var controller = makeControllerResolveSetActiveItem();
+            $scope.deleteButton();
+            expect($scope.confirmingDelete).toBe(true);
+        });
+
+        it("clears error", function() {
+            var controller = makeControllerResolveSetActiveItem();
+            $scope.error = makeName("error");
+            $scope.deleteButton();
+            expect($scope.error).toBeNull();
+        });
+    });
+
+    describe("cancelDeleteButton", function() {
+
+        it("cancels delete", function() {
+            var controller = makeControllerResolveSetActiveItem();
+            $scope.deleteButton();
+            $scope.cancelDeleteButton();
+            expect($scope.confirmingDelete).toBe(false);
+        });
+    });
+
+    describe("deleteSubnet", function() {
+
+        it("calls deleteSubnet", function() {
+            var controller = makeController();
+            var deleteSubnet = spyOn(SubnetsManager, "deleteSubnet");
+            var defer = $q.defer();
+            deleteSubnet.and.returnValue(defer.promise);
+            $scope.deleteConfirmButton();
+            expect(deleteSubnet).toHaveBeenCalled();
+        });
+    });
+
 });

=== modified file 'src/maasserver/static/js/angular/factories/subnets.js'
--- src/maasserver/static/js/angular/factories/subnets.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/factories/subnets.js	2016-04-20 05:12:39 +0000
@@ -75,5 +75,10 @@
             return RegionConnection.callMethod("subnet.create", subnet);
         };
 
+        // Delete the subnet.
+        SubnetsManager.prototype.deleteSubnet = function(subnet) {
+            return RegionConnection.callMethod("subnet.delete", subnet);
+        };
+
         return new SubnetsManager();
     }]);

=== modified file 'src/maasserver/static/js/angular/factories/tests/test_spaces.js'
--- src/maasserver/static/js/angular/factories/tests/test_spaces.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/factories/tests/test_spaces.js	2016-04-20 05:12:39 +0000
@@ -68,4 +68,17 @@
             );
         });
     });
+
+    describe("delete", function() {
+
+        it("calls the region with expected parameters", function() {
+            var obj = {};
+            var result = {};
+            spyOn(RegionConnection, "callMethod").and.returnValue(result);
+            expect(SpacesManager.deleteSpace(obj)).toBe(result);
+            expect(RegionConnection.callMethod).toHaveBeenCalledWith(
+                "space.delete", obj
+            );
+        });
+    });
 });

=== modified file 'src/maasserver/static/js/angular/factories/tests/test_subnets.js'
--- src/maasserver/static/js/angular/factories/tests/test_subnets.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/factories/tests/test_subnets.js	2016-04-20 05:12:39 +0000
@@ -73,4 +73,17 @@
             );
         });
     });
+
+    describe("delete", function() {
+
+        it("calls the region with expected parameters", function() {
+            var obj = {};
+            var result = {};
+            spyOn(RegionConnection, "callMethod").and.returnValue(result);
+            expect(SubnetsManager.deleteSubnet(obj)).toBe(result);
+            expect(RegionConnection.callMethod).toHaveBeenCalledWith(
+                "subnet.delete", obj
+            );
+        });
+    });
 });

=== modified file 'src/maasserver/static/js/angular/factories/tests/test_vlans.js'
--- src/maasserver/static/js/angular/factories/tests/test_vlans.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/factories/tests/test_vlans.js	2016-04-20 05:12:39 +0000
@@ -102,4 +102,17 @@
             );
         });
     });
+
+    describe("delete", function() {
+
+        it("calls the region with expected parameters", function() {
+            var obj = { id: "whatever" };
+            var result = {};
+            spyOn(RegionConnection, "callMethod").and.returnValue(result);
+            expect(VLANsManager.deleteVLAN(obj)).toBe(result);
+            expect(RegionConnection.callMethod).toHaveBeenCalledWith(
+                "vlan.delete", obj, true
+            );
+        });
+    });
 });

=== modified file 'src/maasserver/static/partials/subnet-details.html'
--- src/maasserver/static/partials/subnet-details.html	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/partials/subnet-details.html	2016-04-20 05:12:39 +0000
@@ -1,83 +1,42 @@
-<div data-ng-hide="loaded">
-    <header class="page-header">
-        <div class="inner-wrapper">
-            <h1 class="page-header__title twelve-col">Loading...</h1>
-        </div>
-    </header>
-</div>
+<header class="page-header margin-bottom" data-maas-sticky-header>
+    <div class="inner-wrapper">
+        <h1 class="page-header__title eight-col">{$ subnet.cidr $}</h1>
+        <div data-ng-hide="loaded">
+            <div class="inner-wrapper">
+                <h1 class="page-header__title twelve-col">Loading...</h1>
+            </div>
+        </div>
+        <div class="page-header__actions ng-hide" data-ng-show="isSuperUser() && !isDefaultSubnet() && !loading">
+            <div class="right no-margin-bottom last-col">
+                <button class="cta-ubuntu"
+                    data-ng-click="deleteButton()"
+                    data-ng-hide="confirmingDelete">Delete Subnet</button>
+            </div>
+        </div>
+        <div class="page-header__dropdown ng-hide" data-ng-show="confirmingDelete">
+            <div class="page-header__feedback ng-hide" data-ng-show="!error">
+                <p class="page-header__feedback-message error">
+                    Are you sure you want to delete this subnet and release all
+                    IP addresses assigned within its range?
+                </p>
+                <div class="right">
+                    <a href="" class="margin-right" data-ng-click="cancelDeleteButton()">Cancel</a>
+                    <button class="cta-ubuntu" data-ng-click="deleteConfirmButton()">Go</button>
+                </div>
+            </div>
+            <div class="page-header__feedback ng-hide" data-ng-show="error">
+                <p class="page-header__feedback-message error">
+                    {$ error $}
+                </p>
+                <div class="right">
+                    <a href="" class="margin-right" data-ng-click="cancelDeleteButton()">Cancel</a>
+                    <button class="cta-ubuntu" data-ng-click="deleteConfirmButton()">Retry</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</header>
 <div data-ng-if="loaded">
-    <header class="page-header margin-bottom" data-maas-sticky-header>
-        <div class="inner-wrapper">
-            <h1 class="page-header__title eight-col">{$ subnet.cidr $}</h1>
-            <div class="page-header__actions">
-                <div class="page-header__cta">
-                    <div class="right cta-group ng-hide">
-                        <a class="cta-group__link ng-binding" data-ng-click="shown=!shown">Take action</a>
-                        <ul class="cta-group__dropdown" role="menu" data-ng-show="shown">
-                            <!-- <li class="cta-group__item ng-scope">
-                                <a>Fabric</a>
-                            </li>
-                            <li class="cta-group__item ng-scope">
-                                <a>VLAN</a>
-                            </li>
-                            <li class="cta-group__item ng-scope">
-                                <a>Space</a>
-                            </li>
-                            <li class="cta-group__item ng-scope">
-                                <a>Subnet</a>
-                            </li> -->
-                        </ul>
-                    </div>
-                </div>
-                <div class="page-header__cta ng-hide">
-                    <span class="page-header__cta-feedback">
-                        2 Selected
-                    </span>
-                    <div class="right cta-group">
-                        <a class="cta-group__link ng-binding" data-ng-click="shown=!shown">Take action</a>
-                        <ul class="cta-group__dropdown ng-hide" role="menu" data-ng-show="shown">
-                            <li class="cta-group__item ng-scope">
-                                <a>Move subnet</a>
-                            </li>
-                            <li class="cta-group__item ng-scope">
-                                <a>Remove subnet</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="page-header__dropdown border ng-hide">
-                <form class="form-inline tweleve-col padding-top--ten padding-bottom--ten">
-                    <div class="form__group">
-                        <label for="move-subnet">Move this subnet to</label>
-                        <select name="move-subnet" id="move-subnet">
-                            <option value="1">Space 1</option>
-                            <option value="2">Space 2</option>
-                            <option value="3">Space 3</option>
-                        </select>
-                        <div class="right">
-                            <button class="cta-ubuntu text-button">Cancel</button>
-                            <button class="cta-ubuntu">Move subnet</button>
-                        </div>
-                    </div>
-                </form>
-                <div class="page-header__feedback">
-                    <p class="page-header__feedback-message warning">Are you sure you want to remove this subnet release all IP addresses assigned within its range?</p>
-                    <div class="right">
-                        <button class="cta-ubuntu text-button">Cancel</button>
-                        <button class="cta-ubuntu">Remove subnet</button>
-                    </div>
-                </div>
-                <div class="page-header__feedback">
-                    <p class="page-header__feedback-message warning">Are you sure you want to remove this subnet?</p>
-                    <div class="right">
-                        <button class="cta-ubuntu text-button">Cancel</button>
-                        <button class="cta-ubuntu">Remove subnet</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </header>
     <section class="row">
         <div class="inner-wrapper">
             <div class="tweleve-col">
@@ -290,11 +249,6 @@
                         -->
                     </main>
                 </div>
-                <!-- XXX mpontillo re-enable buttons when adding edit mode -->
-                <div class="tweleve-col padding-bottom ng-hide">
-                    <a class="link-cta-ubuntu secondary margin-right">Reserve range</a>
-                    <a class="link-cta-ubuntu secondary">Reserve dynamic range</a>
-                </div>
             </div>
             <div class="tweleve-col">
                 <div class="six-col">

=== modified file 'src/maasserver/websockets/handlers/subnet.py'
--- src/maasserver/websockets/handlers/subnet.py	2016-04-14 15:25:36 +0000
+++ src/maasserver/websockets/handlers/subnet.py	2016-04-20 05:12:39 +0000
@@ -7,6 +7,7 @@
     "SubnetHandler",
     ]
 
+from maasserver.enum import NODE_PERMISSION
 from maasserver.models.subnet import Subnet
 from maasserver.websockets.handlers.timestampedmodel import (
     TimestampedModelHandler,
@@ -28,6 +29,7 @@
         pk = 'id'
         allowed_methods = [
             'create',
+            'delete',
             'get',
             'list',
             'set_active'
@@ -46,3 +48,10 @@
             data["ip_addresses"] = subnet.render_json_for_related_ips(
                 with_username=True, with_node_summary=True)
         return data
+
+    def delete(self, parameters):
+        """Delete this Subnet."""
+        subnet = self.get_object(parameters)
+        assert self.user.has_perm(
+            NODE_PERMISSION.ADMIN, subnet), "Permission denied."
+        subnet.delete()

=== modified file 'src/maasserver/websockets/handlers/tests/test_space.py'
--- src/maasserver/websockets/handlers/tests/test_space.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/websockets/handlers/tests/test_space.py	2016-04-20 05:12:39 +0000
@@ -8,8 +8,11 @@
 from maasserver.models.space import Space
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
+from maasserver.utils.orm import reload_object
 from maasserver.websockets.handlers.space import SpaceHandler
 from maasserver.websockets.handlers.timestampedmodel import dehydrate_datetime
+from testtools import ExpectedException
+from testtools.matchers import Equals
 
 
 class TestSpaceHandler(MAASServerTestCase):
@@ -51,3 +54,36 @@
         self.assertItemsEqual(
             expected_spaces,
             handler.list({}))
+
+
+class TestSpaceHandlerDelete(MAASServerTestCase):
+
+    def test__delete_as_admin_success(self):
+        user = factory.make_admin()
+        handler = SpaceHandler(user, {})
+        space = factory.make_Space()
+        handler.delete({
+            "id": space.id,
+        })
+        space = reload_object(space)
+        self.assertThat(space, Equals(None))
+
+    def test__delete_as_non_admin_asserts(self):
+        user = factory.make_User()
+        handler = SpaceHandler(user, {})
+        space = factory.make_Space()
+        with ExpectedException(AssertionError, "Permission denied."):
+            handler.delete({
+                "id": space.id,
+            })
+
+    def test__reloads_user(self):
+        user = factory.make_admin()
+        handler = SpaceHandler(user, {})
+        space = factory.make_Space()
+        user.is_superuser = False
+        user.save()
+        with ExpectedException(AssertionError, "Permission denied."):
+            handler.delete({
+                "id": space.id,
+            })

=== modified file 'src/maasserver/websockets/handlers/tests/test_subnet.py'
--- src/maasserver/websockets/handlers/tests/test_subnet.py	2016-04-14 15:25:36 +0000
+++ src/maasserver/websockets/handlers/tests/test_subnet.py	2016-04-20 05:12:39 +0000
@@ -8,10 +8,12 @@
 from maasserver.models.subnet import Subnet
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
+from maasserver.utils.orm import reload_object
 from maasserver.websockets.handlers.subnet import SubnetHandler
 from maasserver.websockets.handlers.timestampedmodel import dehydrate_datetime
 from netaddr import IPNetwork
 from provisioningserver.utils.network import IPRangeStatistics
+from testtools import ExpectedException
 from testtools.matchers import Equals
 
 
@@ -60,3 +62,36 @@
         self.assertItemsEqual(
             expected_subnets,
             handler.list({}))
+
+
+class TestSubnetHandlerDelete(MAASServerTestCase):
+
+    def test__delete_as_admin_success(self):
+        user = factory.make_admin()
+        handler = SubnetHandler(user, {})
+        subnet = factory.make_Subnet()
+        handler.delete({
+            "id": subnet.id,
+        })
+        subnet = reload_object(subnet)
+        self.assertThat(subnet, Equals(None))
+
+    def test__delete_as_non_admin_asserts(self):
+        user = factory.make_User()
+        handler = SubnetHandler(user, {})
+        subnet = factory.make_Subnet()
+        with ExpectedException(AssertionError, "Permission denied."):
+            handler.delete({
+                "id": subnet.id,
+            })
+
+    def test__reloads_user(self):
+        user = factory.make_admin()
+        handler = SubnetHandler(user, {})
+        subnet = factory.make_Subnet()
+        user.is_superuser = False
+        user.save()
+        with ExpectedException(AssertionError, "Permission denied."):
+            handler.delete({
+                "id": subnet.id,
+            })