Repository: ambari Updated Branches: refs/heads/trunk 251c741bc -> c6fa8c26f
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6fa8c26/ambari-web/app/mixins/common/configs/toggle_isrequired.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/configs/toggle_isrequired.js b/ambari-web/app/mixins/common/configs/toggle_isrequired.js index cc2cc35..c29fc54 100644 --- a/ambari-web/app/mixins/common/configs/toggle_isrequired.js +++ b/ambari-web/app/mixins/common/configs/toggle_isrequired.js @@ -27,11 +27,11 @@ App.ToggleIsRequiredMixin = Em.Mixin.create({ var excludeProperties = [ { name: 'KERBEROS', // affected service - exclude: ['kdc_host', 'admin_server_host', 'admin_principal', 'admin_password'] // affected properties + exclude: ['kdc_hosts', 'admin_server_host', 'admin_principal', 'admin_password'] // affected properties }, { name: 'KERBEROS_GENERAL', // affected service - exclude: ['kdc_host', 'admin_server_host', 'admin_principal', 'admin_password'] // affected properties + exclude: ['kdc_hosts', 'admin_server_host', 'admin_principal', 'admin_password'] // affected properties } ]; var serviceName = serviceConfigs.get('serviceName'), http://git-wip-us.apache.org/repos/asf/ambari/blob/c6fa8c26/ambari-web/app/models/configs/objects/service_config_property.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js index e7eaebd..77eb332 100644 --- a/ambari-web/app/models/configs/objects/service_config_property.js +++ b/ambari-web/app/models/configs/objects/service_config_property.js @@ -429,7 +429,7 @@ App.ServiceConfigProperty = Em.Object.extend({ break; case 'supportTextConnection': case 'host': - var connectionProperties = ['kdc_host']; + var connectionProperties = ['kdc_hosts']; if ((validator.isNotTrimmed(value) && connectionProperties.contains(this.get('name')) || validator.isNotTrimmed(value))) { this.set('errorMessage', Em.I18n.t('host.trimspacesValidation')); isError = true; http://git-wip-us.apache.org/repos/asf/ambari/blob/c6fa8c26/ambari-web/app/views/common/controls_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js index 2514d9d..1fd8dd4 100644 --- a/ambari-web/app/views/common/controls_view.js +++ b/ambari-web/app/views/common/controls_view.js @@ -1014,7 +1014,7 @@ App.CheckDBConnectionView = Ember.View.extend({ if (!/wizard/i.test(this.get('controller.name')) && this.get('parentView.service.serviceName') === 'HIVE') { return this.get('parentView.service.serviceName').toLowerCase() + '_hostname'; } else if (this.get('parentView.service.serviceName') === 'KERBEROS') { - return 'kdc_host'; + return 'kdc_hosts'; } else if (this.get('parentView.service.serviceName') === 'RANGER') { return '{0}_{1}_host'.format(this.get('parentView.service.serviceName').toLowerCase(), this.get('databaseName').toLowerCase()); } @@ -1027,7 +1027,7 @@ App.CheckDBConnectionView = Ember.View.extend({ var propertiesMap = { OOZIE: ['oozie.db.schema.name', 'oozie.service.JPAService.jdbc.username', 'oozie.service.JPAService.jdbc.password', 'oozie.service.JPAService.jdbc.driver', 'oozie.service.JPAService.jdbc.url'], HIVE: ['ambari.hive.db.schema.name', 'javax.jdo.option.ConnectionUserName', 'javax.jdo.option.ConnectionPassword', 'javax.jdo.option.ConnectionDriverName', 'javax.jdo.option.ConnectionURL'], - KERBEROS: ['kdc_host'], + KERBEROS: ['kdc_hosts'], RANGER: App.get('isHadoop23Stack') ? ['db_user', 'db_password', 'db_name', 'ranger.jpa.jdbc.url', 'ranger.jpa.jdbc.driver'] : ['db_user', 'db_password', 'db_name', 'ranger_jdbc_connection_url', 'ranger_jdbc_driver'] }; @@ -1036,7 +1036,7 @@ App.CheckDBConnectionView = Ember.View.extend({ /** @property {Object} propertiesPattern - check pattern according to type of connection properties **/ propertiesPattern: function() { var patterns = { - db_connection_url: /jdbc\.url|connection_url|connectionurl|kdc_host/ig + db_connection_url: /jdbc\.url|connection_url|connectionurl|kdc_hosts/ig }; if (this.get('parentView.service.serviceName') != "KERBEROS") { patterns.user_name = /(username|dblogin|db_user)$/ig; @@ -1050,7 +1050,7 @@ App.CheckDBConnectionView = Ember.View.extend({ 'OOZIE': 'oozie_server_hosts', 'HDFS': 'hadoop_host', 'HIVE': 'hive_metastore_hosts', - 'KERBEROS': 'kdc_host', + 'KERBEROS': 'kdc_hosts', 'RANGER': 'ranger_server_hosts' }; return this.get('parentView.categoryConfigsAll').findProperty('name', serviceMasterMap[this.get('parentView.service.serviceName')]).get('value'); http://git-wip-us.apache.org/repos/asf/ambari/blob/c6fa8c26/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js index beacc63..28264e4 100644 --- a/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js +++ b/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js @@ -65,13 +65,13 @@ describe('App.KerberosWizardStep2Controller', function() { stepConfigs: [ ['realm', ' SPACES ', 'host'], ['admin_server_host', ' space_left', 'host'], - ['kdc_host', ' space_left_and_right ', 'host'], + ['kdc_hosts', ' space_left_and_right ', 'host'], ['ldap_url', 'space_right ', 'host'] ], e: { realm: 'SPACES', admin_server_host: 'space_left', - kdc_host: 'space_left_and_right', + kdc_hosts: 'space_left_and_right', ldap_url: 'space_right' } } http://git-wip-us.apache.org/repos/asf/ambari/blob/c6fa8c26/ambari-web/test/mixins/common/configs/toggle_isrequired_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/mixins/common/configs/toggle_isrequired_test.js b/ambari-web/test/mixins/common/configs/toggle_isrequired_test.js index 4672ae6..acf2dae 100644 --- a/ambari-web/test/mixins/common/configs/toggle_isrequired_test.js +++ b/ambari-web/test/mixins/common/configs/toggle_isrequired_test.js @@ -29,7 +29,7 @@ describe('#_overrideConfigIsRequired', function () { instanceObject = mixinObject.create({}); configs = Em.A([ - App.ServiceConfigProperty.create({ name: 'kdc_host', value: '', category: 'KDC', serviceName: 'KERBEROS', isRequired: true}), + App.ServiceConfigProperty.create({ name: 'kdc_hosts', value: '', category: 'KDC', serviceName: 'KERBEROS', isRequired: true}), App.ServiceConfigProperty.create({ name: 'admin_server_host', value: '', category: 'KDC', serviceName: 'KERBEROS', isRequired: true}), App.ServiceConfigProperty.create({ name: 'admin_principal', value: '', category: 'KDC', serviceName: 'KERBEROS', isRequired: true}), App.ServiceConfigProperty.create({ name: 'admin_password', value: '', category: 'KDC', serviceName: 'KERBEROS', isRequired: true}) http://git-wip-us.apache.org/repos/asf/ambari/blob/c6fa8c26/ambari-web/test/views/common/controls_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/common/controls_view_test.js b/ambari-web/test/views/common/controls_view_test.js index dca7911..c5c5338 100644 --- a/ambari-web/test/views/common/controls_view_test.js +++ b/ambari-web/test/views/common/controls_view_test.js @@ -625,7 +625,7 @@ describe('App.CheckDBConnectionView', function () { value: 'h0' }), Em.Object.create({ - name: 'kdc_host', + name: 'kdc_hosts', value: 'h1' }), Em.Object.create({
