Merge ~ltrager/maas:lp1750160 into maas:master

[Lee Trager]

LP: #1750160 - Confirm running tests on deployed hardware in the UI.

[Andres Rodriguez (andreserl)]

comments inline.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1750160 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1657/console
COMMIT: 6f85a208971c44b12ade7b2d8e1c9d12473d71f8

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Code looks good. Need to fix some of Andres comments about the wording. Marking needs fixing only because you need to fix the wording.

review: Needs Fixing

6179dea... by Lee Trager on 2018-02-21

andreserl fixes

33e47cf... by Lee Trager on 2018-02-21

Merge branch 'master' into lp1750160

[Lee Trager (ltrager)]

Messages fixed and replied inline.

d375923... by Lee Trager on 2018-02-21

blake_r fix

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

diff --git a/src/maasserver/static/js/angular/controllers/node_details.js b/src/maasserver/static/js/angular/controllers/node_details.js
index 7bce8bc..9431f12 100644
--- a/src/maasserver/static/js/angular/controllers/node_details.js
+++ b/src/maasserver/static/js/angular/controllers/node_details.js
@@ -33,7 +33,8 @@ angular.module('MAAS').controller('NodeDetailsController', [
           option: null,
           allOptions: null,
           availableOptions: [],
-          error: null
+          error: null,
+          showing_confirmation: false
         };
         $scope.power_types = GeneralManager.getData("power_types");
         $scope.osinfo = GeneralManager.getData("osinfo");
@@ -525,12 +526,14 @@ angular.module('MAAS').controller('NodeDetailsController', [
         $scope.action.optionChanged = function() {
             // Clear the action error.
             $scope.action.error = null;
+            $scope.action.showing_confirmation = false;
         };
 
         // Cancel the action.
         $scope.actionCancel = function() {
             $scope.action.option = null;
             $scope.action.error = null;
+            $scope.action.showing_confirmation = false;
         };
 
         // Perform the action.
@@ -586,6 +589,11 @@ angular.module('MAAS').controller('NodeDetailsController', [
                     extra.testing_scripts.push('none');
                 }
             } else if($scope.action.option.name === "test") {
+                if($scope.node.status_code === 6 &&
+                        !$scope.action.showing_confirmation) {
+                    $scope.action.showing_confirmation = true;
+                    return;
+                }
                 // Set the test options.
                 extra.enable_ssh = $scope.commissionOptions.enableSSH;
                 extra.testing_scripts = [];
@@ -611,6 +619,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
                     }
                     $scope.action.option = null;
                     $scope.action.error = null;
+                    $scope.action.showing_confirmation = false;
                     $scope.osSelection.$reset();
                     $scope.commissionOptions.enableSSH = false;
                     $scope.commissionOptions.skipNetworking = false;
diff --git a/src/maasserver/static/js/angular/controllers/nodes_list.js b/src/maasserver/static/js/angular/controllers/nodes_list.js
index fce5e35..cfe4e17 100644
--- a/src/maasserver/static/js/angular/controllers/nodes_list.js
+++ b/src/maasserver/static/js/angular/controllers/nodes_list.js
@@ -57,7 +57,9 @@ angular.module('MAAS').controller('NodesListController', [
         $scope.tabs.nodes.actionProgress = {
             total: 0,
             completed: 0,
-            errors: {}
+            errors: {},
+            showing_confirmation: false,
+            affected_nodes: 0
         };
         $scope.tabs.nodes.osSelection = {
             osystem: null,
@@ -98,7 +100,9 @@ angular.module('MAAS').controller('NodesListController', [
         $scope.tabs.devices.actionProgress = {
             total: 0,
             completed: 0,
-            errors: {}
+            errors: {},
+            showing_confirmation: false,
+            affected_nodes: 0
         };
         $scope.tabs.devices.zoneSelection = null;
 
@@ -126,7 +130,9 @@ angular.module('MAAS').controller('NodesListController', [
         $scope.tabs.controllers.actionProgress = {
             total: 0,
             completed: 0,
-            errors: {}
+            errors: {},
+            showing_confirmation: false,
+            affected_nodes: 0
         };
         $scope.tabs.controllers.zoneSelection = null;
         $scope.tabs.controllers.syncStatuses = {};
@@ -156,7 +162,9 @@ angular.module('MAAS').controller('NodesListController', [
         $scope.tabs.switches.actionProgress = {
             total: 0,
             completed: 0,
-            errors: {}
+            errors: {},
+            showing_confirmation: false,
+            affected_nodes: 0
         };
         $scope.tabs.switches.osSelection = {
             osystem: null,
@@ -309,6 +317,8 @@ angular.module('MAAS').controller('NodesListController', [
             var progress = $scope.tabs[tab].actionProgress;
             progress.completed = progress.total = 0;
             progress.errors = {};
+            progress.showing_confirmation = false;
+            progress.affected_nodes = 0;
         }
 
         // Add error to action progress and group error messages by nodes.
@@ -599,6 +609,19 @@ angular.module('MAAS').controller('NodesListController', [
                     extra.testing_scripts.push('none');
                 }
             } else if($scope.tabs[tab].actionOption.name === "test") {
+                if(!$scope.tabs[tab].actionProgress.showing_confirmation) {
+                    var progress = $scope.tabs[tab].actionProgress;
+                    for(i=0;i<$scope.tabs[tab].selectedItems.length;i++) {
+                        if($scope.tabs[tab].selectedItems[i].status_code === 6)
+                        {
+                            progress.showing_confirmation = true;
+                            progress.affected_nodes++;
+                        }
+                    }
+                    if($scope.tabs[tab].actionProgress.affected_nodes != 0) {
+                        return;
+                    }
+                }
                 // Set the test options.
                 extra.enable_ssh = (
                     $scope.tabs[tab].commissionOptions.enableSSH);
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_node_details.js b/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
index 6044827..b786b50 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
@@ -195,6 +195,7 @@ describe("NodeDetailsController", function() {
         expect($scope.action.allOptions).toBeNull();
         expect($scope.action.availableOptions).toEqual([]);
         expect($scope.action.error).toBeNull();
+        expect($scope.action.showing_confirmation).toBe(false);
         expect($scope.osinfo).toBe(GeneralManager.getData("osinfo"));
         expect($scope.power_types).toBe(GeneralManager.getData("power_types"));
         expect($scope.osSelection.osystem).toBeNull();
@@ -918,6 +919,13 @@ describe("NodeDetailsController", function() {
             $scope.actionCancel();
             expect($scope.action.error).toBeNull();
         });
+
+        it("resets showing_confirmation", function() {
+            var controller = makeController();
+            $scope.action.showing_confirmation = true;
+            $scope.actionCancel();
+            expect($scope.action.showing_confirmation).toBe(false);
+        });
     });
 
     describe("actionGo", function() {
@@ -1063,6 +1071,20 @@ describe("NodeDetailsController", function() {
                 });
         });
 
+        it("sets showing_confirmation with testOptions", function() {
+            var controller = makeController();
+            spyOn(MachinesManager, "performAction").and.returnValue(
+                $q.defer().promise);
+            node.status_code = 6;
+            $scope.node = node;
+            $scope.action.option = {
+                name: "test"
+            };
+            $scope.actionGo();
+            expect($scope.action.showing_confirmation).toBe(true);
+            expect(MachinesManager.performAction).not.toHaveBeenCalled();
+        });
+
         it("calls performAction with releaseOptions", function() {
             var controller = makeController();
             spyOn(MachinesManager, "performAction").and.returnValue(
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js b/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
index 35430a7..f49aa4a 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
@@ -1182,10 +1182,18 @@ describe("NodesListController", function() {
                         makeInteger(0, 10);
                     $scope.tabs[tab].actionProgress.errors[makeName("error")] =
                         [{}];
+                    $scope.tabs[tab].actionProgress.showing_confirmation =
+                        true;
+                    $scope.tabs[tab].actionProgress.affected_nodes =
+                        makeInteger(0, 10);
                     $scope.actionCancel(tab);
                     expect($scope.tabs[tab].actionProgress.total).toBe(0);
                     expect($scope.tabs[tab].actionProgress.completed).toBe(0);
                     expect($scope.tabs[tab].actionProgress.errors).toEqual({});
+                    expect($scope.tabs[
+                        tab].actionProgress.showing_confirmation).toBe(false);
+                    expect($scope.tabs[
+                        tab].actionProgress.affected_nodes).toBe(0);
                 });
             });
 
@@ -1566,6 +1574,26 @@ describe("NodesListController", function() {
                         });
             });
 
+            it("sets showing_confirmation with testOptions",
+                function() {
+                    var controller = makeController();
+                    var object = makeObject("nodes");
+                    object.status_code = 6;
+                    var spy = spyOn(
+                        $scope.tabs.nodes.manager,
+                        "performAction").and.returnValue(
+                            $q.defer().promise);
+                    $scope.tabs.nodes.actionOption = { name: "test" };
+                    $scope.tabs.nodes.selectedItems = [object];
+                    $scope.actionGo("nodes");
+                    expect($scope.tabs[
+                        "nodes"].actionProgress.showing_confirmation).toBe(
+                            true);
+                    expect($scope.tabs[
+                        "nodes"].actionProgress.affected_nodes).toBe(1);
+                    expect(spy).not.toHaveBeenCalled();
+            });
+
             it("calls performAction with releaseOptions",
                 function() {
                     var controller = makeController();
diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index e7a3380..8d71466 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -187,6 +187,17 @@
                     </form>
                 </div>
             </div>
+            <div class="row ng-hide" data-ng-show="action.showing_confirmation && action.option.name === 'test'">
+                <div class="col-12">
+                    <p>
+                        <i class="p-icon--warning">Warning:</i> Node is currently deployed. Are you sure you want to continue to test hardware?
+                    </p>
+                    <div class="u-align--right">
+                        <button class="p-button--base" data-ng-click="actionCancel()">No</button>
+                        <button class="p-button--neutral" data-ng-click="actionGo()">Yes</button>
+                    </div>
+                </div>
+            </div>
             <div class="row ng-hide" data-ng-show="isActionError()">
                 <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
                 <div class="col-12">
diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
index da2b251..fea51bd 100644
--- a/src/maasserver/static/partials/nodes-list.html
+++ b/src/maasserver/static/partials/nodes-list.html
@@ -262,7 +262,17 @@
                     </p>
                 </div>
             </section>
-
+            <section class="page-header__section row u-no-margin--top ng-hide" data-ng-show="tabs[tab].actionProgress.showing_confirmation">
+                <div class="col-12">
+                    <p>
+                        <i class="p-icon--warning">Warning:</i> {$ tabs[tab].actionProgress.affected_nodes $} of {$ tabs[tab].selectedItems.length $} are in a deployed state. Are you sure you want to continue to test hardware?
+                    </p>
+                    <div class="u-align--right">
+                        <button class="p-button--base" data-ng-click="actionCancel(tab)">No</button>
+                        <button class="p-button--neutral" data-ng-click="actionGo(tab)">Yes</button>
+                    </div>
+                </div>
+            </section>
             <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
             <section class="page-header__section row u-no-margin--top ng-hide" data-ng-show="hasActionsInProgress(tab) || hasActionsFailed(tab)">
                 <div class="col-12">