Merge lp:~blake-rouse/maas/read-only-view-node-networking into lp:~maas-committers/maas/trunk

[Blake Rouse]

Add the discovered field to the API and websocket for the interface. Use that field in the WebUI to show the current discovered IP address when the node is commissioning. Also update the WebUI to be all in one line once a node is out of edit mode.

[Blake Rouse (blake-rouse)]

Here is an screenshot of what it looks like. This screenshot is a little bit older, as the subnet is also correct now in the branch.

http://imgur.com/f3ck2HN

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/read-only-view-node-networking into lp:maas failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [242 kB]
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [143 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [639 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [326 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 1,415 kB in 3s (376 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txtftp pyt...

[Andres Rodriguez (andreserl)]

metadataserver.tests.test_api.TestCommissioningAPI.test_signal_power_type_lower_case_works ... ok
metadataserver.tests.test_api.TestCommissioningAPI.test_signal_power_type_stores_params ... FAIL
metadataserver.tests.test_api.TestCommissioningAPI.test_signal_refuses_bad_power_type ... ok

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/read-only-view-node-networking into lp:maas failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [242 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [143 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [639 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [326 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 1,415 kB in 3s (373 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txtftp pyt...

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/read-only-view-node-networking into lp:maas failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [242 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [143 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [639 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [326 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 1,415 kB in 4s (323 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txtftp pyt...

=== modified file 'src/maasserver/api/interfaces.py'
--- src/maasserver/api/interfaces.py	2015-10-23 21:33:14 +0000
+++ src/maasserver/api/interfaces.py	2015-10-31 23:55:40 +0000
@@ -63,6 +63,7 @@
     'enabled',
     'links',
     'params',
+    'discovered',
 )
 
 
@@ -279,6 +280,10 @@
     def links(cls, interface):
         return interface.get_links()
 
+    @classmethod
+    def discovered(cls, interface):
+        return interface.get_discovered()
+
     def read(self, request, system_id, interface_id):
         """Read interface on node.
 

=== modified file 'src/maasserver/api/nodes.py'
--- src/maasserver/api/nodes.py	2015-10-26 18:15:08 +0000
+++ src/maasserver/api/nodes.py	2015-10-31 23:55:40 +0000
@@ -132,6 +132,7 @@
         'enabled',
         'links',
         'params',
+        'discovered',
         )),
     'routers',
     'zone',

=== modified file 'src/maasserver/api/tests/test_interfaces.py'
--- src/maasserver/api/tests/test_interfaces.py	2015-10-23 21:57:59 +0000
+++ src/maasserver/api/tests/test_interfaces.py	2015-10-31 23:55:40 +0000
@@ -443,13 +443,19 @@
         dhcp_ip = factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.DHCP, ip="",
             subnet=dhcp_subnet, interface=bond)
+        discovered_ip = factory.pick_ip_in_network(
+            dhcp_subnet.get_ipnetwork())
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.DISCOVERED, ip=discovered_ip,
+            subnet=dhcp_subnet, interface=bond)
         links.append(
             MatchesDict({
                 "id": Equals(dhcp_ip.id),
                 "mode": Equals(INTERFACE_LINK_TYPE.DHCP),
                 "subnet": ContainsDict({
                     "id": Equals(dhcp_subnet.id)
-                    })
+                    }),
+                "ip_address": Equals(discovered_ip),
             }))
 
         # Second link is a STATIC ip link.
@@ -506,7 +512,7 @@
             "tags": Equals(bond.tags),
             "resource_uri": Equals(get_node_interface_uri(bond)),
             "params": Equals(bond.params),
-            }))
+        }))
         self.assertEquals(sorted(
             nic.name
             for nic in parents
@@ -516,6 +522,9 @@
             for nic in children
             ), parsed_interface["children"])
         self.assertThat(parsed_interface["links"], MatchesListwise(links))
+        json_discovered = parsed_interface["discovered"][0]
+        self.assertEquals(dhcp_subnet.id, json_discovered["subnet"]["id"])
+        self.assertEquals(discovered_ip, json_discovered["ip_address"])
 
     def test_read_404_when_invalid_id(self):
         node = factory.make_Node()

=== modified file 'src/maasserver/forms_interface.py'
--- src/maasserver/forms_interface.py	2015-10-04 20:47:36 +0000
+++ src/maasserver/forms_interface.py	2015-10-31 23:55:40 +0000
@@ -346,7 +346,12 @@
         ]
         for bond_field in bond_fields:
             value = self.cleaned_data.get(bond_field)
-            if value:
+            if (value is not None and
+                    isinstance(value, (bytes, unicode)) and
+                    len(value) > 0 and not value.isspace()):
+                interface.params[bond_field] = value
+            elif (value is not None and
+                    not isinstance(value, (bytes, unicode))):
                 interface.params[bond_field] = value
             elif created:
                 interface.params[bond_field] = self.fields[bond_field].initial

=== modified file 'src/maasserver/models/interface.py'
--- src/maasserver/models/interface.py	2015-10-27 17:45:01 +0000
+++ src/maasserver/models/interface.py	2015-10-31 23:55:40 +0000
@@ -253,7 +253,7 @@
         {
             "id": 1,
             "mode": "dhcp",
-            "ip": "192.168.1.2",
+            "ip_address": "192.168.1.2",
             "subnet": <Subnet object>
         }
 
@@ -276,6 +276,30 @@
             links.append(link)
         return links
 
+    def get_discovered(self):
+        """Return the definition of discovered IP addresses belonging to this
+        interface.
+
+        Example definition:
+        {
+            "ip_address": "192.168.1.2",
+            "subnet": <Subnet object>
+        }
+        """
+        discovered_ips = self.ip_addresses.filter(
+            alloc_type=IPADDRESS_TYPE.DISCOVERED)
+        if len(discovered_ips) > 0:
+            discovered = []
+            for discovered_ip in discovered_ips:
+                if discovered_ip.ip is not None and discovered_ip.ip != "":
+                    discovered.append({
+                        "subnet": discovered_ip.subnet,
+                        "ip_address": "%s" % discovered_ip.ip,
+                        })
+            return discovered
+        else:
+            return None
+
     def only_has_link_up(self):
         """Return True if this interface is only set to LINK_UP."""
         ip_addresses = self.ip_addresses.exclude(

=== modified file 'src/maasserver/models/tests/test_interface.py'
--- src/maasserver/models/tests/test_interface.py	2015-10-30 16:14:33 +0000
+++ src/maasserver/models/tests/test_interface.py	2015-10-31 23:55:40 +0000
@@ -222,6 +222,38 @@
             }))
         self.assertThat(interface.get_links(), MatchesListwise(links))
 
+    def test_get_discovered_returns_None_when_empty(self):
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
+        self.assertIsNone(interface.get_discovered())
+
+    def test_get_discovered_returns_discovered_address_for_ipv4_and_ipv6(self):
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
+        discovered_ips = []
+        network_v4 = factory.make_ipv4_network()
+        subnet_v4 = factory.make_Subnet(cidr=unicode(network_v4.cidr))
+        ip_v4 = factory.pick_ip_in_network(network_v4)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.DISCOVERED, ip=ip_v4,
+            subnet=subnet_v4, interface=interface)
+        discovered_ips.append(
+            MatchesDict({
+                "ip_address": Equals(ip_v4),
+                "subnet": Equals(subnet_v4),
+            }))
+        network_v6 = factory.make_ipv6_network()
+        subnet_v6 = factory.make_Subnet(cidr=unicode(network_v6.cidr))
+        ip_v6 = factory.pick_ip_in_network(network_v6)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.DISCOVERED, ip=ip_v6,
+            subnet=subnet_v6, interface=interface)
+        discovered_ips.append(
+            MatchesDict({
+                "ip_address": Equals(ip_v6),
+                "subnet": Equals(subnet_v6),
+            }))
+        self.assertThat(
+            interface.get_discovered(), MatchesListwise(discovered_ips))
+
     def test_delete_deletes_related_ip_addresses(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         discovered_ip = factory.make_StaticIPAddress(
@@ -806,7 +838,7 @@
             "Unknown interfaces should have been deleted.")
         self.assertEqual(num_connections, interface.ip_addresses.count())
         for i in range(num_connections):
-            ip = interface.ip_addresses.all()[i]
+            ip = interface.ip_addresses.order_by('id')[i]
             self.assertThat(ip, MatchesStructure.byEquality(
                 alloc_type=IPADDRESS_TYPE.DISCOVERED, subnet=subnet_list[i],
                 ip=unicode(IPNetwork(cidr_list[i]).ip)))

=== modified file 'src/maasserver/static/js/angular/controllers/node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/node_details_networking.js	2015-10-30 16:35:25 +0000
+++ src/maasserver/static/js/angular/controllers/node_details_networking.js	2015-10-31 23:55:40 +0000
@@ -557,6 +557,11 @@
             }
         };
 
+        // Get the subnet from its ID.
+        $scope.getSubnet = function(subnetId) {
+            return SubnetsManager.getItemFromList(subnetId);
+        };
+
         // Toggle showing or hiding the members of the interface.
         $scope.toggleMembers = function(nic) {
             var idx = $scope.showingMembers.indexOf(nic.id);

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2015-10-30 16:35:25 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js	2015-10-31 23:55:40 +0000
@@ -1035,6 +1035,20 @@
         });
     });
 
+    describe("getSubnet", function() {
+
+        it("calls SubnetsManager.getItemFromList", function() {
+            var controller = makeController();
+            var subnetId = makeInteger(0, 100);
+            var subnet = {};
+            spyOn(SubnetsManager, "getItemFromList").and.returnValue(subnet);
+
+            expect($scope.getSubnet(subnetId)).toBe(subnet);
+            expect(SubnetsManager.getItemFromList).toHaveBeenCalledWith(
+                subnetId);
+        });
+    });
+
     describe("toggleMembers", function() {
 
         it("adds interface id to showingMembers", function() {

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2015-10-30 16:43:21 +0000
+++ src/maasserver/static/partials/node-details.html	2015-10-31 23:55:40 +0000
@@ -415,14 +415,18 @@
                                 </div>
                                 <div class="table__data table__column--18">
                                     <select class="table__input" name="subnet" id="subnet"
+                                        data-ng-hide="isAllNetworkingDisabled() && interface.discovered[0].subnet_id"
                                         data-ng-model="interface.subnet"
                                         data-ng-change="subnetChanged(interface)"
                                         data-ng-options="subnet as getSubnetText(subnet) for subnet in subnets | filterByVLAN:interface.vlan">
                                         <option value="" data-ng-hide="interface.links.length > 1">Unconfigured</option>
                                     </select>
+                                    <span class="ng-hide" data-ng-show="isAllNetworkingDisabled() && interface.discovered[0].subnet_id">
+                                        {$ getSubnetText(getSubnet(interface.discovered[0].subnet_id)) $}
+                                    </span>
                                 </div>
-                                <div class="table__data table__column--14">
-                                    <ul class="no-bullets">
+                                <div class="table__data table__column--21">
+                                    <ul class="no-bullets" data-ng-hide="isAllNetworkingDisabled()">
                                         <li>
                                             <select class="table__input" name="link-mode" id="link-mode"
                                                 data-ng-model="interface.mode"
@@ -441,8 +445,14 @@
                                                 data-ng-disabled="interface.mode != 'static'">
                                         </li>
                                     </ul>
+                                    <span class="ng-hide" data-ng-show="isAllNetworkingDisabled() && !interface.discovered[0].ip_address">
+                                        {$ interface.ip_address $} ({$ getLinkModeText(interface) $})
+                                    </span>
+                                    <span class="ng-hide" data-ng-show="isAllNetworkingDisabled() && interface.discovered[0].ip_address">
+                                        {$ interface.discovered[0].ip_address $} (DHCP)
+                                    </span>
                                 </div>
-                                <div class="table__data table__column--13">
+                                <div class="table__data table__column--6">
                                     <div class="table__controls align-right">
                                         <a class="icon add"
                                             data-ng-click="quickAdd(interface)"
@@ -500,14 +510,14 @@
                                                 <option value="" data-ng-hide="newInterface.type === 'alias'">Unconfigured</option>
                                             </select>
                                         </div>
-                                        <div class="table__data table__column--14">
+                                        <div class="table__data table__column--21">
                                             <select class="table__input" name="link-mode" id="link-mode"
                                                 data-ng-model="newInterface.mode"
                                                 data-ng-disabled="isLinkModeDisabled(newInterface)"
                                                 data-ng-options="mode.mode as mode.text for mode in modes | filterLinkModes:newInterface">
                                             </select>
                                         </div>
-                                        <div class="table__data table_column--13"></div>
+                                        <div class="table__data table_column--6"></div>
                                     </div>
                                     <div class="table__row table__dropdown-row">
                                         <div class="ng-hide" data-ng-show="isShowingInterfaceOptions()">

=== modified file 'src/maasserver/tests/test_forms_interface.py'
--- src/maasserver/tests/test_forms_interface.py	2015-09-16 20:14:09 +0000
+++ src/maasserver/tests/test_forms_interface.py	2015-10-31 23:55:40 +0000
@@ -806,3 +806,58 @@
             "bond_lacp_rate": new_bond_lacp_rate,
             "bond_xmit_hash_policy": new_bond_xmit_hash_policy,
             }, interface.params)
+
+    def test__edit_allows_zero_params(self):
+        parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
+        parent2 = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=parent1.node)
+        interface = factory.make_Interface(
+            INTERFACE_TYPE.BOND,
+            parents=[parent1, parent2])
+        bond_mode = factory.pick_choice(BOND_MODE_CHOICES)
+        bond_miimon = random.randint(0, 1000)
+        bond_downdelay = random.randint(0, 1000)
+        bond_updelay = random.randint(0, 1000)
+        bond_lacp_rate = factory.pick_choice(BOND_LACP_RATE_CHOICES)
+        bond_xmit_hash_policy = factory.pick_choice(
+            BOND_XMIT_HASH_POLICY_CHOICES)
+        interface.params = {
+            "bond_mode": bond_mode,
+            "bond_miimon": bond_miimon,
+            "bond_downdelay": bond_downdelay,
+            "bond_updelay": bond_updelay,
+            "bond_lacp_rate": bond_lacp_rate,
+            "bond_xmit_hash_policy": bond_xmit_hash_policy,
+        }
+        interface.save()
+        new_vlan = factory.make_VLAN(vid=33)
+        new_name = factory.make_name()
+        new_bond_mode = factory.pick_choice(BOND_MODE_CHOICES)
+        new_bond_miimon = 0
+        new_bond_downdelay = 0
+        new_bond_updelay = 0
+        new_bond_lacp_rate = factory.pick_choice(BOND_LACP_RATE_CHOICES)
+        new_bond_xmit_hash_policy = factory.pick_choice(
+            BOND_XMIT_HASH_POLICY_CHOICES)
+        form = BondInterfaceForm(
+            instance=interface,
+            data={
+                'vlan': new_vlan.id,
+                'name': new_name,
+                'bond_mode': new_bond_mode,
+                'bond_miimon': new_bond_miimon,
+                'bond_downdelay': new_bond_downdelay,
+                'bond_updelay': new_bond_updelay,
+                'bond_lacp_rate': new_bond_lacp_rate,
+                'bond_xmit_hash_policy': new_bond_xmit_hash_policy,
+            })
+        self.assertTrue(form.is_valid(), form.errors)
+        interface = form.save()
+        self.assertEquals({
+            "bond_mode": new_bond_mode,
+            "bond_miimon": new_bond_miimon,
+            "bond_downdelay": new_bond_downdelay,
+            "bond_updelay": new_bond_updelay,
+            "bond_lacp_rate": new_bond_lacp_rate,
+            "bond_xmit_hash_policy": new_bond_xmit_hash_policy,
+            }, interface.params)

=== modified file 'src/maasserver/websockets/handlers/node.py'
--- src/maasserver/websockets/handlers/node.py	2015-10-29 20:10:11 +0000
+++ src/maasserver/websockets/handlers/node.py	2015-10-31 23:55:40 +0000
@@ -498,7 +498,7 @@
             subnet = link.pop("subnet", None)
             if subnet is not None:
                 link["subnet_id"] = subnet.id
-        return {
+        data = {
             "id": interface.id,
             "type": interface.type,
             "name": interface.get_name(),
@@ -517,6 +517,21 @@
             "links": links,
         }
 
+        # When the node is commissioning display the discovered IP address for
+        # this interface. This will only be shown on interfaces that are
+        # connected to a MAAS managed subnet.
+        if obj.status == NODE_STATUS.COMMISSIONING:
+            discovereds = interface.get_discovered()
+            if discovereds is not None:
+                for discovered in discovereds:
+                    # Replace the subnet object with the subnet_id. The client
+                    # will use this information to pull the subnet information
+                    # from the websocket.
+                    discovered["subnet_id"] = discovered.pop("subnet").id
+                data["discovered"] = discovereds
+
+        return data
+
     def dehydrate_summary_output(self, obj, data):
         """Dehydrate the machine summary output."""
         # Produce a "clean" composite details document.

=== modified file 'src/maasserver/websockets/handlers/tests/test_node.py'
--- src/maasserver/websockets/handlers/tests/test_node.py	2015-10-29 20:10:11 +0000
+++ src/maasserver/websockets/handlers/tests/test_node.py	2015-10-31 23:55:40 +0000
@@ -557,9 +557,9 @@
                 filesystem.fstype in FILESYSTEM_FORMAT_TYPE_CHOICES_DICT),
             }, handler.dehydrate_filesystem(filesystem))
 
-    def test_dehydrate_interface(self):
+    def test_dehydrate_interface_for_ready_node(self):
         owner = factory.make_User()
-        node = factory.make_Node(owner=owner)
+        node = factory.make_Node(owner=owner, status=NODE_STATUS.READY)
         handler = NodeHandler(owner, {})
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
         factory.make_StaticIPAddress(
@@ -587,6 +587,45 @@
             "links": expected_links,
             }, handler.dehydrate_interface(interface, node))
 
+    def test_dehydrate_interface_for_commissioning_node(self):
+        owner = factory.make_User()
+        node = factory.make_Node(owner=owner, status=NODE_STATUS.COMMISSIONING)
+        handler = NodeHandler(owner, {})
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.AUTO, ip="",
+            subnet=factory.make_Subnet(), interface=interface)
+        expected_links = interface.get_links()
+        for link in expected_links:
+            link["subnet_id"] = link.pop("subnet").id
+        discovered_subnet = factory.make_Subnet()
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.DISCOVERED,
+            ip=factory.pick_ip_in_network(discovered_subnet.get_ipnetwork()),
+            subnet=discovered_subnet, interface=interface)
+        expected_discovered = interface.get_discovered()
+        for discovered in expected_discovered:
+            discovered["subnet_id"] = discovered.pop("subnet").id
+        self.assertEquals({
+            "id": interface.id,
+            "type": interface.type,
+            "name": interface.get_name(),
+            "enabled": interface.is_enabled(),
+            "is_boot": interface == node.boot_interface,
+            "mac_address": "%s" % interface.mac_address,
+            "vlan_id": interface.vlan_id,
+            "parents": [
+                nic.id
+                for nic in interface.parents.all()
+            ],
+            "children": [
+                nic.child.id
+                for nic in interface.children_relationships.all()
+            ],
+            "links": expected_links,
+            "discovered": expected_discovered,
+        }, handler.dehydrate_interface(interface, node))
+
     def test_dehydrate_summary_output_returns_None(self):
         owner = factory.make_User()
         node = factory.make_Node(owner=owner)