Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 2683e1281 -> 6db15fab9
AMBARI-21357 Stacks and Versions Page Doesn't Show Stacks From Different Vendors. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6db15fab Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6db15fab Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6db15fab Branch: refs/heads/branch-feature-AMBARI-21348 Commit: 6db15fab9e16db94e41cc774ae6fac94c1670111 Parents: 2683e12 Author: Andrii Tkach <[email protected]> Authored: Tue Jun 27 16:15:22 2017 +0300 Committer: Andrii Tkach <[email protected]> Committed: Tue Jun 27 16:15:22 2017 +0300 ---------------------------------------------------------------------- .../main/admin/stack_and_upgrade_controller.js | 1 + .../main/admin/stack_upgrade/versions_view.js | 5 +- .../admin/stack_and_upgrade_controller_test.js | 2 + .../admin/stack_upgrade/version_view_test.js | 97 ++++++++++++++------ 4 files changed, 77 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6db15fab/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 6a02d0c..5c0a88c 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 @@ -374,6 +374,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, var currentVersion = App.StackVersion.find().findProperty('state', 'CURRENT'); if (currentVersion) { self.set('currentVersion', { + stack_name: currentVersion.get('repositoryVersion.stackVersionType'), repository_version: currentVersion.get('repositoryVersion.repositoryVersion'), repository_name: currentVersion.get('repositoryVersion.displayName') }); http://git-wip-us.apache.org/repos/asf/ambari/blob/6db15fab/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js index 59baf07..5ad5814 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js @@ -170,7 +170,10 @@ App.MainAdminStackVersionsView = Em.View.extend({ return versions.toArray(); } else { return versions.filter(function(v) { - return stringUtils.compareVersions(v.get('repositoryVersion'), Em.get(currentVersion, 'repository_version')) >= 0; + if (v.get('stackVersionType') === Em.get(currentVersion, 'stack_name')) { + return stringUtils.compareVersions(v.get('repositoryVersion'), Em.get(currentVersion, 'repository_version')) >= 0; + } + return true; }).toArray(); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/6db15fab/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 186456a..b0e8922 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: { + stackVersionType: 'HDP', 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({ + "stack_name": 'HDP', "repository_version": "2.2", "repository_name": "HDP-2.2" }); http://git-wip-us.apache.org/repos/asf/ambari/blob/6db15fab/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js index b7df818..d9f7e0c 100644 --- a/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js +++ b/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js @@ -28,6 +28,7 @@ describe('App.mainAdminStackVersionsView', function () { view = App.MainAdminStackVersionsView.create({ controller: { currentVersion: { + stack_name: 'HDP', repository_version: "2.2.1.0", runningCheckRequests: [] }, @@ -45,40 +46,54 @@ describe('App.mainAdminStackVersionsView', function () { var versions = [ Em.Object.create({ status: "INIT", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALLING", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALLED", - repositoryVersion: "2.2.0.1" + repositoryVersion: "2.0.2.1", + stackVersionType: 'HCP' }), Em.Object.create({ status: "INSTALLED", - repositoryVersion: "2.2.2.1" + repositoryVersion: "2.2.0.1", + stackVersionType: 'HDP' + }), + Em.Object.create({ + status: "INSTALLED", + repositoryVersion: "2.2.2.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALLED", repositoryVersion: "2.2.3.1", - displayName: 'HDP-2.2' + displayName: 'HDP-2.2', + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALL_FAILED", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "OUT_OF_SYNC", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "UPGRADED", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "CURRENT", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }) ], testCases = [ @@ -89,36 +104,49 @@ describe('App.mainAdminStackVersionsView', function () { filteredVersions: [ Em.Object.create({ status: "INIT", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALLING", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' + }), + Em.Object.create({ + status: "INSTALLED", + repositoryVersion: "2.0.2.1", + stackVersionType: 'HCP' }), Em.Object.create({ status: "INSTALLED", - repositoryVersion: "2.2.2.1" + repositoryVersion: "2.2.2.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALLED", repositoryVersion: "2.2.3.1", - displayName: 'HDP-2.2' + displayName: 'HDP-2.2', + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALL_FAILED", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "OUT_OF_SYNC", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "UPGRADED", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "CURRENT", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }) ] }, @@ -129,19 +157,23 @@ describe('App.mainAdminStackVersionsView', function () { filteredVersions: [ Em.Object.create({ status: "INIT", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALLING", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALL_FAILED", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "OUT_OF_SYNC", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }) ] }, @@ -150,7 +182,11 @@ describe('App.mainAdminStackVersionsView', function () { value: 'INSTALLED' }), filteredVersions: [ - + Em.Object.create({ + status: "INSTALLED", + repositoryVersion: "2.0.2.1", + stackVersionType: 'HCP' + }) ] }, { @@ -160,7 +196,8 @@ describe('App.mainAdminStackVersionsView', function () { filteredVersions: [ Em.Object.create({ status: "INSTALLED", - repositoryVersion: "2.2.2.1" + repositoryVersion: "2.2.2.1", + stackVersionType: 'HDP' }) ] }, @@ -171,7 +208,8 @@ describe('App.mainAdminStackVersionsView', function () { filteredVersions: [ Em.Object.create({ status: "CURRENT", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }) ] }, @@ -183,7 +221,8 @@ describe('App.mainAdminStackVersionsView', function () { Em.Object.create({ status: "INSTALLED", repositoryVersion: "2.2.3.1", - displayName: 'HDP-2.2' + displayName: 'HDP-2.2', + stackVersionType: 'HDP' }) ] }, @@ -194,7 +233,8 @@ describe('App.mainAdminStackVersionsView', function () { filteredVersions: [ Em.Object.create({ status: "UPGRADED", - repositoryVersion: "2.2.1.1" + repositoryVersion: "2.2.1.1", + stackVersionType: 'HDP' }) ] }, @@ -234,7 +274,10 @@ describe('App.mainAdminStackVersionsView', function () { var msg = t.filter.get('value') || "All"; it(t.message || "filter By " + msg, function () { displayOlderVersions = t.displayOlderVersions; - view.set('controller.currentVersion', t.noCurrentVersion ? null : {repository_version: '2.2.1.1'}); + view.set('controller.currentVersion', t.noCurrentVersion ? null : { + repository_version: '2.2.1.1', + stack_name: 'HDP' + }); expect(view.filterBy(versions, t.filter)).to.eql(t.filteredVersions); }); });
