Repository: ambari Updated Branches: refs/heads/trunk 5a99ce771 -> 3009a4aa1
AMBARI-21601. Web Client Should Provide Repository ID For Upgrade Checks (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3009a4aa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3009a4aa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3009a4aa Branch: refs/heads/trunk Commit: 3009a4aa10fc59bdd10c7b3db08b67cdde370110 Parents: 5a99ce7 Author: Alex Antonenko <[email protected]> Authored: Fri Jul 28 19:03:31 2017 +0300 Committer: Alex Antonenko <[email protected]> Committed: Fri Jul 28 19:03:31 2017 +0300 ---------------------------------------------------------------------- .../controllers/main/admin/stack_and_upgrade_controller.js | 8 ++++---- ambari-web/app/utils/ajax/ajax.js | 2 +- .../main/admin/stack_and_upgrade_controller_test.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3009a4aa/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 90b4528..823dba4 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 @@ -960,7 +960,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, this.get('upgradeMethods').forEach(function (method) { if (method.get('allowed')) { this.runPreUpgradeCheckOnly({ - value: version.get('repositoryVersion'), + value: version.get('id'), label: version.get('displayName'), type: method.get('type') }); @@ -1091,7 +1091,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, }, rerunCheck: function (event) { self.runPreUpgradeCheckOnly({ - value: version.get('repositoryVersion'), + value: version.get('id'), label: version.get('displayName'), type: event.context.get('type') }); @@ -1127,7 +1127,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, bypassedFailures: bypassedFailures, callback: function () { self.runPreUpgradeCheckOnly.call(self, { - value: version.get('repositoryVersion'), + value: version.get('id'), label: version.get('displayName'), type: event.context.get('type') }); @@ -1376,7 +1376,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, */ runPreUpgradeCheck: function(version) { var params = { - value: version.get('repositoryVersion'), + value: version.get('id'), label: version.get('displayName'), type: version.get('upgradeType'), skipComponentFailures: version.get('skipComponentFailures') ? 'true' : 'false', http://git-wip-us.apache.org/repos/asf/ambari/blob/3009a4aa/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 f77b386..4a1f9ef 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -1838,7 +1838,7 @@ var urls = { }, 'admin.upgrade.pre_upgrade_check': { - 'real': '/clusters/{clusterName}/rolling_upgrades_check?fields=*&UpgradeChecks/repository_version={value}&UpgradeChecks/upgrade_type={type}', + 'real': '/clusters/{clusterName}/rolling_upgrades_check?fields=*&UpgradeChecks/repository_version_id={value}&UpgradeChecks/upgrade_type={type}&UpgradeChecks/target_stack={targetStack}', 'mock': '/data/stack_versions/pre_upgrade_check.json' }, http://git-wip-us.apache.org/repos/asf/ambari/blob/3009a4aa/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 f1f5a97..410c0d4 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 @@ -405,7 +405,7 @@ describe('App.MainAdminStackAndUpgradeController', function() { expect(args[0].sender).to.be.eql(controller); expect(args[0].data).to.be.eql({ id: '1', - value: '2.2', + value: '1', label: 'HDP-2.2', type: 'ROLLING', skipComponentFailures: 'false', @@ -1727,11 +1727,11 @@ describe('App.MainAdminStackAndUpgradeController', function() { it("Rolling method allowed", function () { controller.get('upgradeMethods').setEach('allowed', true); controller.runUpgradeMethodChecks(Em.Object.create({ - repositoryVersion: 'v1', + id: '1', displayName: 'V1' })); expect(controller.runPreUpgradeCheckOnly.calledWith({ - value: 'v1', + value: '1', label: 'V1', type: 'ROLLING' })).to.be.true;
