Merge lp:~ltrager/maas/lp1654432_2.1 into lp:maas/2.1

[Lee Trager]

Backport r5628 from trunk: Allow GA kernels to be selected when deploying on the node-details page.

[Lee Trager (ltrager)]

Reviewed in https://code.launchpad.net/~ltrager/maas/lp1654432/+merge/314193

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-12-21 12:55:00 +0000
+++ docs/changelog.rst	2017-01-09 22:40:17 +0000
@@ -38,6 +38,8 @@
 
 LP: #1651452    Use correct escaping for EFI's kernel command line datasource_list.
 
+LP: #1654432    Unable to deploy ga kernel on node-details page
+
 
 2.1.2
 =====

=== modified file 'src/maasserver/static/js/angular/controllers/node_details.js'
--- src/maasserver/static/js/angular/controllers/node_details.js	2016-09-21 14:49:23 +0000
+++ src/maasserver/static/js/angular/controllers/node_details.js	2017-01-09 22:40:17 +0000
@@ -616,7 +616,8 @@
                 extra.distro_series = release;
                 // hwe_kernel is optional so only include it if its specified
                 if(angular.isString($scope.osSelection.hwe_kernel) &&
-                   ($scope.osSelection.hwe_kernel.indexOf('hwe-') >= 0)) {
+                   ($scope.osSelection.hwe_kernel.indexOf('hwe-') >= 0 ||
+                    $scope.osSelection.hwe_kernel.indexOf('ga-') >= 0)) {
                     extra.hwe_kernel = $scope.osSelection.hwe_kernel;
                 }
             } else if($scope.actionOption.name === "commission") {

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2016-09-22 15:05:38 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2017-01-09 22:40:17 +0000
@@ -1049,6 +1049,46 @@
                 });
         });
 
+        it("calls performAction with hwe kernel", function() {
+            var controller = makeController();
+            spyOn(MachinesManager, "performAction").and.returnValue(
+                $q.defer().promise);
+            $scope.node = node;
+            $scope.actionOption = {
+                name: "deploy"
+            };
+            $scope.osSelection.osystem = "ubuntu";
+            $scope.osSelection.release = "ubuntu/xenial";
+            $scope.osSelection.hwe_kernel = "hwe-16.04-edge";
+            $scope.actionGo();
+            expect(MachinesManager.performAction).toHaveBeenCalledWith(
+                node, "deploy", {
+                    osystem: "ubuntu",
+                    distro_series: "xenial",
+                    hwe_kernel: "hwe-16.04-edge"
+                });
+        });
+
+        it("calls performAction with ga kernel", function() {
+            var controller = makeController();
+            spyOn(MachinesManager, "performAction").and.returnValue(
+                $q.defer().promise);
+            $scope.node = node;
+            $scope.actionOption = {
+                name: "deploy"
+            };
+            $scope.osSelection.osystem = "ubuntu";
+            $scope.osSelection.release = "ubuntu/xenial";
+            $scope.osSelection.hwe_kernel = "ga-16.04";
+            $scope.actionGo();
+            expect(MachinesManager.performAction).toHaveBeenCalledWith(
+                node, "deploy", {
+                    osystem: "ubuntu",
+                    distro_series: "xenial",
+                    hwe_kernel: "ga-16.04"
+                });
+        });
+
         it("calls performAction with commissionOptions", function() {
             var controller = makeController();
             spyOn(MachinesManager, "performAction").and.returnValue(