You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2017/07/25 14:26:10 UTC
ambari git commit: AMBARI-21357 Stacks and Versions Page Doesn't Show
Stacks From Different Vendors. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk a4ce7b865 -> 54cdd41f5
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/54cdd41f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54cdd41f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54cdd41f
Branch: refs/heads/trunk
Commit: 54cdd41f529b080f07a7e838d6e786eef26b15b9
Parents: a4ce7b8
Author: Andrii Tkach <at...@apache.org>
Authored: Tue Jul 25 17:22:02 2017 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Tue Jul 25 17:22:02 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/54cdd41f/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 f712eea..90b4528 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
@@ -413,6 +413,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
var currentVersion = App.StackVersion.find().findProperty('state', 'CURRENT');
if (currentVersion) {
this.set('currentVersion', {
+ stack_name: currentVersion.get('repositoryVersion.stackVersionType'),
repository_version: currentVersion.get('repositoryVersion.repositoryVersion'),
repository_name: currentVersion.get('repositoryVersion.displayName'),
id: currentVersion.get('repositoryVersion.id')
http://git-wip-us.apache.org/repos/asf/ambari/blob/54cdd41f/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 6077344..cbaf26a 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/54cdd41f/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 ca0c4e7..f1f5a97 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
@@ -129,6 +129,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
state: 'CURRENT',
repositoryVersion: {
id: '1',
+ stackVersionType: 'HDP',
repositoryVersion: '2.2',
displayName: 'HDP-2.2'
}
@@ -157,6 +158,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
it('currentVersion is corrent', function () {
expect(controller.get('currentVersion')).to.eql({
"id": "1",
+ "stack_name": 'HDP',
"repository_version": "2.2",
"repository_name": "HDP-2.2"
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/54cdd41f/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 cf66165..cedec96 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: "NOT_REQUIRED",
- 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.2.0.1",
+ stackVersionType: 'HDP'
}),
Em.Object.create({
status: "INSTALLED",
- repositoryVersion: "2.2.2.1"
+ repositoryVersion: "2.2.2.1",
+ stackVersionType: 'HDP'
+ }),
+ Em.Object.create({
+ status: "INSTALLED",
+ repositoryVersion: "2.0.2.1",
+ stackVersionType: 'HCP'
}),
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: "NOT_REQUIRED",
- 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.2.1",
+ stackVersionType: 'HDP'
}),
Em.Object.create({
status: "INSTALLED",
- repositoryVersion: "2.2.2.1"
+ repositoryVersion: "2.0.2.1",
+ stackVersionType: 'HCP'
}),
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: "NOT_REQUIRED",
- 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'
})
]
},
@@ -236,7 +276,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);
});
});