AMBARI-21622 Install Wizard: repository_version should not be passed when creating a cluster. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ac9f559 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ac9f559 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ac9f559 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: 3ac9f5590ab60c105de806cbb5ca875fc43ee13f Parents: 0eee38e Author: Andrii Tkach <atk...@apache.org> Authored: Tue Aug 1 16:45:16 2017 +0300 Committer: Andrii Tkach <atk...@apache.org> Committed: Tue Aug 1 16:45:16 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step8_controller.js | 3 +-- ambari-web/test/controllers/wizard/step8_test.js | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac9f559/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index 42519e0..cc06b5b 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -977,11 +977,10 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz createCluster: function () { if (!this.get('isInstaller')) return; var stackVersion = this.get('content.installOptions.localRepo') ? App.currentStackVersion.replace(/(-\d+(\.\d)*)/ig, "Local$&") : App.currentStackVersion; - var selectedStack = App.Stack.find().findProperty('isSelected', true); this.addRequestToAjaxQueue({ name: 'wizard.step8.create_cluster', data: { - data: JSON.stringify({ "Clusters": {"version": stackVersion, "repository_version": selectedStack.get('repositoryVersion')}}) + data: JSON.stringify({ "Clusters": {"version": stackVersion}}) }, success: 'createClusterSuccess' }); http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac9f559/ambari-web/test/controllers/wizard/step8_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/wizard/step8_test.js b/ambari-web/test/controllers/wizard/step8_test.js index 29e6ae4..2a52598 100644 --- a/ambari-web/test/controllers/wizard/step8_test.js +++ b/ambari-web/test/controllers/wizard/step8_test.js @@ -1165,7 +1165,7 @@ describe('App.WizardStep8Controller', function () { App.set('currentStackVersion', 'HDP-2.3'); installerStep8Controller.reopen({content: {controllerName: 'installerController', installOptions: {localRepo: true}}}); var data = { - data: JSON.stringify({ "Clusters": {"version": 'HDPLocal-2.3', "repository_version": "2.3.4.4-1234"}}) + data: JSON.stringify({ "Clusters": {"version": 'HDPLocal-2.3'}}) }; installerStep8Controller.createCluster(); expect(installerStep8Controller.addRequestToAjaxQueue.args[0][0].data.data).to.equal(data.data); @@ -1175,7 +1175,7 @@ describe('App.WizardStep8Controller', function () { App.set('currentStackVersion', 'HDP-2.3'); installerStep8Controller.reopen({content: {controllerName: 'installerController', installOptions: {localRepo: false}}}); var data = { - data: JSON.stringify({ "Clusters": {"version": 'HDP-2.3', "repository_version": "2.3.4.4-1234"}}) + data: JSON.stringify({ "Clusters": {"version": 'HDP-2.3'}}) }; installerStep8Controller.createCluster(); expect(installerStep8Controller.addRequestToAjaxQueue.args[0][0].data.data).to.eql(data.data);
