Merge ~ya-bo-ng/maas:add-note-to-machine-listing into maas:master

[Anthony Dillon]

Add note to machine listing

Add note to machine listing and add random with notes to the sample data to make it easier to review.

## QA
- Run `make clean+db`
- Run `make`
- Run `make syncdb`
- Run `make sampledata`
- Run `make start`
- Then load the machine listing
- See you get some notes on machines in the Pool column
- Hover should reveal the rest of the note

## Screenshot
https://screenshots.firefox.com/gCdTZr4jhCpW4Eyd/10.54.72.65

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[Caleb Ellis (caleb-ellis)]

LGTM! You'll probably get an error in the machine websocket test though because you've added another field

review: Approve

[Anthony Dillon (ya-bo-ng)]

The WS field was added by Blake: https://code.launchpad.net/~blake-rouse/maas/+git/maas/+merge/364264

[MAAS Lander (maas-lander)]

LANDING
-b add-note-to-machine-listing lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5512/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b add-note-to-machine-listing lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5514/consoleText

ee62a4d... by Anthony Dillon on 2019-04-18

Fix tests

diff --git a/src/maasserver/static/partials/machines-table.html b/src/maasserver/static/partials/machines-table.html
index 64de02f..6317850 100644
--- a/src/maasserver/static/partials/machines-table.html
+++ b/src/maasserver/static/partials/machines-table.html
@@ -32,7 +32,10 @@
                 <span role="columnheader" data-ng-click="sortTable('owner')" data-ng-class="{'is-sorted': table.predicate === 'owner', 'sort-asc': table.reverse === false, 'sort-desc': table.reverse === true}">Owner,</span>
                 <div>Tags</div>
             </th>
-            <th class="p-table__col--pool" title="Pool" role="columnheader" data-ng-click="sortTable('pool.name')" data-ng-class="{'is-sorted': table.predicate === 'pool.name', 'sort-asc': table.reverse === false, 'sort-desc': table.reverse === true}">Pool</th>
+            <th class="p-table__col--pool p-double-row" title="Pool, Note">
+                <span role="columnheader" data-ng-click="sortTable('pool.name')" data-ng-class="{'is-sorted': table.predicate === 'pool.name', 'sort-asc': table.reverse === false, 'sort-desc': table.reverse === true}">Pool,</span>
+                <div>Note</div>
+            </th>
             <th class="p-table__col--zone p-double-row" title="Zone">
                 <span role="columnheader" data-ng-click="sortTable('zone.name')" data-ng-class="{'is-sorted': table.predicate === 'zone.name', 'sort-asc': table.reverse === false, 'sort-desc': table.reverse === true}">Zone</span>
             </th>
@@ -245,11 +248,18 @@
                     </span>
                 </div>
             </td>
-            <td class="p-table__col--pool" aria-label="{$ node.pool.name $}">
+            <td class="p-table__col--pool p-double-row" aria-label="Pool, Note">
                 <div class="p-table-menu">
-                    <i class="p-icon--spinner u-animation--spin" data-ng-if="node['set-pool-transition']">Setting pool</i>
-                    <span data-ng-if="node.pool.name"><a class="p-link--soft" href="#/pools" title="{$ node.pool.name $}"> {$ node.pool.name $}</a></span>
-                    <span data-ng-if="!node.pool.name">-</span>
+                    <div class="p-double-row__rows-container">
+                        <div class="p-double-row__main-row" aria-label="Pool">
+                            <i class="p-icon--spinner u-animation--spin" data-ng-if="node['set-pool-transition']">Setting pool</i>
+                            <span data-ng-if="node.pool.name"><a class="p-link--soft" href="#/pools" title="{$ node.pool.name $}"> {$ node.pool.name $}</a></span>
+                            <span data-ng-if="!node.pool.name">-</span>
+                        </div>
+                        <div data-ng-if="node.description" class="p-double-row__muted-row" aria-label="Note" title="{$ node.description $}">
+                            <span>{$ node.description $}</span>
+                        </div>
+                    </div>
                     <button
                         data-ng-if="node.actions.indexOf('set-pool') !== -1"
                         data-ng-click="toggleMenu(node.system_id + '-pool')"
diff --git a/src/maasserver/testing/factory.py b/src/maasserver/testing/factory.py
index 365ab2a..ec327a4 100644
--- a/src/maasserver/testing/factory.py
+++ b/src/maasserver/testing/factory.py
@@ -394,7 +394,7 @@ class Factory(maastesting.factory.Factory):
 
     def make_Node(
             self, interface=False, hostname=None, domain=None, status=None,
-            architecture="i386/generic", min_hwe_kernel=None,
+            architecture="i386/generic", description=None, min_hwe_kernel=None,
             hwe_kernel=None, node_type=NODE_TYPE.MACHINE, updated=None,
             created=None, zone=None, networks=None, sortable_name=False,
             power_type=None, power_parameters=None, power_state=None,
@@ -418,6 +418,8 @@ class Factory(maastesting.factory.Factory):
             hostname = self.make_string(20)
         if domain is None:
             domain = Domain.objects.get_default_domain()
+        if description is None:
+            description = ''
         if sortable_name:
             hostname = hostname.lower()
         if status is None:
@@ -436,7 +438,7 @@ class Factory(maastesting.factory.Factory):
         node = Node(
             hostname=hostname, status=status, architecture=architecture,
             min_hwe_kernel=min_hwe_kernel, hwe_kernel=hwe_kernel,
-            node_type=node_type, zone=zone,
+            node_type=node_type, zone=zone, description=description,
             power_state=power_state, power_state_updated=power_state_updated,
             domain=domain, bmc=bmc, hardware_uuid=hardware_uuid,
             ephemeral_deploy=ephemeral_deploy, **kwargs)
diff --git a/src/maasserver/testing/sampledata.py b/src/maasserver/testing/sampledata.py
index c34e42f..42454f8 100644
--- a/src/maasserver/testing/sampledata.py
+++ b/src/maasserver/testing/sampledata.py
@@ -429,6 +429,12 @@ def populate_main():
             interface=False, with_boot_disk=False, power_type='manual',
             domain=random.choice(domains),
             memory=random.choice([1024, 4096, 8192]),
+            description=random.choice([
+                '',
+                'Scheduled for removeal',
+                'Firmware old',
+                'Earmarked for Project Fuse in April'
+            ]),
             cpu_count=random.randint(2, 8))
         machine.set_random_hostname()
         machines.append(machine)
diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
index 8be7f10..2bb40e6 100644
--- a/src/maasserver/websockets/handlers/machine.py
+++ b/src/maasserver/websockets/handlers/machine.py
@@ -235,6 +235,7 @@ class MachineHandler(NodeHandler):
             "owner",
             "cpu_count",
             "cpu_speed",
+            "description",
             "memory",
             "power_state",
             "domain",
diff --git a/src/maasserver/websockets/handlers/node.py b/src/maasserver/websockets/handlers/node.py
index 1a25fa7..76a27f3 100644
--- a/src/maasserver/websockets/handlers/node.py
+++ b/src/maasserver/websockets/handlers/node.py
@@ -260,6 +260,7 @@ class NodeHandler(TimestampedModelHandler):
             data["distro_series"] = obj.distro_series
             data["memory"] = obj.display_memory()
             data["status"] = obj.display_status()
+            data["description"] = obj.description
             data["status_code"] = obj.status
 
         # Filters are only available on machines and devices.