ambari git commit: AMBARI-11723 Configs: comparing versions does not show new props after Ambari Upgrade. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 60f1b553b - 9a38c3b3f
AMBARI-11723 Configs: comparing versions does not show new props after Ambari
Upgrade. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a38c3b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a38c3b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a38c3b3
Branch: refs/heads/branch-2.1
Commit: 9a38c3b3f8983016e1e5d0cb7af42817561a9ab7
Parents: 60f1b55
Author: Andrii Tkach atk...@hortonworks.com
Authored: Fri Jun 5 16:26:05 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Mon Jun 8 12:23:53 2015 +0300
--
ambari-web/app/controllers/main/service/info/configs.js | 4 +++-
.../test/controllers/main/service/info/config_test.js| 11 ---
2 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a38c3b3/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index f809c64..5c3a27c 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -677,6 +677,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
*/
setCompareDefaultGroupConfig: function (serviceConfig, compareConfig) {
var compareObject = {};
+var isEmptyProp = App.isEmptyObject(serviceConfig);
serviceConfig.compareConfigs = [];
serviceConfig.isComparison = true;
@@ -686,7 +687,8 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
compareObject = this.getComparisonConfig(serviceConfig, compareConfig);
serviceConfig.hasCompareDiffs = serviceConfig.isMock ||
this.hasCompareDiffs(serviceConfig, compareObject);
serviceConfig.compareConfigs.push(compareObject);
-} else if (serviceConfig.isUserProperty) {
+// user custom property or property that was added during upgrade
+} else if (serviceConfig.isUserProperty || (!isEmptyProp !compareConfig
Em.get(serviceConfig, 'isRequiredByAgent') !== false)) {
serviceConfig.compareConfigs.push(this.getMockComparisonConfig(serviceConfig,
this.get('compareServiceVersion.version')));
serviceConfig.hasCompareDiffs = true;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a38c3b3/ambari-web/test/controllers/main/service/info/config_test.js
--
diff --git a/ambari-web/test/controllers/main/service/info/config_test.js
b/ambari-web/test/controllers/main/service/info/config_test.js
index defdaf0..df62723 100644
--- a/ambari-web/test/controllers/main/service/info/config_test.js
+++ b/ambari-web/test/controllers/main/service/info/config_test.js
@@ -946,10 +946,10 @@ describe(App.MainServiceInfoConfigsController, function
() {
mainServiceInfoConfigsController.getMockComparisonConfig.restore();
mainServiceInfoConfigsController.hasCompareDiffs.restore();
});
-it(expect that setCompareDefaultGroupConfig will not run anything,
function() {
+it(empty service config passed, expect that setCompareDefaultGroupConfig
will not run anything, function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({}).compareConfigs.length).to.equal(0);
});
-it(expect that setCompareDefaultGroupConfig will not run anything,
function() {
+it(empty service config and comparison passed, expect that
setCompareDefaultGroupConfig will not run anything, function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({},{}).compareConfigs.length).to.equal(0);
});
it(expect that serviceConfig.compareConfigs will be
getMockComparisonConfig, function() {
@@ -964,7 +964,12 @@ describe(App.MainServiceInfoConfigsController, function
() {
it(expect that serviceConfig.compareConfigs will be getComparisonConfig,
function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({isReconfigurable:
true, isMock: true}, {})).to.eql({compareConfigs: [compConfig],
isReconfigurable: true, isMock: true, isComparison: true, hasCompareDiffs:
true});
});
-
+it(property was created during upgrade and have no comparison, compare
with 'Undefined' value should be created, function() {
+
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({name:
'prop1', isUserProperty: false}, null)).to.eql({
+name: 'prop1', isUserProperty: false, compareConfigs: [mockConfig],
+isComparison: true, hasCompareDiffs: true
+
ambari git commit: AMBARI-11723 Configs: comparing versions does not show new props after Ambari Upgrade. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk fb90a26e8 - a22f819d4
AMBARI-11723 Configs: comparing versions does not show new props after Ambari
Upgrade. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a22f819d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a22f819d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a22f819d
Branch: refs/heads/trunk
Commit: a22f819d4673d8187b61f41bbaa2388997b0eda6
Parents: fb90a26
Author: Andrii Tkach atk...@hortonworks.com
Authored: Fri Jun 5 16:26:05 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Fri Jun 5 17:18:44 2015 +0300
--
ambari-web/app/controllers/main/service/info/configs.js | 4 +++-
.../test/controllers/main/service/info/config_test.js| 11 ---
2 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a22f819d/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index f809c64..5c3a27c 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -677,6 +677,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
*/
setCompareDefaultGroupConfig: function (serviceConfig, compareConfig) {
var compareObject = {};
+var isEmptyProp = App.isEmptyObject(serviceConfig);
serviceConfig.compareConfigs = [];
serviceConfig.isComparison = true;
@@ -686,7 +687,8 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
compareObject = this.getComparisonConfig(serviceConfig, compareConfig);
serviceConfig.hasCompareDiffs = serviceConfig.isMock ||
this.hasCompareDiffs(serviceConfig, compareObject);
serviceConfig.compareConfigs.push(compareObject);
-} else if (serviceConfig.isUserProperty) {
+// user custom property or property that was added during upgrade
+} else if (serviceConfig.isUserProperty || (!isEmptyProp !compareConfig
Em.get(serviceConfig, 'isRequiredByAgent') !== false)) {
serviceConfig.compareConfigs.push(this.getMockComparisonConfig(serviceConfig,
this.get('compareServiceVersion.version')));
serviceConfig.hasCompareDiffs = true;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a22f819d/ambari-web/test/controllers/main/service/info/config_test.js
--
diff --git a/ambari-web/test/controllers/main/service/info/config_test.js
b/ambari-web/test/controllers/main/service/info/config_test.js
index defdaf0..df62723 100644
--- a/ambari-web/test/controllers/main/service/info/config_test.js
+++ b/ambari-web/test/controllers/main/service/info/config_test.js
@@ -946,10 +946,10 @@ describe(App.MainServiceInfoConfigsController, function
() {
mainServiceInfoConfigsController.getMockComparisonConfig.restore();
mainServiceInfoConfigsController.hasCompareDiffs.restore();
});
-it(expect that setCompareDefaultGroupConfig will not run anything,
function() {
+it(empty service config passed, expect that setCompareDefaultGroupConfig
will not run anything, function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({}).compareConfigs.length).to.equal(0);
});
-it(expect that setCompareDefaultGroupConfig will not run anything,
function() {
+it(empty service config and comparison passed, expect that
setCompareDefaultGroupConfig will not run anything, function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({},{}).compareConfigs.length).to.equal(0);
});
it(expect that serviceConfig.compareConfigs will be
getMockComparisonConfig, function() {
@@ -964,7 +964,12 @@ describe(App.MainServiceInfoConfigsController, function
() {
it(expect that serviceConfig.compareConfigs will be getComparisonConfig,
function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({isReconfigurable:
true, isMock: true}, {})).to.eql({compareConfigs: [compConfig],
isReconfigurable: true, isMock: true, isComparison: true, hasCompareDiffs:
true});
});
-
+it(property was created during upgrade and have no comparison, compare
with 'Undefined' value should be created, function() {
+
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({name:
'prop1', isUserProperty: false}, null)).to.eql({
+name: 'prop1', isUserProperty: false, compareConfigs: [mockConfig],
+isComparison: true, hasCompareDiffs: true
+ });
+
