Merge ~ack/maas:machine-filter-by-pod into maas:master

[Alberto Donato]

LP: #1729555 - add filter by pod in the node listing page

[Blake Rouse (blake-rouse)]

Nicely done! Looks good.

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b machine-filter-by-pod lp:~ack/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/901/console
COMMIT: 2901dd2aedc5dedb4742883bad6ffd7bc372b474

review: Needs Fixing

[MAAS Lander (maas-lander)]

LANDING
-b machine-filter-by-pod lp:~ack/maas into -b master lp:~maas-committers/maas

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

[MAAS Lander (maas-lander)]

UNIT TESTS
-b machine-filter-by-pod lp:~ack/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: b417cc2eaed09280f4aacf822e95bc4f9d7ae83c

review: Approve

diff --git a/src/maasserver/static/js/angular/factories/machines.js b/src/maasserver/static/js/angular/factories/machines.js
index cad4b33..1d56532 100644
--- a/src/maasserver/static/js/angular/factories/machines.js
+++ b/src/maasserver/static/js/angular/factories/machines.js
@@ -23,6 +23,9 @@ angular.module('MAAS').factory(
                 "status": null,
                 "owner": null,
                 "tags": null,
+                "pod": function(machine) {
+                    return (machine.pod === undefined) ? '' :machine.pod.name;
+                },
                 "zone": function(machine) {
                     return machine.zone.name;
                 },
diff --git a/src/maasserver/static/js/angular/factories/tests/test_machines.js b/src/maasserver/static/js/angular/factories/tests/test_machines.js
index 9c0d05f..c4d709b 100644
--- a/src/maasserver/static/js/angular/factories/tests/test_machines.js
+++ b/src/maasserver/static/js/angular/factories/tests/test_machines.js
@@ -34,8 +34,8 @@ describe("MachinesManager", function() {
 
     it("set requires attributes", function() {
         expect(Object.keys(MachinesManager._metadataAttributes)).toEqual(
-            ["architecture", "status", "owner", "tags", "zone", "subnets",
-             "fabrics", "spaces", "storage_tags", "release"]);
+            ["architecture", "status", "owner", "tags", "pod", "zone",
+             "subnets", "fabrics", "spaces", "storage_tags", "release"]);
     });
 
     describe("mountSpecialFilesystem", function() {
diff --git a/src/maasserver/static/js/angular/filters/nodes.js b/src/maasserver/static/js/angular/filters/nodes.js
index c7a5b12..1d3087c 100644
--- a/src/maasserver/static/js/angular/filters/nodes.js
+++ b/src/maasserver/static/js/angular/filters/nodes.js
@@ -32,6 +32,9 @@ angular.module('MAAS').filter('nodesFilter', ['$filter', 'SearchService',
             zone: function(node) {
                 return node.zone.name;
             },
+            pod: function(node) {
+                return (node.pod === undefined) ? undefined : node.pod.name;
+            },
             power: function(node) {
                 return node.power_state;
             },
diff --git a/src/maasserver/static/js/angular/filters/tests/test_nodes.js b/src/maasserver/static/js/angular/filters/tests/test_nodes.js
index 9c2789c..c5c030a 100644
--- a/src/maasserver/static/js/angular/filters/tests/test_nodes.js
+++ b/src/maasserver/static/js/angular/filters/tests/test_nodes.js
@@ -231,6 +231,21 @@ describe("nodesFilter", function() {
         expect(nodesFilter(nodes, "zone:first")).toEqual([matchingNode]);
     });
 
+    it("matches using pod mapping function", function() {
+        var matchingNode = {
+            pod: {
+                name: "pod1"
+            }
+        };
+        var otherNode = {
+            pod: {
+                name: "pod2"
+            }
+        };
+        var nodes = [matchingNode, otherNode];
+        expect(nodesFilter(nodes, "pod:pod1")).toEqual([matchingNode]);
+    });
+
     it("matches using power mapping function", function() {
         var matchingNode = {
             power_state: 'on'
diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
index 004d153..de99b7f 100644
--- a/src/maasserver/static/partials/nodes-list.html
+++ b/src/maasserver/static/partials/nodes-list.html
@@ -751,6 +751,16 @@ sudo maas-rack register --url {$ tabs.controllers.registerUrl $} --secret {$ tab
                             </ul>
                         </div>
                     </div>
+                    <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.pod.length">
+                        <button class="accordion__tab-title maas-accordion-tab">Pods</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="pod in tabs.nodes.metadata.pod | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('pod', pod.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('pod', pod.name, 'nodes')">{$ pod.name $} ({$ pod.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
                     <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.subnets.length">
                         <button class="accordion__tab-title maas-accordion-tab">Subnets</button>
                         <div class="accordion__tab-content">
diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
index 0e46de6..539ecfd 100644
--- a/src/maasserver/websockets/handlers/machine.py
+++ b/src/maasserver/websockets/handlers/machine.py
@@ -210,7 +210,7 @@ class MachineHandler(NodeHandler):
         data["locked"] = obj.locked
         bmc = obj.bmc
         if bmc is not None and bmc.bmc_type == BMC_TYPE.POD:
-            data['pod'] = bmc.id
+            data['pod'] = self.dehydrate_pod(bmc)
 
         if not for_list:
             # Add info specific to a machine.
diff --git a/src/maasserver/websockets/handlers/node.py b/src/maasserver/websockets/handlers/node.py
index 112d602..2c06762 100644
--- a/src/maasserver/websockets/handlers/node.py
+++ b/src/maasserver/websockets/handlers/node.py
@@ -112,6 +112,12 @@ class NodeHandler(TimestampedModelHandler):
             "name": zone.name,
         }
 
+    def dehydrate_pod(self, pod):
+        return {
+            "id": pod.id,
+            "name": pod.name,
+        }
+
     def dehydrate_last_image_sync(self, last_image_sync):
         """Return formatted datetime."""
         return dehydrate_datetime(
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 5619371..a50cff7 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -288,7 +288,7 @@ class TestMachineHandler(MAASServerTestCase):
         }
         bmc = node.bmc
         if bmc is not None and bmc.bmc_type == BMC_TYPE.POD:
-            data['pod'] = bmc.id
+            data['pod'] = {'id': bmc.id, 'name': bmc.name}
         if for_list:
             allowed_fields = MachineHandler.Meta.list_fields + [
                 "actions",
@@ -479,6 +479,24 @@ class TestMachineHandler(MAASServerTestCase):
             "name": zone.name,
             }, handler.dehydrate_zone(zone))
 
+    def test_dehydrate_pod(self):
+        owner = factory.make_User()
+        handler = MachineHandler(owner, {})
+        pod = factory.make_Pod()
+        self.assertEqual(
+            handler.dehydrate_pod(pod),
+            {'id': pod.id, 'name': pod.name})
+
+    def test_dehydrate_node_with_pod(self):
+        owner = factory.make_User()
+        handler = MachineHandler(owner, {})
+        pod = factory.make_Pod()
+        node = factory.make_Node()
+        node.bmc = pod
+        data = {}
+        handler.dehydrate(node, data)
+        self.assertEqual(data['pod'], {'id': pod.id, 'name': pod.name})
+
     def test_dehydrate_power_parameters_returns_None_when_empty(self):
         owner = factory.make_User()
         handler = MachineHandler(owner, {})