AMBARI-2163. Add smoke tests as part of starting all services in security wizard. (jaimin)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1484539 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -12,6 +12,9 @@ Trunk (unreleased changes):
 
  NEW FEATURES
 
+ AMBARI-2163. Add smoke tests as part of starting all services in
+ security wizard. (jaimin)
+
  AMBARI-2140. Improve Ambari-agent test coverage. (swagle)
 
  AMBARI-2133. Add Nagios alerts for Hadoop 2.0 in Ambari. (swagle)

ambari-web/app/controllers/main/admin/security/add/step3.js

@@ -77,7 +77,7 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
         newService.hosts.push({
           name: name,
           publicName: name,
-          logTasks: stages.polledData.filterProperty("Tasks.host_name",name)
+          logTasks: stages.polledData.filterProperty("Tasks.host_name", name)
         });
       });
       services.push(newService);
@@ -102,13 +102,8 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
       } else if (currentStage && currentStage.get('stage') === 'stage3') {
         if (App.testMode) {
           currentStage.set('isSuccess', true);
-          currentStage.set('isCompleted', true);
-          this.moveToNextStage();
         } else {
-          var self = this;
-          window.setTimeout(function () {
-            self.loadClusterConfigs();
-          }, 12000);
+          this.loadClusterConfigs();
         }
       }
     }
@@ -117,12 +112,9 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
   onCompleteStage: function () {
     var index = this.get('stages').filterProperty('isCompleted', true).length;
     if (index > 0) {
-      var self = this;
       var lastCompletedStageResult = this.get('stages').objectAt(index - 1).get('isSuccess');
       if (lastCompletedStageResult) {
-        window.setTimeout(function () {
-          self.moveToNextStage();
-        }, 50);
+        this.moveToNextStage();
       }
     }
   }.observes('stages.@each.isCompleted'),
@@ -136,7 +128,6 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
 
   addInfoToStages: function () {
     this.addInfoToStage2();
-    this.addInfoToStage3();
     this.addInfoToStage4();
   },
 
@@ -157,13 +148,9 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
     stage2.set('data', data);
   },
 
-  addInfoToStage3: function () {
-
-  },
-
   addInfoToStage4: function () {
     var stage4 = this.get('stages').findProperty('stage', 'stage4');
-    var url = (App.testMode) ? '/data/wizard/deploy/2_hosts/poll_1.json' : App.apiPrefix + '/clusters/' + App.router.getClusterName() + '/services';
+    var url = (App.testMode) ? '/data/wizard/deploy/2_hosts/poll_1.json' : App.apiPrefix + '/clusters/' + App.router.getClusterName() + '/services?params/run_smoke_test=true';
     var data = '{"RequestInfo": {"context": "' + Em.I18n.t('requestInfo.startAllServices') + '"}, "Body": {"ServiceInfo": {"state": "STARTED"}}}';
     stage4.set('url', url);
     stage4.set('data', data);
@@ -343,7 +330,7 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
       serviceUsers.pushObject({id: 'puppet var', name: 'hbase_user', value: 'hbase'});
       serviceUsers.pushObject({id: 'puppet var', name: 'hive_user', value: 'hive'});
     } else {
-      App.router.get('mainAdminSecurityController').getSecurityStatusFromServer();
+      App.router.get('mainAdminSecurityController').setSecurityStatus();
     }
   },
 
@@ -425,7 +412,6 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
     if (this.get('noOfWaitingAjaxCalls') == 0) {
       var currentStage = this.get('stages').findProperty('stage', 'stage3');
       currentStage.set('isSuccess', true);
-      currentStage.set('isCompleted', true);
     }
   },
 

ambari-web/app/controllers/main/admin/security/disable.js

@@ -84,10 +84,7 @@ App.MainAdminSecurityDisableController = Em.Controller.extend({
           currentStage.set('isCompleted', true);
           this.moveToNextStage();
         } else {
-          var self = this;
-          window.setTimeout(function () {
-            self.loadClusterConfigs();
-          }, 12000);
+          this.loadClusterConfigs();
         }
       }
     }
@@ -96,10 +93,9 @@ App.MainAdminSecurityDisableController = Em.Controller.extend({
   onCompleteStage: function () {
     var index = this.get('stages').filterProperty('isCompleted', true).length;
     if (index > 0) {
-      var self = this;
       var lastCompletedStageResult = this.get('stages').objectAt(index - 1).get('isSuccess');
       if (lastCompletedStageResult) {
-        self.moveToNextStage();
+        this.moveToNextStage();
       }
     }
   }.observes('stages.@each.isCompleted'),
@@ -127,7 +123,6 @@ App.MainAdminSecurityDisableController = Em.Controller.extend({
 
   addInfoToStages: function () {
     this.addInfoToStage2();
-    this.addInfoToStage3();
     this.addInfoToStage4();
   },
 
@@ -148,13 +143,9 @@ App.MainAdminSecurityDisableController = Em.Controller.extend({
     stage2.set('data', data);
   },
 
-  addInfoToStage3: function () {
-
-  },
-
   addInfoToStage4: function () {
     var stage4 = this.get('stages').findProperty('stage', 'stage4');
-    var url = (App.testMode) ? '/data/wizard/deploy/2_hosts/poll_1.json' : App.apiPrefix + '/clusters/' + App.router.getClusterName() + '/services';
+    var url = (App.testMode) ? '/data/wizard/deploy/2_hosts/poll_1.json' : App.apiPrefix + '/clusters/' + App.router.getClusterName() + '/services?params/run_smoke_test=true';
     var data = '{"RequestInfo": {"context": "' + Em.I18n.t('requestInfo.startAllServices') + '"}, "Body": {"ServiceInfo": {"state": "STARTED"}}}';
     stage4.set('url', url);
     stage4.set('data', data);
@@ -277,7 +268,6 @@ App.MainAdminSecurityDisableController = Em.Controller.extend({
     if (this.get('noOfWaitingAjaxCalls') == 0) {
       var currentStage = this.get('stages').findProperty('stage', 'stage3');
       currentStage.set('isSuccess', true);
-      currentStage.set('isCompleted', true);
     }
   },
 
@@ -322,9 +312,6 @@ App.MainAdminSecurityDisableController = Em.Controller.extend({
               case 'zookeeper.znode.parent':
                 _serviceConfigTags.configs[configName] = '/hbase-unsecure';
                 break;
-              case 'oozie.service.AuthorizationService.authorization.enabled':
-                _serviceConfigTags.configs[configName] = 'false';
-                break;
               default:
                 delete _serviceConfigTags.configs[configName];
             }

ambari-web/app/data/secure_properties.js

@@ -23,7 +23,7 @@ module.exports =
       "name": "security_enabled",
       "displayName": "Enable security",
       "value": "",
-      "defaultValue": "true",
+      "defaultValue":true,
       "description": "Enable kerberos security for the cluster",
       "isVisible": false,
       "isOverridable": false,

ambari-web/app/templates/main/service/reconfigure.hbs

@@ -21,11 +21,11 @@
     {{#each stage in controller.stages}}
       {{#view App.StageStatusView}}
       <td>
-        {{#if controller.hasHostPopup}}
+        {{#if stage.isPolling}}
           <a  href="javascript:void(0)" {{action "showHostPopup" stage.label target="view"}}>
         {{/if}}
         <p {{bindAttr class="stage.hasStarted::faintText"}}>{{stage.label}}</p>
-        {{#if controller.hasHostPopup}}
+        {{#if stage.isPolling}}
           </a>
         {{/if}}
       </td>

ambari-web/app/views/main/service/reconfigure.js

@@ -19,7 +19,7 @@ var App = require('app');
 
 App.MainServiceReconfigureView = Em.View.extend({
 
-  templateName: require('templates/main/service/reconfigure'),
+  templateName: require('templates/main/service/reconfigure')
 
 });