You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2014/12/24 14:53:37 UTC
ambari git commit: AMBARI-8905. Field is showing only
for oozie during db reconfiguring from embedded to external. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk bbb346667 -> 14c614fb9
AMBARI-8905. Field <database host> is showing only for oozie during db reconfiguring from embedded to external. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/14c614fb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14c614fb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14c614fb
Branch: refs/heads/trunk
Commit: 14c614fb99726dde426792662f5777e2c1d276f4
Parents: bbb3466
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Dec 24 15:40:24 2014 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Dec 24 15:40:24 2014 +0200
----------------------------------------------------------------------
.../app/controllers/wizard/step8_controller.js | 87 ++++++--------------
ambari-web/app/data/BIGTOP/site_properties.js | 5 --
ambari-web/app/data/HDP2/site_properties.js | 7 --
ambari-web/app/data/PHD/site_properties.js | 5 --
ambari-web/app/data/site_properties.js | 3 -
ambari-web/app/views/wizard/controls_view.js | 3 -
.../test/controllers/wizard/step8_test.js | 37 +++------
7 files changed, 37 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/14c614fb/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index a0f3e6d..fab6fea 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -269,52 +269,39 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
if (configs.someProperty('name', 'hive_ambari_host')) {
configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_ambari_host').value;
}
- hive_properties = Em.A(['hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_oracle_host',
- 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database',
- 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host',
- 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host']);
+ hive_properties = Em.A(['hive_existing_mysql_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database',
+ 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_2_database']);
break;
case 'New PostgreSQL Database':
if (configs.someProperty('name', 'hive_ambari_host')) {
configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_ambari_host').value;
}
- hive_properties = Em.A(['hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_oracle_host',
- 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database']);
+ hive_properties = Em.A(['hive_existing_mysql_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database']);
break;
case 'Existing MySQL Database':
configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_existing_mysql_host').value;
- hive_properties = Em.A(['hive_ambari_host', 'hive_ambari_database', 'hive_existing_oracle_host',
- 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database',
- 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host',
- 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host']);
+ hive_properties = Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database',
+ 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_2_database']);
break;
case Em.I18n.t('services.service.config.hive.oozie.postgresql'):
configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_existing_postgresql_host').value;
- hive_properties = Em.A(['hive_ambari_host', 'hive_ambari_database', 'hive_existing_oracle_host',
- 'hive_existing_oracle_database', 'hive_existing_mysql_host', 'hive_existing_mysql_database',
- 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host',
- 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host']);
+ hive_properties = Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_mysql_database',
+ 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_2_database']);
break;
case 'Existing MSSQL Server database with integrated authentication':
configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_existing_mssql_server_2_host').value;
- hive_properties = Em.A(['hive_ambari_host', 'hive_ambari_database', 'hive_existing_oracle_host',
- 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database',
- 'hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_mssql_server_database',
- 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host']);
+ hive_properties = Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database',
+ 'hive_existing_mysql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_2_database']);
break;
case 'Existing MSSQL Server database with sql auth':
configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_existing_mssql_server_host').value;
- hive_properties = Em.A(['hive_ambari_host', 'hive_ambari_database', 'hive_existing_oracle_host',
- 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database',
- 'hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_mssql_server_database',
- 'hive_existing_mssql_server_host', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host']);
+ hive_properties = Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database',
+ 'hive_existing_mysql_database', 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_database']);
break;
default:
configs.findProperty('name', 'hive_hostname').value = configs.findProperty('name', 'hive_existing_oracle_host').value;
- hive_properties = Em.A(['hive_ambari_host', 'hive_ambari_database', 'hive_existing_mysql_host',
- 'hive_existing_mysql_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database',
- 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_host',
- 'hive_existing_mssql_server_2_database', 'hive_existing_mssql_server_2_host']);
+ hive_properties = Em.A(['hive_ambari_database', 'hive_existing_mysql_database', 'hive_existing_postgresql_database',
+ 'hive_existing_mssql_server_database', 'hive_existing_mssql_server_2_database']);
break;
}
@@ -333,61 +320,39 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
*/
removeOozieConfigs: function (configs) {
var oozieDb = configs.findProperty('name', 'oozie_database');
- var oozieDbType = configs.findProperty('name', 'oozie_database_type');
- if (oozieDbType) {
+ if (oozieDb) {
var oozie_properties = Em.A(['oozie_ambari_host', 'oozie_ambari_database']);
switch (oozieDb.value) {
case 'New Derby Database':
configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_ambari_host').value;
- oozieDbType.value = 'derby';
- oozie_properties = Em.A(['oozie_ambari_host', 'oozie_ambari_database', 'oozie_existing_mysql_host',
- 'oozie_existing_mysql_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database',
- 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database',
- 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host',
- 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host']);
+ oozie_properties = Em.A(['oozie_ambari_database', 'oozie_existing_mysql_database', 'oozie_existing_oracle_database',
+ 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database']);
break;
case 'Existing MySQL Database':
configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_existing_mysql_host').value;
- oozieDbType.value = 'mysql';
- oozie_properties = Em.A(['oozie_ambari_host', 'oozie_ambari_database', 'oozie_existing_oracle_host',
- 'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database',
- 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host',
- 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host']);
+ oozie_properties = Em.A(['oozie_ambari_database', 'oozie_existing_oracle_database', 'oozie_derby_database',
+ 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database']);
break;
case Em.I18n.t('services.service.config.hive.oozie.postgresql'):
configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_existing_postgresql_host').value;
- oozieDbType.value = 'postgresql';
- oozie_properties = Em.A(['oozie_ambari_host', 'oozie_ambari_database', 'oozie_existing_oracle_host',
- 'oozie_existing_oracle_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database',
- 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host',
- 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host']);
+ oozie_properties = Em.A(['oozie_ambari_database', 'oozie_existing_oracle_database', 'oozie_existing_mysql_database',
+ 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database']);
break;
case 'Existing MSSQL Server database with integrated authentication':
configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_existing_mysql_host').value;
- oozieDbType.value = 'mssql';
- hive_properties = Em.A(['hive_ambari_host', 'hive_ambari_database', 'oozie_existing_oracle_host',
- 'oozie_existing_oracle_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database',
- 'oozie_existing_mysql_host', 'oozie_existing_mysql_database',
- 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host',
- 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host']);
+ oozie_properties = Em.A(['oozie_existing_oracle_database', 'oozie_existing_postgresql_database',
+ 'oozie_existing_mysql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database']);
break;
case 'Existing MSSQL Server database with sql auth':
configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_existing_mysql_host').value;
- oozieDbType.value = 'mssql';
- hive_properties = Em.A(['hive_ambari_host', 'hive_ambari_database', 'oozie_existing_oracle_host',
- 'oozie_existing_oracle_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database',
- 'oozie_existing_mysql_host', 'oozie_existing_mysql_database',
- 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host',
- 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host']);
+ oozie_properties = Em.A(['oozie_existing_oracle_database', 'oozie_existing_postgresql_database',
+ 'oozie_existing_mysql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_database']);
break;
default:
configs.findProperty('name', 'oozie_hostname').value = configs.findProperty('name', 'oozie_existing_oracle_host').value;
- oozieDbType.value = 'oracle';
- oozie_properties = Em.A(['oozie_ambari_host', 'oozie_ambari_database', 'oozie_existing_mysql_host',
- 'oozie_existing_mysql_database', 'oozie_derby_database', 'oozie_existing_postgresql_host',
- 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_host',
- 'oozie_existing_mssql_server_2_database', 'oozie_existing_mssql_server_2_host']);
+ oozie_properties = Em.A(['oozie_ambari_database', 'oozie_existing_mysql_database', 'oozie_derby_database',
+ 'oozie_existing_postgresql_database', 'oozie_existing_mssql_server_database', 'oozie_existing_mssql_server_2_database']);
break;
}
oozie_properties.forEach(function (property) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14c614fb/ambari-web/app/data/BIGTOP/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/BIGTOP/site_properties.js b/ambari-web/app/data/BIGTOP/site_properties.js
index 5fd1fd1..79f920a 100644
--- a/ambari-web/app/data/BIGTOP/site_properties.js
+++ b/ambari-web/app/data/BIGTOP/site_properties.js
@@ -2632,10 +2632,8 @@ module.exports =
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
"defaultValue": "",
- "isReconfigurable": false,
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
@@ -2649,10 +2647,8 @@ module.exports =
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
"defaultValue": "",
- "isReconfigurable": false,
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
@@ -2668,7 +2664,6 @@ module.exports =
"defaultValue": "",
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
http://git-wip-us.apache.org/repos/asf/ambari/blob/14c614fb/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 5fe514b..eb0600a 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -3403,10 +3403,8 @@ module.exports =
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
"defaultValue": "",
- "isReconfigurable": false,
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
@@ -3420,10 +3418,8 @@ module.exports =
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
"defaultValue": "",
- "isReconfigurable": false,
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
@@ -3439,7 +3435,6 @@ module.exports =
"defaultValue": "",
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
@@ -3472,7 +3467,6 @@ module.exports =
"defaultValue": "",
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
@@ -3488,7 +3482,6 @@ module.exports =
"defaultValue": "",
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
http://git-wip-us.apache.org/repos/asf/ambari/blob/14c614fb/ambari-web/app/data/PHD/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/PHD/site_properties.js b/ambari-web/app/data/PHD/site_properties.js
index 5746e11..44c6628 100644
--- a/ambari-web/app/data/PHD/site_properties.js
+++ b/ambari-web/app/data/PHD/site_properties.js
@@ -2481,10 +2481,8 @@ module.exports =
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
"defaultValue": "",
- "isReconfigurable": false,
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
@@ -2498,10 +2496,8 @@ module.exports =
"displayName": "Database Host",
"description": "Specify the host on which the existing database is hosted",
"defaultValue": "",
- "isReconfigurable": false,
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
@@ -2517,7 +2513,6 @@ module.exports =
"defaultValue": "",
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
http://git-wip-us.apache.org/repos/asf/ambari/blob/14c614fb/ambari-web/app/data/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/site_properties.js b/ambari-web/app/data/site_properties.js
index 9d4f8b9..3e57c49 100644
--- a/ambari-web/app/data/site_properties.js
+++ b/ambari-web/app/data/site_properties.js
@@ -1733,7 +1733,6 @@ module.exports =
"description": "Specify the host on which the existing database is hosted",
"defaultValue": "",
"displayType": "host",
- "isRequiredByAgent": false,
"isOverridable": false,
"isVisible": false,
"isObserved": true,
@@ -1750,7 +1749,6 @@ module.exports =
"defaultValue": "",
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
@@ -1766,7 +1764,6 @@ module.exports =
"defaultValue": "",
"displayType": "host",
"isOverridable": false,
- "isRequiredByAgent": false,
"isVisible": false,
"isObserved": true,
"serviceName": "HIVE",
http://git-wip-us.apache.org/repos/asf/ambari/blob/14c614fb/ambari-web/app/views/wizard/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/controls_view.js b/ambari-web/app/views/wizard/controls_view.js
index ea9bfb9..1c41ab6 100644
--- a/ambari-web/app/views/wizard/controls_view.js
+++ b/ambari-web/app/views/wizard/controls_view.js
@@ -484,9 +484,6 @@ App.ServiceConfigRadioButtons = Ember.View.extend({
} else {
propertyAppendTo2.set('additionalView', null);
}
- if (!['addServiceController', 'installerController'].contains(this.get('controller.wizardController.name'))) {
- propertyAppendTo2.propertyDidChange('isVisible');
- }
}.observes('serviceConfig.value'),
optionsBinding: 'serviceConfig.options'
http://git-wip-us.apache.org/repos/asf/ambari/blob/14c614fb/ambari-web/test/controllers/wizard/step8_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step8_test.js b/ambari-web/test/controllers/wizard/step8_test.js
index 63772e7..912a3f4 100644
--- a/ambari-web/test/controllers/wizard/step8_test.js
+++ b/ambari-web/test/controllers/wizard/step8_test.js
@@ -293,8 +293,7 @@ describe('App.WizardStep8Controller', function () {
{name: 'hive_ambari_host', value: 'h1'},
{name: 'hive_hostname', value: 'h2'}
],
- removed: Em.A(['hive_existing_mysql_host', 'hive_existing_mysql_database', 'hive_existing_oracle_host',
- 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database']),
+ removed: Em.A(['hive_existing_mysql_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database']),
m: 'hive_database: New MySQL Database',
host: 'h1'
},
@@ -305,8 +304,7 @@ describe('App.WizardStep8Controller', function () {
{name: 'hive_existing_mysql_host', value: 'h1'},
{name: 'hive_hostname', value: 'h2'}
],
- removed: Em.A(['hive_ambari_host', 'hive_ambari_database', 'hive_existing_oracle_host',
- 'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database']),
+ removed: Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_postgresql_database']),
m: 'hive_database: Existing MySQL Database',
host: 'h1'
},
@@ -317,8 +315,7 @@ describe('App.WizardStep8Controller', function () {
{name: 'hive_existing_postgresql_host', value: 'h1'},
{name: 'hive_hostname', value: 'h2'}
],
- removed: Em.A(['hive_ambari_host', 'hive_ambari_database', 'hive_existing_oracle_host',
- 'hive_existing_oracle_database', 'hive_existing_mysql_host', 'hive_existing_mysql_database']),
+ removed: Em.A(['hive_ambari_database', 'hive_existing_oracle_database', 'hive_existing_mysql_database']),
m: 'hive_database: Existing PostgreSQL Database',
host: 'h1'
},
@@ -329,8 +326,7 @@ describe('App.WizardStep8Controller', function () {
{name: 'hive_existing_oracle_host', value: 'h1'},
{name: 'hive_hostname', value: 'h2'}
],
- removed: Em.A(['hive_ambari_host', 'hive_ambari_database', 'hive_existing_mysql_host',
- 'hive_existing_mysql_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database']),
+ removed: Em.A(['hive_ambari_database', 'hive_existing_mysql_database', 'hive_existing_postgresql_database']),
m: 'hive_database: Existing Oracle Database',
host: 'h1'
}
@@ -353,53 +349,43 @@ describe('App.WizardStep8Controller', function () {
{
globals: [
{name: 'oozie_database', value: 'New Derby Database'},
- {name: 'oozie_database_type', value: 'derby'},
{name: 'oozie_ambari_host', value: 'h1'},
{name: 'oozie_hostname', value: 'h2'}
],
- removed: Em.A(['oozie_ambari_host', 'oozie_ambari_database', 'oozie_existing_mysql_host',
- 'oozie_existing_mysql_database', 'oozie_existing_oracle_host', 'oozie_existing_oracle_database',
- 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database']),
- oozie_database_type: 'derby',
+ removed: Em.A(['oozie_ambari_database', 'oozie_existing_mysql_database', 'oozie_existing_oracle_database',
+ 'oozie_existing_postgresql_database']),
m: 'oozie_database: New Derby Database',
host: 'h1'
},
{
globals: [
{name: 'oozie_database', value: 'Existing MySQL Database'},
- {name: 'oozie_database_type', value: 'mysql'},
{name: 'oozie_existing_mysql_host', value: 'h1'},
{name: 'oozie_hostname', value: 'h2'}
],
- removed: Em.A(['oozie_ambari_host', 'oozie_ambari_database', 'oozie_existing_oracle_host',
- 'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database']),
- oozie_database_type: 'mysql',
+ removed: Em.A(['oozie_ambari_database', 'oozie_existing_oracle_database', 'oozie_derby_database',
+ 'oozie_existing_postgresql_database']),
m: 'oozie_database: Existing MySQL Database',
host: 'h1'
},
{
globals: [
{name: 'oozie_database', value: 'Existing PostgreSQL Database'},
- {name: 'oozie_database_type', value: 'postgresql'},
{name: 'oozie_existing_postgresql_host', value: 'h1'},
{name: 'oozie_hostname', value: 'h2'}
],
- removed: Em.A(['oozie_ambari_host', 'oozie_ambari_database', 'oozie_existing_oracle_host',
- 'oozie_existing_oracle_database', 'oozie_existing_mysql_host', 'oozie_existing_mysql_database']),
- oozie_database_type: 'postgresql',
+ removed: Em.A(['oozie_ambari_database', 'oozie_existing_oracle_database', 'oozie_existing_mysql_database']),
m: 'oozie_database: Existing PostgreSQL Database',
host: 'h1'
},
{
globals: [
{name: 'oozie_database', value: 'Existing Oracle Database'},
- {name: 'oozie_database_type', value: 'oracle'},
{name: 'oozie_existing_oracle_host', value: 'h1'},
{name: 'oozie_hostname', value: 'h2'}
],
- removed: Em.A(['oozie_ambari_host', 'oozie_ambari_database', 'oozie_existing_mysql_host',
- 'oozie_existing_mysql_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database']),
- oozie_database_type: 'oracle',
+ removed: Em.A(['oozie_ambari_database', 'oozie_existing_mysql_database', 'oozie_derby_database',
+ 'oozie_existing_postgresql_database']),
m: 'oozie_database: Existing Oracle Database',
host: 'h1'
}
@@ -414,7 +400,6 @@ describe('App.WizardStep8Controller', function () {
test.removed.forEach(function(name) {
expect(Em.isNone(configs.findProperty('name', name))).to.equal(true);
});
- expect(configs.findProperty('name', 'oozie_database_type').value).to.equal(test.oozie_database_type);
expect(configs.findProperty('name', 'oozie_hostname').value).to.equal(test.host);
});
});