Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-12556 0f266ed6a -> 560b0d194
AMBARI-21046. UI: Upgrades should be started using repo_version_ids instead of version strings (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/560b0d19 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/560b0d19 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/560b0d19 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 560b0d1946cfd7d26419e995f9138a3a281b6602 Parents: 0f266ed Author: Alex Antonenko <hiv...@gmail.com> Authored: Wed May 17 19:24:44 2017 +0300 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Tue May 23 22:54:35 2017 -0400 ---------------------------------------------------------------------- .../controllers/main/admin/stack_and_upgrade_controller.js | 7 +++++-- ambari-web/app/utils/ajax/ajax.js | 2 +- .../main/admin/stack_and_upgrade_controller_test.js | 6 ++++++ 3 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/560b0d19/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 d6829d9..a676f7429 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 @@ -414,7 +414,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, if (currentVersion) { this.set('currentVersion', { repository_version: currentVersion.get('repositoryVersion.repositoryVersion'), - repository_name: currentVersion.get('repositoryVersion.displayName') + repository_name: currentVersion.get('repositoryVersion.displayName'), + id: currentVersion.get('repositoryVersion.id') }); } }, @@ -735,6 +736,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, data: { value: currentVersion.repository_version, label: currentVersion.repository_name, + id: currentVersion.id, isDowngrade: true, upgradeType: this.get('upgradeType') }, @@ -1377,7 +1379,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, label: version.get('displayName'), type: version.get('upgradeType'), skipComponentFailures: version.get('skipComponentFailures') ? 'true' : 'false', - skipSCFailures: version.get('skipSCFailures') ? 'true' : 'false' + skipSCFailures: version.get('skipSCFailures') ? 'true' : 'false', + id: version.get('id') }; if (App.get('supports.preUpgradeCheck')) { this.set('requestInProgress', true); http://git-wip-us.apache.org/repos/asf/ambari/blob/560b0d19/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 bf49b63..929214c 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -1712,7 +1712,7 @@ var urls = { timeout : 600000, data: JSON.stringify({ "Upgrade": { - "repository_version": data.value, + "repository_version_id": data.id, "upgrade_type": data.type, "skip_failures": data.skipComponentFailures, "skip_service_check_failures": data.skipSCFailures, http://git-wip-us.apache.org/repos/asf/ambari/blob/560b0d19/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 81be6af..4585991 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 @@ -128,6 +128,7 @@ describe('App.MainAdminStackAndUpgradeController', function() { sinon.stub(App.StackVersion, 'find').returns([Em.Object.create({ state: 'CURRENT', repositoryVersion: { + id: '1', repositoryVersion: '2.2', displayName: 'HDP-2.2' } @@ -155,6 +156,7 @@ describe('App.MainAdminStackAndUpgradeController', function() { }); it('currentVersion is corrent', function () { expect(controller.get('currentVersion')).to.eql({ + "id": "1", "repository_version": "2.2", "repository_name": "HDP-2.2" }); @@ -389,6 +391,7 @@ describe('App.MainAdminStackAndUpgradeController', function() { describe("#runPreUpgradeCheck()", function() { it("make ajax call", function() { controller.runPreUpgradeCheck(Em.Object.create({ + id: '1', repositoryVersion: '2.2', displayName: 'HDP-2.2', upgradeType: 'ROLLING', @@ -399,6 +402,7 @@ describe('App.MainAdminStackAndUpgradeController', function() { expect(args[0]).to.exists; expect(args[0].sender).to.be.eql(controller); expect(args[0].data).to.be.eql({ + id: '1', value: '2.2', label: 'HDP-2.2', type: 'ROLLING', @@ -1126,6 +1130,7 @@ describe('App.MainAdminStackAndUpgradeController', function() { controller.set('upgradeVersion', 'HDP-2.3'); controller.set('upgradeType', 'NON_ROLLING'); controller.startDowngrade(Em.Object.create({ + id: '1', repository_version: '2.2', repository_name: 'HDP-2.2' })); @@ -1138,6 +1143,7 @@ describe('App.MainAdminStackAndUpgradeController', function() { it('request-data is valid', function () { expect(this.callArgs.data).to.eql({ + id: '1', value: '2.2', label: 'HDP-2.2', isDowngrade: true,