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

[Blake Rouse]

Add the ability to add multiple interfaces when creating a device. Update the implementation to match design.

This is a large change since it completely changed the implementation of how the AddDeviceController was created. The websocket handler code also needed to be updated to support the new logic.

Design wanted the static range to be in the placeholder text of the input when doing the static ip assignment. This logic required a directive that is very small, so it is included in this branch.

[Blake Rouse (blake-rouse)]

I know this is a large change, sorry about that. Its large because it completely changes how the create operation works and all the logic in the AddDeviceController.

If I was to split this up it would break the ability to create devices until all branches have been landed in trunk. Since this is very late in the cycle I decided not to do this.

[Blake Rouse (blake-rouse)]

I have QA'd this as well from packaging to make sure that devices with multiple interfaces are created as expected.

[Raphaël Badin (rvb)]

Looks okay. Some of it clearly is potato programming but I guess we will have to land this and refactor the backend side (the part that allocates IP addresses) when we get a chance.

AFAIK commit_within_atomic_block is deprecated but you're changing code that was already using it so…

review: Approve

[Blake Rouse (blake-rouse)]

Thanks for the review.

Yeah I agree I hate the backend side of this code. Yes commit_within_atomic_block is deprecated, but thats another issue in itself. The errors are still handled correctly, with deletion of the ip addresses and device.

=== modified file 'src/maasserver/context_processors.py'
--- src/maasserver/context_processors.py	2015-05-13 11:33:20 +0000
+++ src/maasserver/context_processors.py	2015-05-27 00:50:29 +0000
@@ -64,6 +64,7 @@
             'js/angular/directives/dbl_click_overlay.js',
             'js/angular/directives/contenteditable.js',
             'js/angular/directives/sticky_header.js',
+            'js/angular/directives/placeholder.js',
             'js/angular/filters/nodes.js',
             'js/angular/controllers/error.js',
             'js/angular/controllers/nodes_list.js',

=== modified file 'src/maasserver/static/js/angular/controllers/add_device.js'
--- src/maasserver/static/js/angular/controllers/add_device.js	2015-05-13 21:10:11 +0000
+++ src/maasserver/static/js/angular/controllers/add_device.js	2015-05-27 00:50:29 +0000
@@ -35,10 +35,9 @@
             }
         ];
 
-        // Makes a new device.
-        function makeDevice() {
+        // Makes a new interface.
+        function makeInterface() {
             return {
-                name: "",
                 mac: "",
                 ipAssignment: null,
                 clusterInterfaceId: null,
@@ -46,6 +45,14 @@
             };
         }
 
+        // Makes a new device.
+        function makeDevice() {
+            return {
+                name: "",
+                interfaces: [makeInterface()]
+            };
+        }
+
         // Initial device.
         $scope.device = makeDevice();
 
@@ -53,13 +60,25 @@
         // how it is handled over the websocket.
         function convertDeviceToProtocol(device) {
             // Return the new object.
-            return {
+            var convertedDevice = {
                 hostname: device.name,
-                primary_mac: device.mac,
-                ip_assignment: device.ipAssignment.name,
-                ip_address: device.ipAddress,
-                "interface": device.clusterInterfaceId
+                primary_mac: device.interfaces[0].mac,
+                extra_macs: [],
+                interfaces: []
             };
+            var i;
+            for(i = 1; i < device.interfaces.length; i++) {
+                convertedDevice.extra_macs.push(device.interfaces[i].mac);
+            }
+            angular.forEach(device.interfaces, function(nic) {
+                convertedDevice.interfaces.push({
+                    mac: nic.mac,
+                    ip_assignment: nic.ipAssignment.name,
+                    ip_address: nic.ipAddress,
+                    "interface": nic.clusterInterfaceId
+                });
+            });
+            return convertedDevice;
         }
 
         // Gets the cluster interface by id from the managed cluster
@@ -106,9 +125,16 @@
         };
 
         // Return text to show an interfaces static range.
-        $scope.getInterfaceStaticRange = function(nic) {
-            return nic.network + " (" +
-                nic.static_range.low + " - " + nic.static_range.high + ")";
+        $scope.getInterfaceStaticRange = function(cInterfaceId) {
+            if(!angular.isNumber(cInterfaceId)) {
+                return "";
+            }
+            var clusterInterface = getInterfaceById(cInterfaceId);
+            if(!angular.isObject(clusterInterface)) {
+                return "";
+            }
+            return clusterInterface.static_range.low + " - " +
+                clusterInterface.static_range.high + " (Optional)";
         };
 
         // Returns true if the name is in error.
@@ -121,47 +147,60 @@
         };
 
         // Returns true if the MAC is in error.
-        $scope.macHasError = function() {
+        $scope.macHasError = function(deviceInterface) {
             // If the MAC is empty don't show error.
-            if($scope.device.mac.length === 0) {
+            if(deviceInterface.mac.length === 0) {
                 return false;
             }
-            return !ValidationService.validateMAC($scope.device.mac);
+            // If the MAC is invalid show error.
+            if(!ValidationService.validateMAC(deviceInterface.mac)) {
+                return true;
+            }
+            // If the MAC is the same as another MAC show error.
+            var i;
+            for(i = 0; i < $scope.device.interfaces.length; i++) {
+                var isSelf = $scope.device.interfaces[i] === deviceInterface;
+                if(!isSelf &&
+                    $scope.device.interfaces[i].mac === deviceInterface.mac) {
+                    return true;
+                }
+            }
+            return false;
         };
 
         // Returns true if the IP address is in error.
-        $scope.ipHasError = function() {
+        $scope.ipHasError = function(deviceInterface) {
             // If the IP is empty don't show error.
-            if($scope.device.ipAddress.length === 0) {
+            if(deviceInterface.ipAddress.length === 0) {
                 return false;
             }
             // If ip address is invalid, then exit early.
-            if(!ValidationService.validateIP($scope.device.ipAddress)) {
+            if(!ValidationService.validateIP(deviceInterface.ipAddress)) {
                 return true;
             }
             var i, inNetwork, managedInterfaces = $scope.getManagedInterfaces();
-            if(angular.isObject($scope.device.ipAssignment)){
-                if($scope.device.ipAssignment.name === "external") {
+            if(angular.isObject(deviceInterface.ipAssignment)){
+                if(deviceInterface.ipAssignment.name === "external") {
                     // External IP address cannot be within a managed interface
                     // on one of the clusters.
                     for(i = 0; i < managedInterfaces.length; i++) {
                         inNetwork = ValidationService.validateIPInNetwork(
-                            $scope.device.ipAddress,
+                            deviceInterface.ipAddress,
                             managedInterfaces[i].network);
                         if(inNetwork) {
                             return true;
                         }
                     }
-                } else if($scope.device.ipAssignment.name === "static" &&
-                    angular.isNumber($scope.device.clusterInterfaceId)) {
+                } else if(deviceInterface.ipAssignment.name === "static" &&
+                    angular.isNumber(deviceInterface.clusterInterfaceId)) {
                     // Static IP address must be within the static range
                     // of the selected clusterInterface.
                     var clusterInterface = getInterfaceById(
-                        $scope.device.clusterInterfaceId);
+                        deviceInterface.clusterInterfaceId);
                     inNetwork = ValidationService.validateIPInNetwork(
-                        $scope.device.ipAddress, clusterInterface.network);
+                        deviceInterface.ipAddress, clusterInterface.network);
                     var inDynamicRange = ValidationService.validateIPInRange(
-                        $scope.device.ipAddress, clusterInterface.network,
+                        deviceInterface.ipAddress, clusterInterface.network,
                         clusterInterface.dynamic_range.low,
                         clusterInterface.dynamic_range.high);
                     if(!inNetwork || inDynamicRange) {
@@ -175,26 +214,53 @@
         // Return true when the device is missing information or invalid
         // information.
         $scope.deviceHasError = function() {
-            // Early-out for errors.
-            in_error = (
-                $scope.device.name === '' ||
-                $scope.device.mac === '' ||
-                !angular.isObject($scope.device.ipAssignment) ||
-                $scope.nameHasError() ||
-                $scope.macHasError());
-            if(in_error) {
-                return in_error;
-            }
-            if($scope.device.ipAssignment.name === "external") {
-                return $scope.device.ipAddress === '' || $scope.ipHasError();
-            }
-            if($scope.device.ipAssignment.name === "static") {
-                return !angular.isNumber($scope.device.clusterInterfaceId) ||
-                    $scope.ipHasError();
+            if($scope.device.name === '' || $scope.nameHasError()) {
+                return true;
+            }
+
+            var i;
+            for(i = 0; i < $scope.device.interfaces.length; i++) {
+                var deviceInterface = $scope.device.interfaces[i];
+                if(deviceInterface.mac === '' ||
+                    $scope.macHasError(deviceInterface) ||
+                    !angular.isObject(deviceInterface.ipAssignment)) {
+                    return true;
+                }
+                var externalIpError = (
+                    deviceInterface.ipAssignment.name === "external" && (
+                        deviceInterface.ipAddress === '' ||
+                        $scope.ipHasError(deviceInterface)));
+                var staticIpError = (
+                    deviceInterface.ipAssignment.name === "static" && (
+                        !angular.isNumber(deviceInterface.clusterInterfaceId) ||
+                        $scope.ipHasError(deviceInterface)));
+                if(externalIpError || staticIpError) {
+                    return true;
+                }
             }
             return false;
         };
 
+        // Adds new interface to device.
+        $scope.addInterface = function() {
+            $scope.device.interfaces.push(makeInterface());
+        };
+
+        // Returns true if the first interface in the device interfaces array.
+        $scope.isPrimaryInterface = function(deviceInterface) {
+            return $scope.device.interfaces.indexOf(deviceInterface) === 0;
+        };
+
+        // Removes the interface from the devices interfaces array.
+        $scope.deleteInterface = function(deviceInterface) {
+            // Don't remove the primary.
+            if($scope.isPrimaryInterface(deviceInterface)) {
+                return;
+            }
+            $scope.device.interfaces.splice(
+                $scope.device.interfaces.indexOf(deviceInterface), 1);
+        };
+
         // Called when cancel clicked.
         $scope.cancel = function() {
             $scope.error = null;

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_add_device.js'
--- src/maasserver/static/js/angular/controllers/tests/test_add_device.js	2015-05-13 21:22:16 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_add_device.js	2015-05-27 00:50:29 +0000
@@ -158,6 +158,28 @@
         };
     }
 
+    // Make a interface
+    function makeInterface(mac, ipAssignment, clusterInterfaceId, ipAddress) {
+        if(angular.isUndefined(mac)) {
+            mac = "";
+        }
+        if(angular.isUndefined(ipAssignment)) {
+            ipAssignment = null;
+        }
+        if(angular.isUndefined(clusterInterfaceId)) {
+            clusterInterfaceId = null;
+        }
+        if(angular.isUndefined(ipAddress)) {
+            ipAddress = "";
+        }
+        return {
+            mac: mac,
+            ipAssignment: ipAssignment,
+            clusterInterfaceId: clusterInterfaceId,
+            ipAddress: ipAddress
+        };
+    }
+
     it("sets addDeviceScope on $scope.$parent", function() {
         var controller = makeController();
         expect(parentScope.addDeviceScope).toBe($scope);
@@ -184,10 +206,12 @@
         ]);
         expect($scope.device).toEqual({
             name: "",
-            mac: "",
-            ipAssignment: null,
-            clusterInterfaceId: null,
-            ipAddress: ""
+            interfaces: [{
+                mac: "",
+                ipAssignment: null,
+                clusterInterfaceId: null,
+                ipAddress: ""
+            }]
         });
     });
 
@@ -263,9 +287,12 @@
         it("returns text including low and high of static range", function() {
             var controller = makeController();
             var nic = makeManagedClusterInterface();
-            expect($scope.getInterfaceStaticRange(nic)).toEqual(
-                nic.network + " (" + nic.static_range.low +
-                " - " + nic.static_range.high + ")");
+            $scope.clusters = [
+                makeCluster([nic])
+                ];
+            expect($scope.getInterfaceStaticRange(nic.id)).toEqual(
+                nic.static_range.low + " - " + nic.static_range.high +
+                " (Optional)");
         });
     });
 
@@ -293,19 +320,44 @@
 
         it("returns false if mac is empty", function() {
             var controller = makeController();
-            expect($scope.macHasError()).toBe(false);
+            var nic = makeInterface();
+            expect($scope.macHasError(nic)).toBe(false);
         });
 
         it("returns false if valid mac", function() {
             var controller = makeController();
-            $scope.device.mac = "00:00:11:22:33:44";
-            expect($scope.macHasError()).toBe(false);
+            var nic = makeInterface("00:00:11:22:33:44");
+            expect($scope.macHasError(nic)).toBe(false);
+        });
+
+        it("returns false if not repeat mac", function() {
+            var controller = makeController();
+            var nic = makeInterface("00:00:11:22:33:44");
+            var nic2 = makeInterface("00:00:11:22:33:55");
+            $scope.device.interfaces = [
+                nic,
+                nic2
+            ];
+            expect($scope.macHasError(nic)).toBe(false);
+            expect($scope.macHasError(nic2)).toBe(false);
         });
 
         it("returns true if invalid mac", function() {
             var controller = makeController();
-            $scope.device.mac = "00:00:11:22:33";
-            expect($scope.macHasError()).toBe(true);
+            var nic = makeInterface("00:00:11:22:33");
+            expect($scope.macHasError(nic)).toBe(true);
+        });
+
+        it("returns true if repeat mac", function() {
+            var controller = makeController();
+            var nic = makeInterface("00:00:11:22:33:44");
+            var nic2 = makeInterface("00:00:11:22:33:44");
+            $scope.device.interfaces = [
+                nic,
+                nic2
+            ];
+            expect($scope.macHasError(nic)).toBe(true);
+            expect($scope.macHasError(nic2)).toBe(true);
         });
     });
 
@@ -313,31 +365,36 @@
 
         it("returns false if ip is empty", function() {
             var controller = makeController();
-            expect($scope.ipHasError()).toBe(false);
+            var nic = makeInterface();
+            expect($scope.ipHasError(nic)).toBe(false);
         });
 
         it("returns false if valid ipv4", function() {
             var controller = makeController();
-            $scope.device.ipAddress = "192.168.1.1";
-            expect($scope.ipHasError()).toBe(false);
+            var nic = makeInterface();
+            nic.ipAddress = "192.168.1.1";
+            expect($scope.ipHasError(nic)).toBe(false);
         });
 
         it("returns false if valid ipv6", function() {
             var controller = makeController();
-            $scope.device.ipAddress = "2001:db8::1";
-            expect($scope.ipHasError()).toBe(false);
+            var nic = makeInterface();
+            nic.ipAddress = "2001:db8::1";
+            expect($scope.ipHasError(nic)).toBe(false);
         });
 
         it("returns true if invalid ipv4", function() {
             var controller = makeController();
-            $scope.device.ipAddress = "192.168.1";
-            expect($scope.ipHasError()).toBe(true);
+            var nic = makeInterface();
+            nic.ipAddress = "192.168.1";
+            expect($scope.ipHasError(nic)).toBe(true);
         });
 
         it("returns true if invalid ipv6", function() {
             var controller = makeController();
-            $scope.device.ipAddress = "2001::db8::1";
-            expect($scope.ipHasError()).toBe(true);
+            var nic = makeInterface();
+            nic.ipAddress = "2001::db8::1";
+            expect($scope.ipHasError(nic)).toBe(true);
         });
 
         it("returns false if external ip out of managed network", function() {
@@ -346,11 +403,12 @@
             var cluster = makeCluster([nic]);
             $scope.clusters = [cluster];
             // No class A address is in the fake networks.
-            $scope.device.ipAddress = "10.0.1.1";
-            $scope.device.ipAssignment = {
+            var deviceInterface = makeInterface();
+            deviceInterface.ipAddress = "10.0.1.1";
+            deviceInterface.ipAssignment = {
                 name: "external"
             };
-            expect($scope.ipHasError()).toBe(false);
+            expect($scope.ipHasError(deviceInterface)).toBe(false);
         });
 
         it("returns true if external ip in managed network", function() {
@@ -358,11 +416,12 @@
             var nic = makeManagedClusterInterface();
             var cluster = makeCluster([nic]);
             $scope.clusters = [cluster];
-            $scope.device.ipAddress = nic.static_range.low;
-            $scope.device.ipAssignment = {
+            var deviceInterface = makeInterface();
+            deviceInterface.ipAddress = nic.static_range.low;
+            deviceInterface.ipAssignment = {
                 name: "external"
             };
-            expect($scope.ipHasError()).toBe(true);
+            expect($scope.ipHasError(deviceInterface)).toBe(true);
         });
 
         it("returns false if static in managed network", function() {
@@ -370,11 +429,12 @@
             var nic = makeManagedClusterInterface();
             var cluster = makeCluster([nic]);
             $scope.clusters = [cluster];
-            $scope.device.ipAddress = nic.static_range.low;
-            $scope.device.ipAssignment = {
+            var deviceInterface = makeInterface();
+            deviceInterface.ipAddress = nic.static_range.low;
+            deviceInterface.ipAssignment = {
                 name: "static"
             };
-            expect($scope.ipHasError()).toBe(false);
+            expect($scope.ipHasError(deviceInterface)).toBe(false);
         });
 
         it("returns false if static ip in select network", function() {
@@ -382,12 +442,13 @@
             var nic = makeManagedClusterInterface();
             var cluster = makeCluster([nic]);
             $scope.clusters = [cluster];
-            $scope.device.ipAddress = nic.static_range.low;
-            $scope.device.clusterInterfaceId = nic.id;
-            $scope.device.ipAssignment = {
+            var deviceInterface = makeInterface();
+            deviceInterface.ipAddress = nic.static_range.low;
+            deviceInterface.clusterInterfaceId = nic.id;
+            deviceInterface.ipAssignment = {
                 name: "static"
             };
-            expect($scope.ipHasError()).toBe(false);
+            expect($scope.ipHasError(deviceInterface)).toBe(false);
         });
 
         it("returns true if static ip out of select network", function() {
@@ -396,12 +457,13 @@
             var otherNic = makeManagedClusterInterface();
             var cluster = makeCluster([nic]);
             $scope.clusters = [cluster];
-            $scope.device.ipAddress = otherNic.static_range.low;
-            $scope.device.clusterInterfaceId = nic.id;
-            $scope.device.ipAssignment = {
+            var deviceInterface = makeInterface();
+            deviceInterface.ipAddress = otherNic.static_range.low;
+            deviceInterface.clusterInterfaceId = nic.id;
+            deviceInterface.ipAssignment = {
                 name: "static"
             };
-            expect($scope.ipHasError()).toBe(true);
+            expect($scope.ipHasError(deviceInterface)).toBe(true);
         });
 
         it("returns true if static ip in dynamic range of network", function() {
@@ -409,12 +471,13 @@
             var nic = makeManagedClusterInterface();
             var cluster = makeCluster([nic]);
             $scope.clusters = [cluster];
-            $scope.device.ipAddress = nic.dynamic_range.low;
-            $scope.device.clusterInterfaceId = nic.id;
-            $scope.device.ipAssignment = {
+            var deviceInterface = makeInterface();
+            deviceInterface.ipAddress = nic.dynamic_range.low;
+            deviceInterface.clusterInterfaceId = nic.id;
+            deviceInterface.ipAssignment = {
                 name: "static"
             };
-            expect($scope.ipHasError()).toBe(true);
+            expect($scope.ipHasError(deviceInterface)).toBe(true);
         });
     });
 
@@ -422,8 +485,8 @@
 
         it("returns true if name empty", function() {
             var controller = makeController();
-            $scope.device.mac = '00:11:22:33:44:55';
-            $scope.device.ipAssignment = {
+            $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+            $scope.device.interfaces[0].ipAssignment = {
                 name: "dynamic"
             };
             expect($scope.deviceHasError()).toBe(true);
@@ -432,7 +495,7 @@
         it("returns true if mac empty", function() {
             var controller = makeController();
             $scope.device.name = "abc";
-            $scope.device.ipAssignment = {
+            $scope.device.interfaces[0].ipAssignment = {
                 name: "dynamic"
             };
             expect($scope.deviceHasError()).toBe(true);
@@ -441,8 +504,8 @@
         it("returns true if name invalid", function() {
             var controller = makeController();
             $scope.device.name = "ab_c.local";
-            $scope.device.mac = '00:11:22:33:44:55';
-            $scope.device.ipAssignment = {
+            $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+            $scope.device.interfaces[0].ipAssignment = {
                 name: "dynamic"
             };
             expect($scope.deviceHasError()).toBe(true);
@@ -451,8 +514,8 @@
         it("returns true if mac invalid", function() {
             var controller = makeController();
             $scope.device.name = "abc";
-            $scope.device.mac = '00:11:22:33:44';
-            $scope.device.ipAssignment = {
+            $scope.device.interfaces[0].mac = '00:11:22:33:44';
+            $scope.device.interfaces[0].ipAssignment = {
                 name: "dynamic"
             };
             expect($scope.deviceHasError()).toBe(true);
@@ -461,15 +524,15 @@
         it("returns true if missing ip assignment selection", function() {
             var controller = makeController();
             $scope.device.name = "abc";
-            $scope.device.mac = '00:11:22:33:44:55';
+            $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
             expect($scope.deviceHasError()).toBe(true);
         });
 
         it("returns false if dynamic ip assignment selection", function() {
             var controller = makeController();
             $scope.device.name = "abc";
-            $scope.device.mac = '00:11:22:33:44:55';
-            $scope.device.ipAssignment = {
+            $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+            $scope.device.interfaces[0].ipAssignment = {
                 name: "dynamic"
             };
             expect($scope.deviceHasError()).toBe(false);
@@ -478,33 +541,33 @@
         it("returns true if external ip assignment and ip empty", function() {
             var controller = makeController();
             $scope.device.name = "abc";
-            $scope.device.mac = '00:11:22:33:44:55';
-            $scope.device.ipAssignment = {
+            $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+            $scope.device.interfaces[0].ipAssignment = {
                 name: "external"
             };
-            $scope.device.ipAddress = "";
+            $scope.device.interfaces[0].ipAddress = "";
             expect($scope.deviceHasError()).toBe(true);
         });
 
         it("returns true if external ip assignment and ip invalid", function() {
             var controller = makeController();
             $scope.device.name = "abc";
-            $scope.device.mac = '00:11:22:33:44:55';
-            $scope.device.ipAssignment = {
+            $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+            $scope.device.interfaces[0].ipAssignment = {
                 name: "external"
             };
-            $scope.device.ipAddress = "192.168";
+            $scope.device.interfaces[0].ipAddress = "192.168";
             expect($scope.deviceHasError()).toBe(true);
         });
 
         it("returns false if external ip assignment and ip valid", function() {
             var controller = makeController();
             $scope.device.name = "abc";
-            $scope.device.mac = '00:11:22:33:44:55';
-            $scope.device.ipAssignment = {
+            $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+            $scope.device.interfaces[0].ipAssignment = {
                 name: "external"
             };
-            $scope.device.ipAddress = "192.168.1.1";
+            $scope.device.interfaces[0].ipAddress = "192.168.1.1";
             expect($scope.deviceHasError()).toBe(false);
         });
 
@@ -512,8 +575,8 @@
             function() {
                 var controller = makeController();
                 $scope.device.name = "abc";
-                $scope.device.mac = '00:11:22:33:44:55';
-                $scope.device.ipAssignment = {
+                $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+                $scope.device.interfaces[0].ipAssignment = {
                     name: "static"
                 };
                 expect($scope.deviceHasError()).toBe(true);
@@ -526,11 +589,11 @@
                 var cluster = makeCluster([nic]);
                 $scope.clusters = [cluster];
                 $scope.device.name = "abc";
-                $scope.device.mac = '00:11:22:33:44:55';
-                $scope.device.ipAssignment = {
+                $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+                $scope.device.interfaces[0].ipAssignment = {
                     name: "static"
                 };
-                $scope.device.clusterInterfaceId = nic.id;
+                $scope.device.interfaces[0].clusterInterfaceId = nic.id;
                 expect($scope.deviceHasError()).toBe(false);
             });
 
@@ -542,12 +605,12 @@
                 var cluster = makeCluster([nic]);
                 $scope.clusters = [cluster];
                 $scope.device.name = "abc";
-                $scope.device.mac = '00:11:22:33:44:55';
-                $scope.device.ipAssignment = {
+                $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+                $scope.device.interfaces[0].ipAssignment = {
                     name: "static"
                 };
-                $scope.device.clusterInterfaceId = nic.id;
-                $scope.device.ipAddress = "192.168";
+                $scope.device.interfaces[0].clusterInterfaceId = nic.id;
+                $scope.device.interfaces[0].ipAddress = "192.168";
                 expect($scope.deviceHasError()).toBe(true);
             });
 
@@ -560,12 +623,13 @@
                 var cluster = makeCluster([nic]);
                 $scope.clusters = [cluster];
                 $scope.device.name = "abc";
-                $scope.device.mac = '00:11:22:33:44:55';
-                $scope.device.ipAssignment = {
+                $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+                $scope.device.interfaces[0].ipAssignment = {
                     name: "static"
                 };
-                $scope.device.clusterInterfaceId = nic.id;
-                $scope.device.ipAddress = otherNic.static_range.low;
+                $scope.device.interfaces[0].clusterInterfaceId = nic.id;
+                $scope.device.interfaces[0].ipAddress =
+                    otherNic.static_range.low;
                 expect($scope.deviceHasError()).toBe(true);
             });
 
@@ -577,16 +641,62 @@
                 var cluster = makeCluster([nic]);
                 $scope.clusters = [cluster];
                 $scope.device.name = "abc";
-                $scope.device.mac = '00:11:22:33:44:55';
-                $scope.device.ipAssignment = {
+                $scope.device.interfaces[0].mac = '00:11:22:33:44:55';
+                $scope.device.interfaces[0].ipAssignment = {
                     name: "static"
                 };
-                $scope.device.clusterInterfaceId = nic.id;
-                $scope.device.ipAddress = nic.static_range.low;
+                $scope.device.interfaces[0].clusterInterfaceId = nic.id;
+                $scope.device.interfaces[0].ipAddress = nic.static_range.low;
                 expect($scope.deviceHasError()).toBe(false);
             });
     });
 
+    describe("addInterface", function() {
+
+        it("adds another interface", function() {
+            var controller = makeController();
+            $scope.addInterface();
+            expect($scope.device.interfaces.length).toBe(2);
+        });
+    });
+
+    describe("isPrimaryInterface", function() {
+
+        it("returns true for first interface", function() {
+            var controller = makeController();
+            $scope.addInterface();
+            expect(
+                $scope.isPrimaryInterface(
+                    $scope.device.interfaces[0])).toBe(true);
+        });
+
+        it("returns false for second interface", function() {
+            var controller = makeController();
+            $scope.addInterface();
+            expect(
+                $scope.isPrimaryInterface(
+                    $scope.device.interfaces[1])).toBe(false);
+        });
+    });
+
+    describe("deleteInterface", function() {
+
+        it("doesnt remove primary interface", function() {
+            var controller = makeController();
+            var nic = $scope.device.interfaces[0];
+            $scope.deleteInterface(nic);
+            expect($scope.device.interfaces[0]).toBe(nic);
+        });
+
+        it("removes interface", function() {
+            var controller = makeController();
+            $scope.addInterface();
+            var nic = $scope.device.interfaces[1];
+            $scope.deleteInterface(nic);
+            expect($scope.device.interfaces.indexOf(nic)).toBe(-1);
+        });
+    });
+
     describe("cancel", function() {
 
         it("clears error", function() {
@@ -629,10 +739,8 @@
             spyOn($scope, "deviceHasError").and.returnValue(false);
             spyOn(DevicesManager, "create").and.returnValue(
                 $q.defer().promise);
-            $scope.device = {
-                ipAssignment: {
-                    name: "dynamic"
-                }
+            $scope.device.interfaces[0].ipAssignment = {
+                name: "dynamic"
             };
             $scope.save();
             expect($scope.error).toBeNull();
@@ -651,20 +759,26 @@
             var ipAddress = makeName("ip");
             $scope.device = {
                 name: name,
-                mac: mac,
-                ipAssignment: {
-                    name: assignment
-                },
-                clusterInterfaceId: nicId,
-                ipAddress: ipAddress
+                interfaces: [{
+                    mac: mac,
+                    ipAssignment: {
+                        name: assignment
+                    },
+                    clusterInterfaceId: nicId,
+                    ipAddress: ipAddress
+                }]
             };
             $scope.save();
             expect(DevicesManager.create).toHaveBeenCalledWith({
                 hostname: name,
                 primary_mac: mac,
-                ip_assignment: assignment,
-                ip_address: ipAddress,
-                "interface": nicId
+                extra_macs: [],
+                interfaces: [{
+                    mac: mac,
+                    ip_assignment: assignment,
+                    ip_address: ipAddress,
+                    "interface": nicId
+                }]
             });
         });
 
@@ -675,7 +789,7 @@
             var defer = $q.defer();
             spyOn(DevicesManager, "create").and.returnValue(defer.promise);
             $scope.device.name = makeName("name");
-            $scope.device.ipAssignment = {
+            $scope.device.interfaces[0].ipAssignment = {
                 name: "dynamic"
             };
             $scope.save();
@@ -692,7 +806,7 @@
                 var defer = $q.defer();
                 spyOn(DevicesManager, "create").and.returnValue(defer.promise);
                 $scope.device.name = makeName("name");
-                $scope.device.ipAssignment = {
+                $scope.device.interfaces[0].ipAssignment = {
                     name: "dynamic"
                 };
                 spyOn($scope, "hide");
@@ -710,7 +824,7 @@
                 var defer = $q.defer();
                 spyOn(DevicesManager, "create").and.returnValue(defer.promise);
                 $scope.device.name = makeName("name");
-                $scope.device.ipAssignment = {
+                $scope.device.interfaces[0].ipAssignment = {
                     name: "dynamic"
                 };
                 spyOn($scope, "hide");
@@ -728,7 +842,7 @@
                 var defer = $q.defer();
                 spyOn(DevicesManager, "create").and.returnValue(defer.promise);
                 $scope.device.name = makeName("name");
-                $scope.device.ipAssignment = {
+                $scope.device.interfaces[0].ipAssignment = {
                     name: "dynamic"
                 };
                 $scope.save();

=== added file 'src/maasserver/static/js/angular/directives/placeholder.js'
--- src/maasserver/static/js/angular/directives/placeholder.js	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/js/angular/directives/placeholder.js	2015-05-27 00:50:29 +0000
@@ -0,0 +1,22 @@
+/* Copyright 2015 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ *
+ * Placeholder directive.
+ *
+ * Allows the placeholder attribute on an element to be dynamic.
+ */
+
+
+angular.module('MAAS').directive('ngPlaceholder', function() {
+    return {
+        restrict: "A",
+        scope: {
+            ngPlaceholder: "="
+        },
+        link: function(scope, element, attrs) {
+            scope.$watch('ngPlaceholder', function() {
+                element[0].placeholder = scope.ngPlaceholder;
+            });
+        }
+    };
+});

=== added file 'src/maasserver/static/js/angular/directives/tests/test_placeholder.js'
--- src/maasserver/static/js/angular/directives/tests/test_placeholder.js	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/js/angular/directives/tests/test_placeholder.js	2015-05-27 00:50:29 +0000
@@ -0,0 +1,55 @@
+/* Copyright 2015 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ *
+ * Unit tests for placeholder directive.
+ */
+
+describe("ngPlaceholder", function() {
+
+    // Load the MAAS module.
+    beforeEach(module("MAAS"));
+
+    // Create a new scope before each test.
+    var $scope;
+    beforeEach(inject(function($rootScope) {
+        $scope = $rootScope.$new();
+    }));
+
+    // Return the compiled directive with the items from the scope.
+    function compileDirective(ngPlaceholder) {
+        var directive;
+        var html = [
+            '<div>',
+                '<input ng-placeholder="' + ngPlaceholder + '" />',
+            '</div>'
+            ].join('');
+
+        // Compile the directive.
+        inject(function($compile) {
+            directive = $compile(html)($scope);
+        });
+
+        // Perform the digest cycle to finish the compile.
+        $scope.$digest();
+        return directive.find("input");
+    }
+
+    it("sets placeholder attribute on input", function() {
+        var placeholderText = makeName("placeholder");
+        $scope.placeholder = placeholderText;
+        var directive = compileDirective("placeholder");
+        expect(directive[0].placeholder).toEqual(placeholderText);
+    });
+
+    it("sets placeholder attribute on input when changed", function() {
+        var placeholderText = makeName("placeholder");
+        $scope.placeholder = placeholderText;
+        var directive = compileDirective("placeholder");
+
+        // Change the text.
+        placeholderText = makeName("placeholder");
+        $scope.placeholder = placeholderText;
+        $scope.$digest();
+        expect(directive[0].placeholder).toEqual(placeholderText);
+    });
+});

=== modified file 'src/maasserver/static/partials/nodes-list.html'
--- src/maasserver/static/partials/nodes-list.html	2015-05-22 16:16:00 +0000
+++ src/maasserver/static/partials/nodes-list.html	2015-05-27 00:50:29 +0000
@@ -278,51 +278,69 @@
             </div>
             <div class="page-header__dropdown ng-hide" data-ng-show="addDeviceScope.viewable" data-ng-controller="AddDeviceController">
                 <h3>Add device</h3>
-                <form action="post" class="twelve-col">
-                    <fieldset class="six-col no-padding">
+                <form class="twelve-col">
+                    <fieldset class="twelve-col last-col no-padding">
                         <div class="inline">
                             <label for="device-name" class="two-col">Name</label>
                             <input type="text" id="device-name" class="three-col" placeholder="Name your device"
                                 data-ng-model="device.name"
                                 data-ng-class="{ invalid: nameHasError() }">
                         </div>
-                        <div class="inline">
-                            <label for="mac-address" class="two-col">MAC address</label>
-                            <input type="text" id="mac-address" class="three-col" placeholder="00:00:00:00:00:00"
-                                data-ng-model="device.mac"
-                                data-ng-class="{ invalid: macHasError() }">
-                        </div>
-                    </fieldset>
-                    <fieldset class="six-col last-col no-padding">
-                        <div class="inline">
-                            <label for="ip-assignment" class="two-col">IP assigment</label>
-                            <select name="ip-assignment" id="ip-assignment" class="three-col"
-                                placeholder="Select IP assignment" data-ng-model="device.ipAssignment"
-                                data-ng-options="assigment.title for assigment in ipAssignments">
-                                <option value="" disabled selected>Select IP assignment</option>
-                            </select>
-                        </div>
-                        <div class="inline ng-hide" data-ng-show="device.ipAssignment.name === 'external'">
-                            <label for="ip-address" class="two-col">IP address</label>
-                            <input type="text" id="ip-address" class="three-col" placeholder="000.000.000.000"
-                                data-ng-model="device.ipAddress"
-                                data-ng-class="{ invalid: ipHasError() }">
-                        </div>
-                        <div class="inline ng-hide" data-ng-show="device.ipAssignment.name === 'static'">
-                            <label for="network" class="two-col">Network</label>
-                            <select name="network" id="network" class="three-col"
-                                placeholder="Select network" data-ng-model="device.clusterInterfaceId"
-                                data-ng-options="interface.id as getInterfaceStaticRange(interface) for interface in getManagedInterfaces()">
-                                <option value="" disabled selected>Select network</option>
-                            </select>
-                        </div>
-                        <div class="inline ng-hide" data-ng-show="device.ipAssignment.name === 'static'">
-                            <label for="ip-address" class="two-col">IP address</label>
-                            <input type="text" id="ip-address" class="three-col" placeholder="000.000.000.000 (Optional)"
-                                data-ng-model="device.ipAddress"
-                                data-ng-class="{ invalid: ipHasError() }">
-                        </div>
-                    </fieldset>
+                    </fieldset>
+                    <table class="no-margin-bottom table-listing">
+                        <thead>
+                            <tr class="table-listing__row">
+                                <th class="t20">MAC address</th>
+                                <th class="t20">IP assignment</th>
+                                <th class="t20">Network</th>
+                                <th class="t35">IP address</th>
+                                <th class="t5"></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr class="table-listing__row"
+                                data-ng-repeat="interface in device.interfaces">
+                                <td class="t20 table-listing__cell">
+                                    <input type="text" id="mac-address" placeholder="00:00:00:00:00:00"
+                                        data-ng-model="interface.mac"
+                                        data-ng-class="{ invalid: macHasError(interface) }">
+                                </td>
+                                <td class="t20 table-listing__cell">
+                                    <select name="ip-assignment" id="ip-assignment"
+                                        placeholder="Select IP assignment" data-ng-model="interface.ipAssignment"
+                                        data-ng-options="assigment.title for assigment in ipAssignments">
+                                        <option value="" disabled selected>Select IP assignment</option>
+                                    </select>
+                                </td>
+                                <td class="t20 table-listing__cell">
+                                    <select name="network" id="network"
+                                        placeholder="Select network" data-ng-model="interface.clusterInterfaceId"
+                                        data-ng-options="cInterface.id as cInterface.network for cInterface in getManagedInterfaces()"
+                                        data-ng-show="interface.ipAssignment.name === 'static'">
+                                        <option value="" disabled selected>Select network</option>
+                                    </select>
+                                </td>
+                                <td class="t35 table-listing__cell">
+                                    <input type="text" id="ip-address" placeholder="000.000.000.000"
+                                        data-ng-model="interface.ipAddress"
+                                        data-ng-class="{ invalid: ipHasError(interface) }"
+                                        data-ng-show="interface.ipAssignment.name === 'external'">
+                                    <input type="text" id="ip-address" ng-placeholder="getInterfaceStaticRange(interface.clusterInterfaceId)"
+                                        data-ng-model="interface.ipAddress"
+                                        data-ng-class="{ invalid: ipHasError(interface) }"
+                                        data-ng-show="interface.ipAssignment.name === 'static' && interface.clusterInterfaceId">
+                                </td>
+                                <td class="t5 align-right">
+                                    <!-- space needed to set correct height -->
+                                    <span data-ng-show="isPrimaryInterface(interface)">&nbsp;</span>
+                                    <a title="Delete interface" class="icon delete"
+                                        data-ng-click="deleteInterface(interface)"
+                                        data-ng-hide="isPrimaryInterface(interface)">delete</a>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <button class="cta-ubuntu secondary" data-ng-click="addInterface()">+ Add another interface</button>
                 </form>
                 <div class="page-header__feedback twelve-col no-margin-bottom">
                     <div class="twelve-col ng-hide" data-ng-show="error">

=== modified file 'src/maasserver/websockets/handlers/device.py'
--- src/maasserver/websockets/handlers/device.py	2015-05-14 17:25:57 +0000
+++ src/maasserver/websockets/handlers/device.py	2015-05-27 00:50:29 +0000
@@ -30,7 +30,6 @@
 from maasserver.models.node import Device
 from maasserver.models.nodegroup import NodeGroup
 from maasserver.models.nodegroupinterface import NodeGroupInterface
-from maasserver.models.staticipaddress import StaticIPAddress
 from maasserver.node_action import compile_node_actions
 from maasserver.utils.orm import commit_within_atomic_block
 from maasserver.websockets.base import (
@@ -70,6 +69,45 @@
     return list(dhcp.update_host_maps(static_mappings))
 
 
+def get_MACAddress_from_list(mac_addresses, mac):
+    """Return the `MACAddress` object based on the mac value."""
+    for mac_obj in mac_addresses:
+        if mac_obj.mac_address == mac:
+            return mac_obj
+    return None
+
+
+def delete_device_and_static_ip_addresses(
+        device, external_static_ips, assigned_sticky_ips):
+    """Delete the created external and sticky ips and the created device.
+
+    This function calls `commit_within_atomic_block` to force the transaction
+    to be saved.
+    """
+    for static_ip, _ in external_static_ips:
+        static_ip.deallocate()
+    for static_ip, _ in assigned_sticky_ips:
+        static_ip.deallocate()
+    device.delete()
+    commit_within_atomic_block()
+
+
+def log_static_allocations(device, external_static_ips, assigned_sticky_ips):
+    """Log the allocation of the static ip address."""
+    all_ips = [
+        static_ip.ip
+        for static_ip, _ in external_static_ips
+        ]
+    all_ips.extend([
+        static_ip.ip
+        for static_ip, _ in assigned_sticky_ips
+        ])
+    if len(all_ips) > 0:
+        maaslog.info(
+            "%s: Sticky IP address(es) allocated: %s",
+            device.hostname, ', '.join(all_ips))
+
+
 class DeviceHandler(TimestampedModelHandler):
 
     class Meta:
@@ -260,98 +298,102 @@
         # XXX blake_r 03-04-15 bug=1440102: This is very ugly and a repeat
         # of code in other places. Needs to be refactored.
 
-        # Create the object, then link ip_address to the device based
-        # on the users choice.
+        # Create the object with the form and then create all of the interfaces
+        # based on the users choices.
         data = super(DeviceHandler, self).create(params)
         device_obj = Device.objects.get(system_id=data['system_id'])
-        mac_address = device_obj.get_pxe_mac()
-        ip_assignment = params["ip_assignment"]
-        if ip_assignment == DEVICE_IP_ASSIGNMENT.EXTERNAL:
-            sticky_ip = mac_address.set_static_ip(
-                params["ip_address"], self.user)
+        mac_addresses = list(device_obj.macaddress_set.all())
+        external_static_ips = []
+        assigned_sticky_ips = []
+
+        # Acquire all of the needed ip address based on the user selection.
+        for nic in params["interfaces"]:
+            mac_address = get_MACAddress_from_list(mac_addresses, nic["mac"])
+            ip_assignment = nic["ip_assignment"]
+            if ip_assignment == DEVICE_IP_ASSIGNMENT.EXTERNAL:
+                sticky_ip = mac_address.set_static_ip(
+                    nic["ip_address"], self.user)
+                external_static_ips.append(
+                    (sticky_ip, mac_address))
+            elif ip_assignment == DEVICE_IP_ASSIGNMENT.DYNAMIC:
+                # Nothing needs to be done. It will get an ip address in the
+                # dynamic range the first time it DHCP from a cluster
+                # interface.
+                pass
+            elif ip_assignment == DEVICE_IP_ASSIGNMENT.STATIC:
+                # Link the MAC address to the cluster interface.
+                cluster_interface = NodeGroupInterface.objects.get(
+                    id=nic["interface"])
+                mac_address.cluster_interface = cluster_interface
+                mac_address.save()
+
+                # Convert an empty string to None.
+                ip_address = nic.get("ip_address")
+                if not ip_address:
+                    ip_address = None
+
+                # Claim the static ip.
+                sticky_ips = mac_address.claim_static_ips(
+                    alloc_type=IPADDRESS_TYPE.STICKY,
+                    requested_address=ip_address)
+                assigned_sticky_ips.extend([
+                    (static_ip, mac_address)
+                    for static_ip in sticky_ips
+                    ])
+
+        # Commit all of the changes before telling the clusters to
+        # update.
+        commit_within_atomic_block()
+
+        # Update the managed clusters with all the external static ip
+        # addresses.
+        if len(external_static_ips) > 0:
             dhcp_managed_clusters = [
                 cluster
                 for cluster in NodeGroup.objects.all()
                 if cluster.manages_dhcp()
                 ]
-
-            # Commit the change and tell all the managed clusters to
-            # update thier host maps.
-            commit_within_atomic_block()
+            claims = [
+                (static_ip.ip, mac.mac_address.get_raw())
+                for static_ip, mac in external_static_ips
+                ]
             failures = update_host_maps(
-                [(sticky_ip.ip, mac_address.mac_address.get_raw())],
-                dhcp_managed_clusters)
+                claims, dhcp_managed_clusters)
             if len(failures) > 0:
-                # Failed to update the cluster. Remove the allocated static
-                # ip address and delete the newly created device. Since it
-                # was committed before the call to update_host_maps.
-                sticky_ip.deallocate()
-                device_obj.delete()
-
-                # Commit again so this raised failure will not roll back
-                # the deletions above.
-                commit_within_atomic_block()
-
-                # Now raise the first error to show a reason to the user. It
-                # is possible to have multiple errors, but at the moment
+                # Delete the created device and ip addresses.
+                delete_device_and_static_ip_addresses(
+                    device_obj, external_static_ips, assigned_sticky_ips)
+
+                # Now raise the first error to show a reason to the user.
+                # It is possible to have multiple errors, but at the moment
                 # we only raise the first error.
                 raise HandlerError(failures[0].value)
-            sticky_ips = [sticky_ip]
-
-        elif ip_assignment == DEVICE_IP_ASSIGNMENT.DYNAMIC:
-            # Nothing needs to be done. It will get an ip address in the
-            # dynamic range the first time it DHCP from a cluster interface.
-            pass
-
-        elif ip_assignment == DEVICE_IP_ASSIGNMENT.STATIC:
-            # Link the MAC address to the cluster interface.
-            cluster_interface = NodeGroupInterface.objects.get(
-                id=params["interface"])
-            mac_address.cluster_interface = cluster_interface
-            mac_address.save()
-
-            # Convert an empty string to None.
-            ip_address = params.get("ip_address")
-            if not ip_address:
-                ip_address = None
-
-            # Claim the static ip.
-            sticky_ips = mac_address.claim_static_ips(
-                alloc_type=IPADDRESS_TYPE.STICKY,
-                requested_address=ip_address)
+
+        # Update the devices cluster with all the assigned sticky ip
+        # addresses.
+        if len(assigned_sticky_ips) > 0:
             claims = [
-                (static_ip.ip, mac_address.mac_address.get_raw())
-                for static_ip in sticky_ips
+                (static_ip.ip, mac.mac_address.get_raw())
+                for static_ip, mac in assigned_sticky_ips
                 ]
-
-            # Commit the change and tell all the cluster for this device to
-            # update its host map.
-            commit_within_atomic_block()
-            failures = update_host_maps(claims, [device_obj.nodegroup])
+            failures = update_host_maps(
+                claims, [device_obj.nodegroup])
             if len(failures) > 0:
-                # Failed to update the cluster. Remove all allocated static
-                # ip address and delete the newly created device. Since it
-                # was committed before the call to update_host_maps.
-                StaticIPAddress.objects.delete_by_node(device_obj)
-                device_obj.delete()
-
-                # Commit again so this raised failure will not roll back
-                # the deletions above.
-                commit_within_atomic_block()
-
-                # Now raise the first error to show a reason to the user. It
-                # is possible to have multiple errors, but at the moment
+                # Delete the created device and ip addresses.
+                delete_device_and_static_ip_addresses(
+                    device_obj, external_static_ips, assigned_sticky_ips)
+
+                # Now raise the first error to show a reason to the user.
+                # It is possible to have multiple errors, but at the moment
                 # we only raise the first error.
                 raise HandlerError(failures[0].value)
 
         # Update the DNS zone for the master cluster as all device entries
         # go into that cluster.
-        if ip_assignment in [
-                DEVICE_IP_ASSIGNMENT.EXTERNAL, DEVICE_IP_ASSIGNMENT.STATIC]:
+        log_static_allocations(
+            device_obj, external_static_ips, assigned_sticky_ips)
+        if len(external_static_ips) > 0 or len(assigned_sticky_ips) > 0:
             dns_update_zones([NodeGroup.objects.ensure_master()])
-            maaslog.info(
-                "%s: Sticky IP address(es) allocated: %s", device_obj.hostname,
-                ', '.join(allocation.ip for allocation in sticky_ips))
 
         return self.full_dehydrate(device_obj)
 

=== modified file 'src/maasserver/websockets/handlers/tests/test_device.py'
--- src/maasserver/websockets/handlers/tests/test_device.py	2015-04-03 18:45:06 +0000
+++ src/maasserver/websockets/handlers/tests/test_device.py	2015-05-27 00:50:29 +0000
@@ -282,8 +282,11 @@
         created_device = handler.create({
             "hostname": hostname,
             "primary_mac": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.DYNAMIC,
-            })
+            "interfaces": [{
+                "mac": mac,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT.DYNAMIC,
+            }],
+        })
         self.expectThat(created_device["hostname"], Equals(hostname))
         self.expectThat(created_device["primary_mac"], Equals(mac))
         self.expectThat(created_device["extra_macs"], Equals([]))
@@ -303,9 +306,12 @@
         created_device = handler.create({
             "hostname": hostname,
             "primary_mac": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
-            "ip_address": ip_address,
-            })
+            "interfaces": [{
+                "mac": mac,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
+                "ip_address": ip_address,
+            }],
+        })
         self.expectThat(
             created_device["ip_assignment"],
             Equals(DEVICE_IP_ASSIGNMENT.EXTERNAL))
@@ -325,9 +331,12 @@
         handler.create({
             "hostname": hostname,
             "primary_mac": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
-            "ip_address": ip_address,
-            })
+            "interfaces": [{
+                "mac": mac,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
+                "ip_address": ip_address,
+            }],
+        })
         self.assertThat(
             mock_dns_update_zones,
             MockCalledOnceWith([NodeGroup.objects.ensure_master()]))
@@ -345,9 +354,12 @@
         self.assertRaises(HandlerError, handler.create, {
             "hostname": hostname,
             "primary_mac": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
-            "ip_address": ip_address,
-            })
+            "interfaces": [{
+                "mac": mac,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
+                "ip_address": ip_address,
+            }],
+        })
         self.expectThat(
             Node.objects.filter(hostname=hostname).count(),
             Equals(0), "Created Node was not deleted.")
@@ -369,9 +381,12 @@
         created_device = handler.create({
             "hostname": hostname,
             "primary_mac": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
-            "interface": nodegroup_interface.id,
-            })
+            "interfaces": [{
+                "mac": mac,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+                "interface": nodegroup_interface.id,
+            }],
+        })
         self.expectThat(
             created_device["ip_assignment"],
             Equals(DEVICE_IP_ASSIGNMENT.STATIC))
@@ -396,10 +411,13 @@
         created_device = handler.create({
             "hostname": hostname,
             "primary_mac": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
-            "interface": nodegroup_interface.id,
-            "ip_address": ip_address,
-            })
+            "interfaces": [{
+                "mac": mac,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+                "interface": nodegroup_interface.id,
+                "ip_address": ip_address,
+            }],
+        })
         self.expectThat(
             created_device["ip_assignment"],
             Equals(DEVICE_IP_ASSIGNMENT.STATIC))
@@ -424,9 +442,12 @@
         handler.create({
             "hostname": hostname,
             "primary_mac": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
-            "interface": nodegroup_interface.id,
-            })
+            "interfaces": [{
+                "mac": mac,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+                "interface": nodegroup_interface.id,
+            }],
+        })
         self.assertThat(
             mock_dns_update_zones,
             MockCalledOnceWith([NodeGroup.objects.ensure_master()]))
@@ -446,10 +467,13 @@
         self.assertRaises(HandlerError, handler.create, {
             "hostname": hostname,
             "primary_mac": mac,
-            "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
-            "interface": nodegroup_interface.id,
-            "ip_address": ip_address,
-            })
+            "interfaces": [{
+                "mac": mac,
+                "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+                "interface": nodegroup_interface.id,
+                "ip_address": ip_address,
+            }],
+        })
         self.expectThat(
             Node.objects.filter(hostname=hostname).count(),
             Equals(0), "Created Node was not deleted.")
@@ -460,6 +484,113 @@
             StaticIPAddress.objects.filter(ip=ip_address).count(),
             Equals(0), "Created StaticIPAddress was not deleted.")
 
+    def test_create_creates_device_with_static_and_external_ip(self):
+        user = factory.make_User()
+        handler = DeviceHandler(user, {})
+        hostname = factory.make_name("hostname")
+        nodegroup = factory.make_NodeGroup()
+        nodegroup_interface = factory.make_NodeGroupInterface(nodegroup)
+        mac_static = factory.make_mac_address()
+        static_ip_address = nodegroup_interface.static_ip_range_low
+        mac_external = factory.make_mac_address()
+        external_ip_address = factory.make_ipv4_address()
+        self.patch(dhcp_module, "update_host_maps").return_value = []
+        created_device = handler.create({
+            "hostname": hostname,
+            "primary_mac": mac_static,
+            "extra_macs": [
+                mac_external
+            ],
+            "interfaces": [
+                {
+                    "mac": mac_static,
+                    "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+                    "interface": nodegroup_interface.id,
+                    "ip_address": static_ip_address,
+                },
+                {
+                    "mac": mac_external,
+                    "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
+                    "ip_address": external_ip_address,
+                },
+            ],
+        })
+        self.expectThat(
+            created_device["primary_mac"],
+            Equals(mac_static))
+        self.expectThat(
+            created_device["extra_macs"],
+            Equals([mac_external]))
+        self.expectThat(
+            created_device["ip_assignment"],
+            Equals(DEVICE_IP_ASSIGNMENT.STATIC))
+        self.expectThat(
+            created_device["ip_address"], Equals(static_ip_address))
+        self.expectThat(
+            MACAddress.objects.get(
+                mac_address=MAC(mac_static)).cluster_interface,
+            Equals(nodegroup_interface),
+            "Link between MACAddress and NodeGroupInterface was not created.")
+        self.expectThat(
+            StaticIPAddress.objects.filter(ip=static_ip_address).count(),
+            Equals(1), "Static StaticIPAddress was not created.")
+        self.expectThat(
+            StaticIPAddress.objects.filter(ip=external_ip_address).count(),
+            Equals(1), "External StaticIPAddress was not created.")
+
+    def test_create_deletes_device_and_ips_when_only_one_errors(self):
+        user = factory.make_User()
+        handler = DeviceHandler(user, {})
+        hostname = factory.make_name("hostname")
+        nodegroup = factory.make_NodeGroup()
+        nodegroup_interface = factory.make_NodeGroupInterface(nodegroup)
+        mac_static = factory.make_mac_address()
+        static_ip_address = nodegroup_interface.static_ip_range_low
+        mac_external = factory.make_mac_address()
+        external_ip_address = factory.make_ipv4_address()
+        self.patch(dhcp_module, "update_host_maps").side_effect = [
+            [], [Failure(factory.make_exception())],
+        ]
+        self.assertRaises(HandlerError, handler.create, {
+            "hostname": hostname,
+            "primary_mac": mac_static,
+            "extra_macs": [
+                mac_external
+            ],
+            "interfaces": [
+                {
+                    "mac": mac_static,
+                    "ip_assignment": DEVICE_IP_ASSIGNMENT.STATIC,
+                    "interface": nodegroup_interface.id,
+                    "ip_address": static_ip_address,
+                },
+                {
+                    "mac": mac_external,
+                    "ip_assignment": DEVICE_IP_ASSIGNMENT.EXTERNAL,
+                    "ip_address": external_ip_address,
+                },
+            ],
+        })
+        self.expectThat(
+            Node.objects.filter(hostname=hostname).count(),
+            Equals(0), "Created Node was not deleted.")
+        self.expectThat(
+            MACAddress.objects.filter(mac_address=MAC(mac_static)).count(),
+            Equals(0),
+            "Created MACAddress for static ip address was not deleted.")
+        self.expectThat(
+            MACAddress.objects.filter(mac_address=MAC(mac_external)).count(),
+            Equals(0),
+            "Created MACAddress for external ip address was not deleted.")
+        self.expectThat(
+            StaticIPAddress.objects.filter(ip=static_ip_address).count(),
+            Equals(0),
+            "Created StaticIPAddress for static ip address was not deleted.")
+        self.expectThat(
+            StaticIPAddress.objects.filter(ip=external_ip_address).count(),
+            Equals(0),
+            "Created StaticIPAddress for external ip address was not deleted.")
+
     def test_missing_action_raises_error(self):
         user = factory.make_User()
         device = self.make_device_with_ip_address(owner=user)