You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2015/01/06 12:04:58 UTC
ambari git commit: AMBARI-8992 Pass target stack version info when
making a call for pre-upgrade checks. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 1dbf72ef4 -> 01e2af6ce
AMBARI-8992 Pass target stack version info when making a call for pre-upgrade checks. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/01e2af6c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/01e2af6c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/01e2af6c
Branch: refs/heads/trunk
Commit: 01e2af6ce97566b013ff6f93649d89a5683cefa3
Parents: 1dbf72e
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Tue Jan 6 13:04:28 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Tue Jan 6 13:04:28 2015 +0200
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 7 +++++--
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../main/admin/stack_and_upgrade_controller_test.js | 15 +++++++++++++--
3 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/01e2af6c/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 6fe806f..8b97364 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
@@ -298,7 +298,10 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
App.ajax.send({
name: "admin.rolling_upgrade.pre_upgrade_check",
sender: this,
- data: version,
+ data: {
+ version: version.value,
+ label: version.label
+ },
success: "runPreUpgradeCheckSuccess"
});
} else {
@@ -368,4 +371,4 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
openUpgradeDialog: function () {
App.router.transitionTo('admin.stackUpgrade');
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/01e2af6c/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 3d945c3..43fdd41 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1379,7 +1379,7 @@ var urls = {
'mock': ''
},
'admin.rolling_upgrade.pre_upgrade_check': {
- 'real': '/clusters/{clusterName}/rolling_upgrades_check?fields=*',
+ 'real': '/clusters/{clusterName}/rolling_upgrades_check?fields=*&UpgradeChecks/repository_version={version}',
'mock': '/data/stack_versions/pre_upgrade_check.json'
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/01e2af6c/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 774d3de..0a763b1 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
@@ -238,8 +238,19 @@ describe('App.MainAdminStackAndUpgradeController', function() {
App.ajax.send.restore();
});
it("make ajax call", function() {
- controller.runPreUpgradeCheck("2.2.1");
- expect(App.ajax.send.calledOnce).to.be.true;
+ controller.runPreUpgradeCheck({
+ value: '2.2',
+ label: 'HDP-2.2'
+ });
+ expect(App.ajax.send.getCall(0).args[0]).to.eql({
+ name: "admin.rolling_upgrade.pre_upgrade_check",
+ sender: controller,
+ data: {
+ version: '2.2',
+ label: 'HDP-2.2'
+ },
+ success: "runPreUpgradeCheckSuccess"
+ });
});
});