Merge lp:~ltrager/maas/lp1654432 into lp:~maas-committers/maas/trunk

[Lee Trager]

Allow GA kernels to be selected when deploying on the node-details page.

[Gavin Panella (allenap)]

review: Approve

[Andres Rodriguez (andreserl)]

please backport this to 2.1

On Mon, Jan 9, 2017 at 3:34 AM, Gavin Panella <email address hidden>
wrote:

> Review: Approve
>
>
> --
> https://code.launchpad.net/~ltrager/maas/lp1654432/+merge/314193
> You are subscribed to branch lp:maas.
>

--
Andres Rodriguez (RoAkSoAx)
Ubuntu Server Developer
MSc. Telecom & Networking
Systems Engineer

=== modified file 'src/maasserver/static/js/angular/controllers/node_details.js'
--- src/maasserver/static/js/angular/controllers/node_details.js	2016-12-07 12:46:14 +0000
+++ src/maasserver/static/js/angular/controllers/node_details.js	2017-01-06 00:30:19 +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-12-07 12:46:14 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2017-01-06 00:30:19 +0000
@@ -1082,6 +1082,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(