You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/10/20 10:04:53 UTC
ambari git commit: AMBARI-13484. Oozie server not showing delete
option on hosts page
Repository: ambari
Updated Branches:
refs/heads/trunk e526efa78 -> 3056a7642
AMBARI-13484. Oozie server not showing delete option on hosts page
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3056a764
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3056a764
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3056a764
Branch: refs/heads/trunk
Commit: 3056a7642544ed11b4036b901c5f64fb8743e819
Parents: e526efa
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Oct 20 10:59:27 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Oct 20 11:04:48 2015 +0300
----------------------------------------------------------------------
.../app/models/stack_service_component.js | 4 +-
.../test/models/stack_service_component_test.js | 64 ++++++-
ambari-web/test/service_components.js | 165 +++++++++++++++++++
3 files changed, 230 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3056a764/ambari-web/app/models/stack_service_component.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service_component.js b/ambari-web/app/models/stack_service_component.js
index f11b0a2..b51ed1f 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -151,7 +151,7 @@ App.StackServiceComponent = DS.Model.extend({
* @property {Boolean} isMasterAddableOnlyOnHA
*/
isMasterAddableOnlyOnHA: function () {
- return ['NAMENODE', 'RESOURCEMANAGER', 'RANGER_ADMIN', 'OOZIE_SERVER'].contains(this.get('componentName'));
+ return ['NAMENODE', 'RESOURCEMANAGER', 'RANGER_ADMIN'].contains(this.get('componentName'));
}.property('componentName'),
/** @property {Boolean} isHAComponentOnly - Components that can be installed only if HA enabled **/
@@ -197,7 +197,7 @@ App.StackServiceComponent = DS.Model.extend({
/** @property {Boolean} isNotAddableOnlyInInstall - is this component addable, except Install and Add Service Wizards **/
isNotAddableOnlyInInstall: function() {
- return ['HIVE_METASTORE', 'HIVE_SERVER', 'RANGER_KMS_SERVER'].contains(this.get('componentName'));
+ return ['HIVE_METASTORE', 'HIVE_SERVER', 'RANGER_KMS_SERVER', 'OOZIE_SERVER'].contains(this.get('componentName'));
}.property('componentName')
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/3056a764/ambari-web/test/models/stack_service_component_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/stack_service_component_test.js b/ambari-web/test/models/stack_service_component_test.js
index 8774a1f..cc58fcb 100644
--- a/ambari-web/test/models/stack_service_component_test.js
+++ b/ambari-web/test/models/stack_service_component_test.js
@@ -294,7 +294,7 @@ var componentPropertiesValidationTests = [
expected: {
isShownOnInstallerAssignMasterPage: false
}
- },
+ }
];
describe('App.StackServiceComponent', function() {
@@ -316,6 +316,68 @@ describe('App.StackServiceComponent', function() {
});
});
+ describe('#isMasterAddableOnlyOnHA', function () {
+
+ var cases = [
+ {
+ componentName: 'NAMENODE',
+ isMasterAddableOnlyOnHA: true
+ },
+ {
+ componentName: 'RESOURCEMANAGER',
+ isMasterAddableOnlyOnHA: true
+ },
+ {
+ componentName: 'RANGER_ADMIN',
+ isMasterAddableOnlyOnHA: true
+ },
+ {
+ componentName: 'OOZIE_SERVER',
+ isMasterAddableOnlyOnHA: false
+ }
+ ];
+
+ cases.forEach(function (item) {
+ it(item.componentName, function () {
+ expect(App.StackServiceComponent.find().findProperty('componentName', item.componentName).get('isMasterAddableOnlyOnHA')).to.equal(item.isMasterAddableOnlyOnHA);
+ });
+ });
+
+ });
+
+ describe('#isNotAddableOnlyInInstall', function () {
+
+ var cases = [
+ {
+ componentName: 'HIVE_METASTORE',
+ isNotAddableOnlyInInstall: true
+ },
+ {
+ componentName: 'HIVE_SERVER',
+ isNotAddableOnlyInInstall: true
+ },
+ {
+ componentName: 'RANGER_KMS_SERVER',
+ isNotAddableOnlyInInstall: true
+ },
+ {
+ componentName: 'OOZIE_SERVER',
+ isNotAddableOnlyInInstall: true
+ },
+ {
+ componentName: 'NAMENODE',
+ isNotAddableOnlyInInstall: false
+ }
+ ];
+
+ cases.forEach(function (item) {
+ it(item.componentName, function () {
+ expect(App.StackServiceComponent.find().findProperty('componentName', item.componentName).get('isNotAddableOnlyInInstall')).to.equal(item.isNotAddableOnlyInInstall);
+ });
+ });
+
+ });
+
after(function() {
modelSetup.cleanStackServiceComponent();
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/3056a764/ambari-web/test/service_components.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/service_components.js b/ambari-web/test/service_components.js
index 961076c..e9791ff 100644
--- a/ambari-web/test/service_components.js
+++ b/ambari-web/test/service_components.js
@@ -1409,6 +1409,171 @@ module.exports = {
}
],
artifacts: []
+ },
+ {
+ "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.2/services/RANGER",
+ "StackServices" : {
+ "comments" : "Comprehensive security for Hadoop",
+ "custom_commands" : [ ],
+ "display_name" : "Ranger",
+ "required_services" : [ ],
+ "service_check_supported" : true,
+ "service_name" : "RANGER",
+ "service_version" : "0.4.0",
+ "stack_name" : "HDP",
+ "stack_version" : "2.2",
+ "user_name" : null,
+ "config_types" : {
+ "admin-properties" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ },
+ "ranger-env" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "true"
+ }
+ },
+ "ranger-site" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ },
+ "usersync-properties" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ }
+ }
+ },
+ "components" : [
+ {
+ "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.2/services/RANGER/components/RANGER_ADMIN",
+ "StackServiceComponents" : {
+ "component_name" : "RANGER_ADMIN",
+ "service_name" : "RANGER",
+ "stack_name" : "HDP",
+ "stack_version" : "2.2"
+ },
+ "dependencies" : [ ]
+ },
+ {
+ "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.2/services/RANGER/components/RANGER_USERSYNC",
+ "StackServiceComponents" : {
+ "component_name" : "RANGER_USERSYNC",
+ "service_name" : "RANGER",
+ "stack_name" : "HDP",
+ "stack_version" : "2.2"
+ },
+ "dependencies" : [ ]
+ }
+ ],
+ artifacts: []
+ },
+ {
+ "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.3/services/RANGER_KMS",
+ "StackServices" : {
+ "comments" : "Key Management Server",
+ "custom_commands" : [ ],
+ "display_name" : "Ranger KMS",
+ "required_services" : [
+ "RANGER",
+ "HDFS"
+ ],
+ "service_check_supported" : true,
+ "service_name" : "RANGER_KMS",
+ "service_version" : "0.5.0.2.3",
+ "stack_name" : "HDP",
+ "stack_version" : "2.3",
+ "user_name" : null,
+ "config_types" : {
+ "dbks-site" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ },
+ "kms-env" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ },
+ "kms-log4j" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ },
+ "kms-properties" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ },
+ "kms-site" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ },
+ "ranger-kms-audit" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ },
+ "ranger-kms-policymgr-ssl" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ },
+ "ranger-kms-security" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ },
+ "ranger-kms-site" : {
+ "supports" : {
+ "adding_forbidden" : "false",
+ "do_not_extend" : "false",
+ "final" : "false"
+ }
+ }
+ }
+ },
+ "themes" : [ ],
+ "components" : [
+ {
+ "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.3/services/RANGER_KMS/components/RANGER_KMS_SERVER",
+ "StackServiceComponents" : {
+ "component_name" : "RANGER_KMS_SERVER",
+ "service_name" : "RANGER_KMS",
+ "stack_name" : "HDP",
+ "stack_version" : "2.3"
+ },
+ "dependencies" : [ ]
+ }
+ ],
+ artifacts: []
}
]
};