You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/04/20 18:35:40 UTC
[1/2] ambari git commit: AMBARI-10603 RU: Admin>Versions is not
showing HDP 2.3 after creating the repo version in Admin View and clicking on
"Install On...". (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk c230d0f52 -> 03dc496a8
AMBARI-10603 RU: Admin>Versions is not showing HDP 2.3 after creating the repo version in Admin View and clicking on "Install On...". (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/03dc496a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03dc496a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03dc496a
Branch: refs/heads/trunk
Commit: 03dc496a80252d8434ba8ef61301fdbaf5026ca0
Parents: b1d9cf9
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Apr 20 18:16:19 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Apr 20 19:35:29 2015 +0300
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 2 +-
.../app/mappers/repository_version_mapper.js | 39 +++++++++++---------
ambari-web/app/mappers/stack_version_mapper.js | 2 +-
.../admin/stack_and_upgrade_controller_test.js | 2 +-
4 files changed, 25 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/03dc496a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 8b09d68..6a1497f 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -91,7 +91,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
*/
realRepoUrl: function () {
return App.get('apiPrefix') + App.get('stackVersionURL') +
- '/repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*';
+ '/compatible_repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*';
}.property('App.stackVersionURL'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/03dc496a/ambari-web/app/mappers/repository_version_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/repository_version_mapper.js b/ambari-web/app/mappers/repository_version_mapper.js
index 6cfb317..0bb094f 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -22,19 +22,22 @@ App.repoVersionMapper = App.QuickDataMapper.create({
modelOperatingSystems: App.OS,
modelRepositories: App.Repository,
- modelRepoVersion: {
- id: 'RepositoryVersions.id',
- stack_version_id: 'RepositoryVersions.stackVersionId',
- display_name: 'RepositoryVersions.display_name',
- repository_version: 'RepositoryVersions.repository_version',
- upgrade_pack: 'RepositoryVersions.upgrade_pack',
- stack_version_type: 'RepositoryVersions.stack_name',
- stack_version_number: 'RepositoryVersions.stack_version',
- operating_systems_key: 'operating_systems',
- operating_systems_type: 'array',
- operating_systems: {
- item: 'id'
- }
+ modelRepoVersion: function (isCurrentStackOnly) {
+ var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 'CompatibleRepositoryVersions';
+ return {
+ id: repoVersionsKey + '.id',
+ stack_version_id: repoVersionsKey + '.stackVersionId',
+ display_name: repoVersionsKey + '.display_name',
+ repository_version: repoVersionsKey + '.repository_version',
+ upgrade_pack: repoVersionsKey + '.upgrade_pack',
+ stack_version_type: repoVersionsKey + '.stack_name',
+ stack_version_number: repoVersionsKey + '.stack_version',
+ operating_systems_key: 'operating_systems',
+ operating_systems_type: 'array',
+ operating_systems: {
+ item: 'id'
+ }
+ };
},
modelOS: {
@@ -64,7 +67,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
stack_version : 'Repositories.stack_version'
},
- map: function (json, loadAll) {
+ map: function (json, loadAll, isCurrentStackOnly) {
var modelRepoVersions = this.get('modelRepoVersions');
var modelOperatingSystems = this.get('modelOperatingSystems');
var modelRepositories = this.get('modelRepositories');
@@ -73,14 +76,16 @@ App.repoVersionMapper = App.QuickDataMapper.create({
var resultOS = [];
var resultRepo = [];
+ var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 'CompatibleRepositoryVersions';
+
if (json && json.items) {
json.items.forEach(function (item) {
- if (loadAll || (item.RepositoryVersions && !App.StackVersion.find().someProperty('repositoryVersion.id', item.RepositoryVersions.id))) {
+ if (loadAll || (item[repoVersionsKey] && !App.StackVersion.find().someProperty('repositoryVersion.id', item[repoVersionsKey].id))) {
var repo = item;
var osArray = [];
if (item.operating_systems) {
item.operating_systems.forEach(function (os) {
- os.id = item.RepositoryVersions.repository_version + os.OperatingSystems.os_type;
+ os.id = item[repoVersionsKey].repository_version + os.OperatingSystems.os_type;
os.repository_version_id = repo.id;
var repoArray = [];
if (Em.get(os, 'repositories')) {
@@ -97,7 +102,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
}, this);
}
repo.operating_systems = osArray;
- resultRepoVersion.push(this.parseIt(repo, this.get('modelRepoVersion')));
+ resultRepoVersion.push(this.parseIt(repo, this.modelRepoVersion(isCurrentStackOnly)));
}
}, this);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/03dc496a/ambari-web/app/mappers/stack_version_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/stack_version_mapper.js b/ambari-web/app/mappers/stack_version_mapper.js
index f15e1d0..43eddc9 100644
--- a/ambari-web/app/mappers/stack_version_mapper.js
+++ b/ambari-web/app/mappers/stack_version_mapper.js
@@ -77,7 +77,7 @@ App.stackVersionMapper = App.QuickDataMapper.create({
if (item.repository_versions && item.repository_versions[0]) {
item.repository_versions[0].RepositoryVersions.stackVersionId = item.ClusterStackVersions.id;
- App.repoVersionMapper.map({"items": item.repository_versions }, true);
+ App.repoVersionMapper.map({"items": item.repository_versions }, true, true);
}
resultStack.push(this.parseIt(stack, this.get('modelStack')));
}, this);
http://git-wip-us.apache.org/repos/asf/ambari/blob/03dc496a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index 5d674ce..d17268c 100644
--- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -39,7 +39,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
this.mock.withArgs('apiPrefix').returns('apiPrefix');
this.mock.withArgs('stackVersionURL').returns('stackVersionURL');
controller.propertyDidChange('realRepoUrl');
- expect(controller.get('realRepoUrl')).to.equal('apiPrefixstackVersionURL/repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*');
+ expect(controller.get('realRepoUrl')).to.equal('apiPrefixstackVersionURL/compatible_repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*');
});
});
[2/2] ambari git commit: AMBARI-10601 Going to HBase enhanced configs
page causes config change. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-10601 Going to HBase enhanced configs page causes config change. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1d9cf98
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1d9cf98
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1d9cf98
Branch: refs/heads/trunk
Commit: b1d9cf98bcb8913bb3a89d8d8d618ebe1e9f3760
Parents: c230d0f
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Apr 20 18:13:00 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Apr 20 19:35:29 2015 +0300
----------------------------------------------------------------------
ambari-web/app/utils/config.js | 30 +++++++++++++++++++++++++++---
ambari-web/test/utils/config_test.js | 2 ++
2 files changed, 29 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1d9cf98/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 0c5b3da4..5c65e9e 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -307,11 +307,11 @@ App.config = Em.Object.create({
if (!configsPropertyDef) {
configsPropertyDef = advancedConfig;
}
-
+ var value = this.parseValue(properties[index], configsPropertyDef, advancedConfig);
var serviceConfigObj = App.ServiceConfig.create({
name: index,
- value: properties[index],
- defaultValue: properties[index],
+ value: value,
+ defaultValue: value,
filename: filename,
isUserProperty: !advancedConfig,
isVisible: !!service,
@@ -370,6 +370,30 @@ App.config = Em.Object.create({
}
},
+ /**
+ * additional parsing when value is int of float
+ * ex: if value is "0.40" result will be "0.4"
+ * @param value
+ * @param predefinedConfig
+ * @param advancedConfig
+ * @returns {String}
+ */
+ parseValue: function(value, predefinedConfig, advancedConfig) {
+ var type = predefinedConfig ? Em.get(predefinedConfig, 'displayType') :
+ advancedConfig && Em.get(advancedConfig, 'valueAttributes.type');
+ switch (type) {
+ case 'int':
+ var res = parseInt(value);
+ return Number.isNaN(res) ? "" : res.toString();
+ case 'float':
+ var res = parseFloat(value);
+ return Number.isNaN(res) ? "" : res.toString();
+ default:
+ return value;
+ }
+ },
+
+
tweakConfigVisibility: function (config, allSiteConfigs) {
var kdcType = allSiteConfigs['kdc_type'];
if (kdcType === 'active-directory' && ['container_dn', 'ldap_url'].contains(Em.get(config, 'name'))) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1d9cf98/ambari-web/test/utils/config_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js
index 3c10523..7b5aebe 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -607,6 +607,7 @@ describe('App.config', function () {
var result;
before(function() {
+ sinon.stub(App.config, 'parseValue', function(value) {return value});
setups.setupStackVersion(this, 'HDP-2.2');
loadServiceModelsData(['HDFS', 'STORM']);
App.config.loadAdvancedConfigSuccess(modelSetup.advancedConfigs, { url: '/serviceName/configurations'}, {
@@ -629,6 +630,7 @@ describe('App.config', function () {
});
after(function() {
+ App.config.parseValue.restore();
setups.restoreStackVersion(this);
removeServiceModelData(['HDFS', 'STORM']);
});