AMBARI-2555: Security Wizard: Create separate page for principal/keytab

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

@@ -30,7 +30,9 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
   globalProperties: [],
 
   isSubmitDisabled: true,
-  isBackBtnDisabled: true,
+  isBackBtnDisabled: function () {
+    return !this.get('stages').someProperty('isError', true);
+  }.property('stages.@each.isCompleted'),
 
   isOozieSelected: function () {
     return this.get('content.services').someProperty('serviceName', 'OOZIE');
@@ -69,34 +71,35 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
     this.get('serviceConfigTags').clear();
   },
 
+  retry: function () {
+    if (this.get('stages').someProperty('isError', true)) {
+      var failedStages = this.get('stages').filterProperty('isError', true);
+      failedStages.setEach('isError', false);
+      failedStages.setEach('isSuccess', false);
+      failedStages.setEach('isStarted', false);
+    }
+    this.moveToNextStage();
+  },
+
   loadStep: function () {
     this.set('secureMapping', require('data/secure_mapping').slice(0));
-    var stages = App.db.getSecurityDeployStages();
     this.clearStep();
+    var stages = App.db.getSecurityDeployStages();
     this.prepareSecureConfigs();
     if (stages && stages.length > 0) {
       stages.forEach(function (_stage, index) {
         stages[index] = App.Poll.create(_stage);
       }, this);
-      var stopServices = stages.findProperty('name', 'STOP_SERVICES');
-      var runningOperation = App.router.get('backgroundOperationsController.services').findProperty('isRunning');
-      if(stopServices.get('isStarted')){
-        if(stopServices.get('isCompleted') || !runningOperation || !(runningOperation.get('name') === 'Stop All Services')){
-          stopServices.set('requestId', undefined);
-          stopServices.set('isError', false);
-          stopServices.set('isSuccess', false);
-          stopServices.set('isStarted', false);
-        }
-      }
       if (stages.someProperty('isError', true)) {
-        var failedStages = stages.filterProperty('isError', true);
-        failedStages.setEach('isError', false);
-        failedStages.setEach('isStarted', false);
+        this.get('stages').pushObjects(stages);
+        return;
       } else if (stages.filterProperty('isStarted', true).someProperty('isCompleted', false)) {
         var runningStage = stages.filterProperty('isStarted', true).findProperty('isCompleted', false);
         runningStage.set('isStarted', false);
+        this.get('stages').pushObjects(stages);
+      } else {
+        this.get('stages').pushObjects(stages);
       }
-      this.get('stages').pushObjects(stages);
     } else {
       this.loadStages();
       this.addInfoToStages();
@@ -111,14 +114,15 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
   },
 
   enableSubmit: function () {
+    var addSecurityController = App.router.get('addSecurityController');
     if (this.get('stages').someProperty('isError', true) || this.get('stages').everyProperty('isSuccess', true)) {
       this.set('isSubmitDisabled', false);
       if (this.get('stages').someProperty('isError', true)) {
-        this.set('isBackBtnDisabled', false);
-        App.router.get('addSecurityController').setStepsEnable();
+        addSecurityController.setStepsEnable();
       }
     } else {
       this.set('isSubmitDisabled', true);
+      addSecurityController.setLowerStepsDisable(4);
     }
   }.observes('stages.@each.isCompleted'),
 
@@ -236,7 +240,7 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
     }, this);
     var dependentConfig = this.get('secureMapping').filterProperty('foreignKey');
     dependentConfig.forEach(function (_config) {
-      if (App.Service.find().mapProperty('serviceName').contains( _config.serviceName)) {
+      if (App.Service.find().mapProperty('serviceName').contains(_config.serviceName)) {
         this.setConfigValue(uiConfig, _config);
         uiConfig.pushObject({
           "id": "site property",
@@ -249,13 +253,15 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
     return uiConfig;
   },
 
-  checkServiceForConfigValue: function(value, serviceName, replace) {
+
+  checkServiceForConfigValue: function (value, serviceName, replace) {
     if (!App.Service.find().mapProperty('serviceName').contains(serviceName)) {
       value = value.replace(replace, '');
     }
     return value;
   },
 
+
   /**
    * Set all site property that are derived from other puppet-variable
    */
@@ -369,6 +375,15 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
         value: hiveHostName
       });
     }
+    var webHcatComponent = App.Service.find('WEBHCAT').get('hostComponents').findProperty('componentName', 'WEBHCAT_SERVER');
+    if (this.isWebHcatSelected() && webHcatComponent) {
+      var webHcatHostName = webHcatComponent.get('host.hostName');
+      this.get('globalProperties').pushObject({
+        id: 'puppet var',
+        name: 'webhcat_server',
+        value: webHcatHostName
+      });
+    }
   },
 
   loadStaticGlobal: function () {
@@ -452,7 +467,11 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
   },
 
   loadClusterConfigsErrorCallback: function (request, ajaxOptions, error) {
-    this.get('stages').findProperty('stage', 'stage3').set('isError', true);
+    var stage3 = this.get('stages').findProperty('stage', 'stage3');
+    if (stage3) {
+      stage3.set('isSuccess', false);
+      stage3.set('isError', true);
+    }
     console.log("TRACE: error code status is: " + request.status);
   },
 
@@ -505,11 +524,16 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
     if (this.get('noOfWaitingAjaxCalls') == 0) {
       var currentStage = this.get('stages').findProperty('stage', 'stage3');
       currentStage.set('isSuccess', true);
+      currentStage.set('isError', false);
     }
   },
 
   applyConfigurationToClusterErrorCallback: function (request, ajaxOptions, error) {
-    this.get('stages').findProperty('stage', 'stage3').set('isError', true);
+    var stage3 = this.get('stages').findProperty('stage', 'stage3');
+    if (stage3) {
+      stage3.set('isSuccess', false);
+      stage3.set('isError', true);
+    }
   },
 
   /**
@@ -537,10 +561,14 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
 
   getAllConfigurationsSuccessCallback: function (data) {
     console.log("TRACE: In success function for the GET getServiceConfigsFromServer call");
+    var stage3 = this.get('stages').findProperty('stage', 'stage3');
     this.get('serviceConfigTags').forEach(function (_tag) {
       if (!data.items.someProperty('type', _tag.siteName)) {
         console.log("Error: Metadata for secure services (secure_configs.js) is having config tags that are not being retrieved from server");
-        this.get('stages').findProperty('stage', 'stage3').set('isError', true);
+        if (stage3) {
+          stage3.set('isSuccess', false);
+          stage3.set('isError', true);
+        }
       }
       _tag.configs = data.items.findProperty('type', _tag.siteName).properties;
     }, this);
@@ -549,7 +577,11 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
   },
 
   getAllConfigurationsErrorCallback: function (request, ajaxOptions, error) {
-    this.get('stages').findProperty('stage', 'stage3').set('isError', true);
+    var stage3 = this.get('stages').findProperty('stage', 'stage3');
+    if (stage3) {
+      stage3.set('isSuccess', false);
+      stage3.set('isError', true);
+    }
     console.log("TRACE: In error function for the getServiceConfigsFromServer call");
     console.log("TRACE: error code status is: " + request.status);
   },
@@ -568,7 +600,9 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
           zkPrincipalName.value = zkPrincipalName.value + '@' + realmName.value;
         }
         this.get('globalProperties').forEach(function (_globalProperty) {
-          _serviceConfigTags.configs[_globalProperty.name] = _globalProperty.value;
+          if (!/_hosts?$/.test(_globalProperty.name)) {
+            _serviceConfigTags.configs[_globalProperty.name] = _globalProperty.value;
+          }
         }, this);
       }
       else {
@@ -581,28 +615,32 @@ App.MainAdminSecurityAddStep4Controller = Em.Controller.extend({
 
   saveStages: function () {
     var stages = [];
-    this.get('stages').forEach(function (_stage) {
-      var stage = {
-        name: _stage.get('name'),
-        stage: _stage.get('stage'),
-        label: _stage.get('label'),
-        isPolling: _stage.get('isPolling'),
-        isStarted: _stage.get('isStarted'),
-        requestId: _stage.get('requestId'),
-        isSuccess: _stage.get('isSuccess'),
-        isError: _stage.get('isError'),
-        url: _stage.get('url'),
-        polledData: _stage.get('polledData'),
-        data: _stage.get('data')
-      };
-      stages.pushObject(stage);
-    }, this);
-    App.db.setSecurityDeployStages(stages);
-    App.clusterStatus.setClusterStatus({
-      clusterName: this.get('clusterName'),
-      clusterState: 'ADD_SECURITY_STEP_4',
-      wizardControllerName: App.router.get('addSecurityController.name'),
-      localdb: App.db.data
-    });
-  }.observes('stages.@each.requestId', 'stages.@each.isStarted', 'stages.@each.isCompleted')
-});
+    if (this.get('stages').length === 3) {
+      this.get('stages').forEach(function (_stage) {
+        var stage = {
+          name: _stage.get('name'),
+          stage: _stage.get('stage'),
+          label: _stage.get('label'),
+          isPolling: _stage.get('isPolling'),
+          isStarted: _stage.get('isStarted'),
+          requestId: _stage.get('requestId'),
+          isSuccess: _stage.get('isSuccess'),
+          isError: _stage.get('isError'),
+          url: _stage.get('url'),
+          polledData: _stage.get('polledData'),
+          data: _stage.get('data')
+        };
+        stages.pushObject(stage);
+      }, this);
+      App.db.setSecurityDeployStages(stages);
+      if (!App.testMode) {
+        App.clusterStatus.setClusterStatus({
+          clusterName: this.get('clusterName'),
+          clusterState: 'ADD_SECURITY_STEP_3',
+          wizardControllerName: App.router.get('addSecurityController.name'),
+          localdb: App.db.data.AddSecurity
+        });
+      }
+    }
+  }.observes('stages.@each.requestId')
+});

ambari-web/app/messages.js

@@ -658,8 +658,8 @@ Em.I18n.translations = {
   'admin.addSecurity.apply.stage4': '3. Start Services',
   'admin.addSecurity.apply.stage5': '5. Smoke Test',
   'admin.addSecurity.user.smokeUser': 'Ambari Smoke Test User',
-  'admin.addSecurity.user.hdfsUser': 'Ambari HDFS Test User',
-  'admin.addSecurity.user.hbaseUser': 'Ambari HBase Test User',
+  'admin.addSecurity.user.hdfsUser': 'HDFS User',
+  'admin.addSecurity.user.hbaseUser': 'HBase User',
   'admin.addSecurity.user.httpUser': 'SPNEGO User',
   'admin.addSecurity.enable.onClose': 'You are in the process of enabling security on your cluster. ' +
     'Are you sure you want to quit? If you quit, ' +

ambari-web/app/routes/add_security.js

@@ -111,7 +111,7 @@ module.exports = Em.Route.extend({
           clusterName: this.get('clusterName'),
           clusterState: 'ADD_SECURITY_STEP_1',
           wizardControllerName: router.get('addSecurityController.name'),
-          localdb: App.db.data
+          localdb: App.db.data.AddSecurity
         });
       }
     },
@@ -142,7 +142,7 @@ module.exports = Em.Route.extend({
           clusterName: this.get('clusterName'),
           clusterState: 'ADD_SECURITY_STEP_2',
           wizardControllerName: router.get('addSecurityController.name'),
-          localdb: App.db.data
+          localdb:  App.db.data.AddSecurity
         });
       }
     },
@@ -174,7 +174,7 @@ module.exports = Em.Route.extend({
           clusterName: this.get('clusterName'),
           clusterState: 'ADD_SECURITY_STEP_3',
           wizardControllerName: router.get('addSecurityController.name'),
-          localdb: App.db.data
+          localdb:  App.db.data.AddSecurity
         });
       }
     },
@@ -195,14 +195,6 @@ module.exports = Em.Route.extend({
 
     enter: function (router) {
       router.get('addSecurityController').setCurrentStep('4');
-      if(!App.testMode){
-        App.clusterStatus.setClusterStatus({
-          clusterName: this.get('clusterName'),
-          clusterState: 'ADD_SECURITY_STEP_4',
-          wizardControllerName: router.get('addSecurityController.name'),
-          localdb: App.db.data
-        });
-      }
     },
 
     connectOutlets: function (router) {

ambari-web/app/routes/main.js

@@ -662,8 +662,9 @@ module.exports = Em.Route.extend({
             controller.setAddSecurityWizardStatus(currentClusterStatus.localdb.status);
             App.db.setServiceConfigProperties(currentClusterStatus.localdb.secureConfigProperties);
             App.db.setWizardCurrentStep('AddSecurity', currentClusterStatus.localdb.currentStep);
+            App.db.setDisableSecurityStatus(currentClusterStatus.localdb.disableSecurityStatus);
           }
-          App.db.setDisableSecurityStatus(currentClusterStatus.localdb.disableSecurityStatus);
+
         }
         if (!(controller.getAddSecurityWizardStatus() === 'RUNNING') && !(controller.getDisableSecurityStatus() === 'RUNNING')) {
           Em.run.next(function () {

ambari-web/app/templates/main/admin/security/add/step1.hbs

@@ -31,5 +31,5 @@
 
 
 <div class="btn-area">
-    <a class="btn btn-success pull-right" {{action "next"}}>Next &rarr;</a>
+    <a class="btn btn-success pull-right" {{action "next"}}>{{t common.next}} &rarr;</a>
 </div>

ambari-web/app/templates/main/admin/security/add/step2.hbs

@@ -28,6 +28,6 @@
     <a class="btn" {{action back}}>&larr; {{t common.back}}</a>
 
     <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}}
-      {{action submit target="controller"}}>{{t common.apply}} &rarr;</a>
+      {{action submit target="controller"}}>{{t common.next}} &rarr;</a>
   </div>
 </div>

ambari-web/app/templates/main/admin/security/add/step3.hbs

@@ -44,6 +44,6 @@
     <a class="btn" {{action back}}>&larr; {{t common.back}}</a>
     <div class="pull-right">
         <a class="btn btn-info" {{action doDownloadCsv target="controller"}}>{{t admin.security.step3.downloadCSV}}</a>
-        <a class="btn btn-success" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.proceed}} &rarr;</a>
+        <a class="btn btn-success" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.apply}} &rarr;</a>
     </div>
 </div>