Merge ~blake-rouse/maas:fix-1756985 into maas:master

[Blake Rouse]

Fixes LP: #1756985 - Fix websocket from setting the default for select power parameter types incorrectly. Return a deepcopy of the RPC cached result so the cache cannot be corrupted.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix-1756985 lp:~blake-rouse/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2011/console
COMMIT: 0f11c25e0a019ea2215683bbaf1214477b84b188

review: Needs Fixing

[Newell Jensen (newell-jensen)]

+1

review: Approve

diff --git a/src/maasserver/rpc/regionservice.py b/src/maasserver/rpc/regionservice.py
index d03ff32..3fbe51f 100644
--- a/src/maasserver/rpc/regionservice.py
+++ b/src/maasserver/rpc/regionservice.py
@@ -9,6 +9,7 @@ __all__ = [
 ]
 
 from collections import defaultdict
+import copy
 from datetime import (
     datetime,
     timedelta,
@@ -769,7 +770,7 @@ class RackClient(common.Client):
         if cmd in call_cache:
             # Call has already been made over this connection, just return
             # the original result.
-            return succeed(call_cache[cmd])
+            return succeed(copy.deepcopy(call_cache[cmd]))
         else:
             # First time this call has been made so cache the result so
             # so the next call over this connection will just be returned
diff --git a/src/maasserver/rpc/tests/test_regionservice.py b/src/maasserver/rpc/tests/test_regionservice.py
index 246c58b..b235f90 100644
--- a/src/maasserver/rpc/tests/test_regionservice.py
+++ b/src/maasserver/rpc/tests/test_regionservice.py
@@ -635,9 +635,22 @@ class TestRackClient(MAASTestCase):
         conn = DummyConnection()
         client = RackClient(conn, {})
         call_cache = client._getCallCache()
-        call_cache[cluster.DescribePowerTypes] = sentinel.power_types
+        power_types = {
+            "power_types": [
+                {
+                    'name': 'ipmi',
+                },
+                {
+                    'name': 'wedge',
+                },
+            ]
+        }
+        call_cache[cluster.DescribePowerTypes] = power_types
         result = yield client(cluster.DescribePowerTypes)
-        self.assertIs(sentinel.power_types, result)
+        # The result is a copy. It should equal the result but not be
+        # the same object.
+        self.assertEquals(power_types, result)
+        self.assertIsNot(power_types, result)
 
     @wait_for_reactor
     @inlineCallbacks
diff --git a/src/maasserver/static/js/angular/directives/power_parameters.js b/src/maasserver/static/js/angular/directives/power_parameters.js
index a96fe5a..01fb2ee 100644
--- a/src/maasserver/static/js/angular/directives/power_parameters.js
+++ b/src/maasserver/static/js/angular/directives/power_parameters.js
@@ -93,13 +93,8 @@ angular.module('MAAS').directive('maasPowerInput', ['$compile',
 
                     // Set the default choice on the model.
                     if(angular.isUndefined(scope.ngModel)) {
-                        var i;
-                        for(i = 0; i < scope.field.choices.length; i++) {
-                            var choice = scope.field.choices[i];
-                            if(scope.field["default"] === choice[0]) {
-                                scope.ngModel = choice;
-                                break;
-                            }
+                        if(scope.field["default"]) {
+                            scope.ngModel = scope.field["default"];
                         }
                     }
                 } else {
diff --git a/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js b/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js
index a2f8a7f..82d3cda 100644
--- a/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js
+++ b/src/maasserver/static/js/angular/directives/tests/test_power_parameters.js
@@ -133,7 +133,7 @@ describe("maasPowerParameters", function() {
             var directive = compileDirective("field", "value");
             var select = directive.find("select");
             expect(select.attr("name")).toBe("test");
-            expect($scope.value).toBe(choice2);
+            expect($scope.value).toBe("name2");
         });
 
         it("creates input with ng-disabled", function() {