AMBARI-12933 Add Oozie service broken. Hangs on Customize service step. (ababiichuk)

ambari-web/app/controllers/wizard/step7_controller.js

@@ -912,7 +912,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
         delete configsMap[type][_config.name];
       }
     });
-    self.setServiceDatabaseConfigs(configs);
     //add user properties
 
     Em.keys(configsMap).forEach(function (filename) {
@@ -937,36 +936,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
     });
   },
 
-  /**
-   * Check if Oozie or Hive use existing database then need
-   * to restore missed properties
-   *
-   * @param {Object[]} configs
-   **/
-  setServiceDatabaseConfigs: function (configs) {
-    var serviceNames = this.get('installedServiceNames').filter(function (serviceName) {
-      return ['OOZIE', 'HIVE'].contains(serviceName);
-    });
-    serviceNames.forEach(function (serviceName) {
-      var propertyPrefix = serviceName.toLowerCase();
-      var dbTypeConfig = configs.findProperty('name', propertyPrefix + '_database');
-      if (!/existing/gi.test(dbTypeConfig.value)) return;
-      var dbHostName = propertyPrefix + '_hostname';
-      var database = dbTypeConfig.value.match(/MySQL|PostgreSQL|Oracle|Derby|MSSQL/gi)[0];
-      var dbPrefix = database.toLowerCase();
-      if (database.toLowerCase() == 'mssql') {
-        if (/integrated/gi.test(dbTypeConfig.value)) {
-          dbPrefix = 'mssql_server_2';
-        } else {
-          dbPrefix = 'mssql_server';
-        }
-      }
-      var propertyName = propertyPrefix + '_existing_' + dbPrefix + '_host';
-      var existingDBConfig = configs.findProperty('name', propertyName);
-      if (existingDBConfig && !existingDBConfig.value)
-        existingDBConfig.value = existingDBConfig.savedValue = configs.findProperty('name', dbHostName).value;
-    }, this);
-  },
   /**
    * Add group ids to <code>groupsToDelete</code>
    * Also save <code>groupsToDelete</code> to local storage

ambari-web/test/controllers/wizard/step7_test.js

@@ -1653,43 +1653,6 @@ describe('App.InstallerStep7Controller', function () {
 
   });
 
-  describe('#setServiceDatabaseConfigs', function () {
-
-    var controller = App.WizardStep7Controller.create({
-      installedServiceNames: ['OOZIE', 'HIVE']
-    });
-    var configs = [
-      {
-        name: 'hive_database',
-        value: 'MySQL',
-        serviceName: 'HIVE',
-        filename: 'hbase-site.xml'
-      },
-      {
-        name: 'oozie_database',
-        value: 'MySQL',
-        serviceName: 'OOZIE',
-        filename: 'ams-hbase-site.xml'
-      }
-    ];
-
-    it('should handle properties with the same name', function () {
-      var services = Em.A([
-        Em.Object.create({
-          isInstalled: true,
-          serviceName: 'SQOOP'
-        }),
-        Em.Object.create({
-          isInstalled: true,
-          serviceName: 'HDFS'
-        })
-      ]);
-      controller.setServiceDatabaseConfigs(configs);
-      var properties = configs.filterProperty('name', 'hive_database');
-      expect(properties).to.have.length(1);
-    });
-  });
-
   describe('#getAmbariDatabaseSuccess', function () {
 
     var controller = App.WizardStep7Controller.create({