Merge ~andreserl/maas:ui_arch_filter into maas:master

[Andres Rodriguez]

LP: #1659379 - Add architecture filter.

[Björn Tillenius (bjornt)]

The changes look good, but I'm missing tests for the changes you did (or justification why tests can't be added).

review: Needs Fixing

[Andres Rodriguez (andreserl)]

09:30 < blake_r> roaksoax: no unit tests on the page since its done in the HTML
09:31 < blake_r> roaksoax: but all the logic that performs the searching is already unit tested
09:32 < blake_r> roaksoax: so adding another filter should just be strait forward with no tests really

[Björn Tillenius (bjornt)]

Well, I don't agree with Blake here. I think HTML should be unit tested, since there's quite a lot of logic in there.

That said, I can understand that we don't have a framework for testing that HTML yet, so I guess I'll approve this branch without those tests in place.

As Blake also mentioned on IRC, there should be a test for the Python changes you made. That one should be trivial to add.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b ui_arch_filter lp:~andreserl/maas into -b master lp:~maas-committers/maas

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

[MAAS Lander (maas-lander)]

LANDING
-b ui_arch_filter lp:~andreserl/maas into -b master lp:~maas-committers/maas

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

dfbb06b... by Andres Rodriguez on 2017-09-26

Fix tests

diff --git a/src/maasserver/static/js/angular/factories/machines.js b/src/maasserver/static/js/angular/factories/machines.js
index c5e50a0..cad4b33 100644
--- a/src/maasserver/static/js/angular/factories/machines.js
+++ b/src/maasserver/static/js/angular/factories/machines.js
@@ -19,6 +19,7 @@ angular.module('MAAS').factory(
             this._handler = "machine";
 
             this._metadataAttributes = {
+                "architecture": null,
                 "status": null,
                 "owner": null,
                 "tags": null,
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 3539b61..9c0d05f 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(
-            ["status", "owner", "tags", "zone", "subnets", "fabrics",
-            "spaces", "storage_tags", "release"]);
+            ["architecture", "status", "owner", "tags", "zone", "subnets",
+             "fabrics", "spaces", "storage_tags", "release"]);
     });
 
     describe("mountSpecialFilesystem", function() {
diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
index 85b43f6..e8076f3 100644
--- a/src/maasserver/static/partials/nodes-list.html
+++ b/src/maasserver/static/partials/nodes-list.html
@@ -702,6 +702,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.architecture.length">
+                        <button class="accordion__tab-title maas-accordion-tab">Architectures</button>
+                        <div class="accordion__tab-content">
+                            <ul class="accordion__tab-list">
+                                <li class="accordion__tab-item" data-ng-repeat="architecture in tabs.nodes.metadata.architecture | orderBy:['name', '-count']" data-ng-class="{ 'is-active': isFilterActive('architecture', architecture.name, 'nodes') }">
+                                    <button class="accordion__tab-link" data-ng-click="toggleFilter('architecture', architecture.name, 'nodes')"><span data-maas-release-name="architecture.name"></span> ({$ architecture.count $})</button>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
                     <div class="ng-hide accordion__tab" data-ng-show="tabs.nodes.metadata.release.length">
                         <button class="accordion__tab-title maas-accordion-tab">OS/Release</button>
                         <div class="accordion__tab-content">
diff --git a/src/maasserver/websockets/handlers/node.py b/src/maasserver/websockets/handlers/node.py
index 5014fa8..4883ebf 100644
--- a/src/maasserver/websockets/handlers/node.py
+++ b/src/maasserver/websockets/handlers/node.py
@@ -120,6 +120,7 @@ class NodeHandler(TimestampedModelHandler):
             for tag in obj.tags.all()
         ]
         if obj.node_type != NODE_TYPE.DEVICE:
+            data["architecture"] = obj.architecture
             data["memory"] = obj.display_memory()
             data["status"] = obj.display_status()
             data["status_code"] = obj.status
diff --git a/src/maasserver/websockets/handlers/node_result.py b/src/maasserver/websockets/handlers/node_result.py
index f9c8e76..181c568 100644
--- a/src/maasserver/websockets/handlers/node_result.py
+++ b/src/maasserver/websockets/handlers/node_result.py
@@ -95,8 +95,6 @@ class NodeResultHandler(TimestampedModelHandler):
             }]
         else:
             data["results"] = []
-            if results is None:
-                results = {}
             for key, value in results.get("results", {}).items():
                 if obj.script is not None:
                     if isinstance(obj.script.results, dict):
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 34918d4..2e06070 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -268,6 +268,7 @@ class TestMachineHandler(MAASServerTestCase):
         if for_list:
             allowed_fields = MachineHandler.Meta.list_fields + [
                 "actions",
+                "architecture",
                 "fqdn",
                 "status",
                 "status_code",
diff --git a/src/metadataserver/models/scriptresult.py b/src/metadataserver/models/scriptresult.py
index ac3add2..d48de40 100644
--- a/src/metadataserver/models/scriptresult.py
+++ b/src/metadataserver/models/scriptresult.py
@@ -128,7 +128,7 @@ class ScriptResult(CleanSave, TimestampedModel):
 
         if parsed_yaml is None:
             # No results were given.
-            return None
+            return {}
         elif not isinstance(parsed_yaml, dict):
             raise ValidationError('YAML must be a dictionary.')
 
diff --git a/src/metadataserver/models/tests/test_scriptresult.py b/src/metadataserver/models/tests/test_scriptresult.py
index 9d21978..1125163 100644
--- a/src/metadataserver/models/tests/test_scriptresult.py
+++ b/src/metadataserver/models/tests/test_scriptresult.py
@@ -413,7 +413,7 @@ class TestScriptResult(MAASServerTestCase):
 
     def test_read_results_ignores_empty(self):
         script_result = factory.make_ScriptResult(result=b'')
-        self.assertIsNone(script_result.read_results())
+        self.assertDictEqual({}, script_result.read_results())
 
     def test_read_results_does_not_require_results(self):
         result = {'status': random.choice(