AMBARI-21651. Backport AMBARI-12556 UI Work For Patch/Service Upgrades (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3b1f93b7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b1f93b7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b1f93b7 Branch: refs/heads/branch-2.6 Commit: 3b1f93b72ed84e19bd468b21aa31f4b41a4adcd5 Parents: 7b52efa Author: Alex Antonenko <hiv...@gmail.com> Authored: Thu Aug 3 16:44:56 2017 +0300 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Thu Aug 3 16:44:56 2017 +0300 ---------------------------------------------------------------------- .../main/admin/stack_and_upgrade_controller.js | 12 ++++-------- ambari-web/app/utils/ajax/ajax.js | 2 +- .../main/admin/stack_and_upgrade_controller_test.js | 4 +--- 3 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3b1f93b7/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 6a83db5..23cc429 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 @@ -940,8 +940,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, this.runPreUpgradeCheckOnly({ value: version.get('id'), label: version.get('displayName'), - type: method.get('type'), - targetStack: version.get('displayName') + type: method.get('type') }); } else { //if method not supported in current stack version, mark as check completed @@ -1061,8 +1060,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, self.runPreUpgradeCheckOnly({ value: version.get('id'), label: version.get('displayName'), - type: event.context.get('type'), - targetStack: version.get('displayName') + type: event.context.get('type') }); }, openMessage: function (event) { @@ -1098,8 +1096,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, self.runPreUpgradeCheckOnly.call(self, { value: version.get('id'), label: version.get('displayName'), - type: event.context.get('type'), - targetStack: version.get('displayName') + type: event.context.get('type') }); } }, configs); @@ -1334,8 +1331,7 @@ 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', - targetStack: version.get('displayName') + skipSCFailures: version.get('skipSCFailures') ? 'true' : 'false' }; if (App.get('supports.preUpgradeCheck')) { this.set('requestInProgress', true); http://git-wip-us.apache.org/repos/asf/ambari/blob/3b1f93b7/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 7080829..18d4566 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -1859,7 +1859,7 @@ var urls = { }, 'admin.upgrade.pre_upgrade_check': { - 'real': '/clusters/{clusterName}/rolling_upgrades_check?fields=*&UpgradeChecks/repository_version_id={value}&UpgradeChecks/upgrade_type={type}&UpgradeChecks/target_stack={targetStack}', + 'real': '/clusters/{clusterName}/rolling_upgrades_check?fields=*&UpgradeChecks/repository_version_id={value}&UpgradeChecks/upgrade_type={type}', 'mock': '/data/stack_versions/pre_upgrade_check.json' }, http://git-wip-us.apache.org/repos/asf/ambari/blob/3b1f93b7/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 2c4675b..36ee8aa 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 @@ -408,7 +408,6 @@ describe('App.MainAdminStackAndUpgradeController', function() { value: '1', label: 'HDP-2.2', type: 'ROLLING', - targetStack: 'HDP-2.2', skipComponentFailures: 'false', skipSCFailures: 'false' }); @@ -1760,8 +1759,7 @@ describe('App.MainAdminStackAndUpgradeController', function() { expect(controller.runPreUpgradeCheckOnly.calledWith({ value: '1', label: 'V1', - type: 'ROLLING', - targetStack: 'V1' + type: 'ROLLING' })).to.be.true; }); });
