You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/14 21:19:36 UTC
[05/26] ambari git commit: AMBARI-21183. Removal of INIT Repository
State from Web Client (alexantonenko)
AMBARI-21183. Removal of INIT Repository State from Web Client (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12202a2f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12202a2f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12202a2f
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 12202a2fd303e0d557a987f77f33387e17c9fb81
Parents: 64e3ad7
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Jun 6 17:12:42 2017 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Jun 6 17:12:42 2017 +0300
----------------------------------------------------------------------
ambari-web/app/app.js | 8 +++---
.../main/admin/stack_and_upgrade_controller.js | 6 ++---
ambari-web/app/data/controller_route.js | 2 +-
.../models/stack_version/repository_version.js | 2 +-
.../stack_upgrade/upgrade_version_box_view.js | 8 +++---
.../upgrade_version_column_view.js | 2 +-
.../admin/stack_upgrade/upgrade_wizard_view.js | 2 +-
.../main/admin/stack_upgrade/versions_view.js | 2 +-
ambari-web/test/app_test.js | 10 +++----
.../admin/stack_and_upgrade_controller_test.js | 18 ++++++-------
.../upgrade_version_box_view_test.js | 28 ++++++++++----------
.../stack_upgrade/upgrade_wizard_view_test.js | 2 +-
.../admin/stack_upgrade/version_view_test.js | 6 ++---
13 files changed, 48 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/ambari-web/app/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index c22d71c..2c638e4 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -56,7 +56,7 @@ module.exports = Em.Application.create({
/**
* state of stack upgrade process
* states:
- * - INIT
+ * - NOT_REQUIRED
* - PENDING
* - IN_PROGRESS
* - HOLDING
@@ -66,14 +66,14 @@ module.exports = Em.Application.create({
* - HOLDING_TIMEDOUT
* @type {String}
*/
- upgradeState: 'INIT',
+ upgradeState: 'NOT_REQUIRED',
/**
* Check if upgrade is in INIT state
* 'INIT' is set on upgrade start and when it's finished
* @type {boolean}
*/
- upgradeInit: Em.computed.equal('upgradeState', 'INIT'),
+ upgradeInit: Em.computed.equal('upgradeState', 'NOT_REQUIRED'),
/**
* flag is true when upgrade process is running
@@ -146,7 +146,7 @@ module.exports = Em.Application.create({
// When Upgrade running(not suspended) only operations related to upgrade should be allowed
if ((!this.get('upgradeSuspended') && !authRoles.contains('CLUSTER.UPGRADE_DOWNGRADE_STACK')) &&
!App.get('supports.opsDuringRollingUpgrade') &&
- !['INIT', 'COMPLETED'].contains(this.get('upgradeState')) ||
+ !['NOT_REQUIRED', 'COMPLETED'].contains(this.get('upgradeState')) ||
!App.auth){
return false;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/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 a676f7429..91b5ecd 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
@@ -1705,7 +1705,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
},
/**
- * reset upgradeState to INIT when upgrade is COMPLETED
+ * reset upgradeState to NOT_REQUIRED when upgrade is COMPLETED
* and clean auxiliary data
*/
finish: function () {
@@ -1713,7 +1713,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
this.setDBProperties({
fromVersion: undefined,
upgradeId: undefined,
- upgradeState: 'INIT',
+ upgradeState: 'NOT_REQUIRED',
upgradeVersion: undefined,
currentVersion: undefined,
upgradeTypeDisplayName: undefined,
@@ -1730,7 +1730,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
if (upgradeVersion && upgradeVersion[0]) {
App.set('currentStackVersion', upgradeVersion[0]);
}
- App.set('upgradeState', 'INIT');
+ App.set('upgradeState', 'NOT_REQUIRED');
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/ambari-web/app/data/controller_route.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/controller_route.js b/ambari-web/app/data/controller_route.js
index 5f7c499..13d0380 100644
--- a/ambari-web/app/data/controller_route.js
+++ b/ambari-web/app/data/controller_route.js
@@ -71,7 +71,7 @@ module.exports = [
},
{
wizardControllerName: App.router.get('mainAdminStackAndUpgradeController.name'),
- route: App.db.get('MainAdminStackAndUpgrade', 'upgradeState') == 'INIT' ? 'main.admin.stackAndUpgrade.index' : 'main.admin.stackAndUpgrade.versions'
+ route: App.db.get('MainAdminStackAndUpgrade', 'upgradeState') === 'NOT_REQUIRED' ? 'main.admin.stackAndUpgrade.index' : 'main.admin.stackAndUpgrade.versions'
},
{
wizardControllerName: App.router.get('widgetWizardController.name'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/ambari-web/app/models/stack_version/repository_version.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_version/repository_version.js b/ambari-web/app/models/stack_version/repository_version.js
index d5bc64d..5ecfdd1 100644
--- a/ambari-web/app/models/stack_version/repository_version.js
+++ b/ambari-web/app/models/stack_version/repository_version.js
@@ -38,7 +38,7 @@ App.RepositoryVersion = DS.Model.extend({
* status used until corresponding stack version get created
* @type {string}
*/
- defaultStatus: 'INIT',
+ defaultStatus: 'NOT_REQUIRED',
/**
* @type {boolean}
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index bb0cc81..1af7d5c 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -57,7 +57,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
isUpgrading: function () {
return (this.get('controller.upgradeVersion') === this.get('content.displayName') ||
this.get('controller.fromVersion') === this.get('content.repositoryVersion'))
- && App.get('upgradeState') !== 'INIT';
+ && App.get('upgradeState') !== 'NOT_REQUIRED';
}.property('App.upgradeState', 'content.displayName', 'controller.upgradeVersion'),
isRepoUrlsEditDisabled: function () {
@@ -119,7 +119,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
text: Em.I18n.t('common.current'),
class: 'label label-success'
},
- 'INIT': {
+ 'NOT_REQUIRED': {
isButton: true,
text: Em.I18n.t('admin.stackVersions.version.installNow'),
action: 'installRepoVersionConfirmation'
@@ -170,7 +170,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
if (['INSTALLING', 'CURRENT'].contains(status)) {
element.setProperties(statePropertiesMap[status]);
}
- else if (status === 'INIT') {
+ else if (status === 'NOT_REQUIRED') {
requestInProgressRepoId && requestInProgressRepoId == this.get('content.id') ? element.setProperties(statePropertiesMap['LOADING']) : element.setProperties(statePropertiesMap[status]);
element.set('isDisabled', this.isDisabledOnInit());
}
@@ -245,7 +245,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
),
/**
- * check if actions of INIT stack version disabled
+ * check if actions of NOT_REQUIRED stack version disabled
* @returns {boolean}
*/
isDisabledOnInit: function() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
index 4ce07f2..91381e7 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
@@ -73,7 +73,7 @@ App.UpgradeVersionColumnView = App.UpgradeVersionBoxView.extend({
text: Em.I18n.t('common.current'),
class: 'label label-success'
},
- 'INIT': {
+ 'NOT_REQUIRED': {
isButton: true,
text: Em.I18n.t('common.install'),
action: 'installRepoVersionConfirmation'
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
index bcb1ad7..3b269a0 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
@@ -123,7 +123,7 @@ App.upgradeWizardView = Em.View.extend({
*/
noActiveItem: function () {
return (Em.isNone(this.get('failedItem')) && Em.isNone(this.get('runningItem')) && Em.isNone(this.get('manualItem'))) &&
- !['INIT', 'COMPLETED', 'ABORTED'].contains(App.get('upgradeState'));
+ !['NOT_REQUIRED', 'COMPLETED', 'ABORTED'].contains(App.get('upgradeState'));
}.property('failedItem', 'runningItem', 'manualItem', 'App.upgradeState'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/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 c317465..6077344 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
@@ -160,7 +160,7 @@ App.MainAdminStackVersionsView = Em.View.extend({
return stringUtils.compareVersions(version.get('repositoryVersion'), Em.get(currentVersion, 'repository_version')) < 1;
}
} else if (filter.get('value') === 'NOT_INSTALLED') {
- return ['INIT', 'INSTALL_FAILED', 'INSTALLING', 'OUT_OF_SYNC'].contains(status);
+ return ['NOT_REQUIRED', 'INSTALL_FAILED', 'INSTALLING', 'OUT_OF_SYNC'].contains(status);
} else {
return status === filter.get('value');
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/ambari-web/test/app_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/app_test.js b/ambari-web/test/app_test.js
index c87215f..2812b7d 100644
--- a/ambari-web/test/app_test.js
+++ b/ambari-web/test/app_test.js
@@ -443,7 +443,7 @@ describe('App', function () {
describe('#upgradeSuspended', function () {
var cases = [
{
- upgradeState: 'INIT',
+ upgradeState: 'NOT_REQUIRED',
isSuspended: false,
upgradeSuspended: false
},
@@ -480,7 +480,7 @@ describe('App', function () {
var cases = [
{
- upgradeState: 'INIT',
+ upgradeState: 'NOT_REQUIRED',
isSuspended: false,
upgradeAborted: false
},
@@ -516,7 +516,7 @@ describe('App', function () {
describe('#wizardIsNotFinished', function () {
var cases = [
{
- upgradeState: 'INIT',
+ upgradeState: 'NOT_REQUIRED',
wizardIsNotFinished: false
},
{
@@ -549,7 +549,7 @@ describe('App', function () {
describe("#upgradeHolding", function () {
var cases = [
{
- upgradeState: 'INIT',
+ upgradeState: 'NOT_REQUIRED',
upgradeAborted: false,
upgradeHolding: false
},
@@ -564,7 +564,7 @@ describe('App', function () {
upgradeHolding: true
},
{
- upgradeState: 'INIT',
+ upgradeState: 'NOT_REQUIRED',
upgradeAborted: true,
upgradeHolding: true
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/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 4585991..b87714e 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
@@ -98,9 +98,9 @@ describe('App.MainAdminStackAndUpgradeController', function() {
it("state not ABORTED", function() {
this.mock.returns(false);
- controller.set('upgradeData', { Upgrade: {request_status: 'INIT'}});
+ controller.set('upgradeData', { Upgrade: {request_status: 'NOT_REQUIRED'}});
controller.propertyDidChange('requestStatus');
- expect(controller.get('requestStatus')).to.equal('INIT');
+ expect(controller.get('requestStatus')).to.equal('NOT_REQUIRED');
});
it("upgradeData is null", function() {
@@ -235,7 +235,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
controller.updateUpgradeData.restore();
controller.setDBProperty.restore();
controller.finish.restore();
- App.set('upgradeState', 'INIT');
+ App.set('upgradeState', 'NOT_REQUIRED');
});
it("correct data", function() {
@@ -1197,7 +1197,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
describe("#installRepoVersionSuccess()", function() {
var mock = Em.Object.create({
id: 1,
- defaultStatus: 'INIT',
+ defaultStatus: 'NOT_REQUIRED',
stackVersion: {}
});
beforeEach(function () {
@@ -3133,7 +3133,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
expect(controller.setDBProperties.calledWith({
fromVersion: undefined,
upgradeId: undefined,
- upgradeState: 'INIT',
+ upgradeState: 'NOT_REQUIRED',
upgradeVersion: undefined,
currentVersion: undefined,
upgradeTypeDisplayName: undefined,
@@ -3155,9 +3155,9 @@ describe('App.MainAdminStackAndUpgradeController', function() {
expect(App.clusterStatus.setClusterStatus.calledOnce).to.be.true;
});
- it("upgradeState should be INIT", function() {
+ it("upgradeState should be NOT_REQUIRED", function() {
controller.finish();
- expect(App.get('upgradeState')).to.be.equal('INIT');
+ expect(App.get('upgradeState')).to.be.equal('NOT_REQUIRED');
});
it("currentStackVersion should be set", function() {
@@ -3265,7 +3265,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
ClusterStackVersions: {
version: '2.3',
stack: 'HDP',
- state: 'INIT'
+ state: 'NOT_REQUIRED'
},
repository_versions: [
{
@@ -3281,7 +3281,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
ClusterStackVersions: {
version: '2.2',
stack: 'HDP',
- state: 'INIT'
+ state: 'NOT_REQUIRED'
},
repository_versions: [
{
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
index 31aa796..b5738a0 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
@@ -50,7 +50,7 @@ describe('App.UpgradeVersionBoxView', function () {
view.set('controller.fromVersion', 'HDP-1');
});
afterEach(function () {
- App.set('upgradeState', 'INIT');
+ App.set('upgradeState', 'NOT_REQUIRED');
});
it("wrong version", function () {
App.set('upgradeState', 'IN_PROGRESS');
@@ -74,15 +74,15 @@ describe('App.UpgradeVersionBoxView', function () {
view.propertyDidChange('isUpgrading');
expect(view.get('isUpgrading')).to.be.true;
});
- it("upgradeState INIT", function () {
- App.set('upgradeState', 'INIT');
+ it("upgradeState NOT_REQUIRED", function () {
+ App.set('upgradeState', 'NOT_REQUIRED');
view.set('controller.upgradeVersion', 'HDP-2.2.2');
view.set('content.displayName', 'HDP-2.2.2');
view.propertyDidChange('isUpgrading');
expect(view.get('isUpgrading')).to.be.false;
});
- it("upgradeState INIT and wrong version", function () {
- App.set('upgradeState', 'INIT');
+ it("upgradeState NOT_REQUIRED and wrong version", function () {
+ App.set('upgradeState', 'NOT_REQUIRED');
view.set('controller.upgradeVersion', 'HDP-2.2.2');
view.set('content.displayName', 'HDP-2.2.1');
view.propertyDidChange('isUpgrading');
@@ -449,11 +449,11 @@ describe('App.UpgradeVersionBoxView', function () {
},
{
inputData: {
- 'content.status': 'INIT',
+ 'content.status': 'NOT_REQUIRED',
'controller.requestInProgress': false,
'parentView.repoVersions': [
Em.Object.create({
- status: 'INIT'
+ status: 'NOT_REQUIRED'
})
]
},
@@ -462,20 +462,20 @@ describe('App.UpgradeVersionBoxView', function () {
this.initMock.returns(false);
},
expected: {
- status: 'INIT',
+ status: 'NOT_REQUIRED',
isButton: true,
buttons: [],
isDisabled: true
},
- title: 'INIT state, no admin access, no requests in progress'
+ title: 'NOT_REQUIRED state, no admin access, no requests in progress'
},
{
inputData: {
- 'content.status': 'INIT',
+ 'content.status': 'NOT_REQUIRED',
'controller.requestInProgress': true,
'parentView.repoVersions': [
Em.Object.create({
- status: 'INIT'
+ status: 'NOT_REQUIRED'
})
]
},
@@ -484,12 +484,12 @@ describe('App.UpgradeVersionBoxView', function () {
this.initMock.returns(true);
},
expected: {
- status: 'INIT',
+ status: 'NOT_REQUIRED',
isButton: true,
buttons: [],
isDisabled: true
},
- title: 'INIT state, no admin access, request in progress, not installation'
+ title: 'NOT_REQUIRED state, no admin access, request in progress, not installation'
},
{
inputData: {
@@ -1039,7 +1039,7 @@ describe('App.UpgradeVersionBoxView', function () {
title: 'upgrading just started'
},
{
- status: 'INIT',
+ status: 'NOT_REQUIRED',
isUpgrading: false,
isRepoUrlsEditDisabled: false,
title: 'neither upgrading nor installing packages'
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
index 075bcc8..7ae785c 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
@@ -322,7 +322,7 @@ describe('App.upgradeWizardView', function () {
failedItem: null,
runningItem: null,
manualItem: null,
- upgradeState: 'INIT'
+ upgradeState: 'NOT_REQUIRED'
},
result: false
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/12202a2f/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 651c361..cf66165 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
@@ -44,7 +44,7 @@ describe('App.mainAdminStackVersionsView', function () {
describe("#filterBy()", function () {
var versions = [
Em.Object.create({
- status: "INIT",
+ status: "NOT_REQUIRED",
repositoryVersion: "2.2.1.1"
}),
Em.Object.create({
@@ -88,7 +88,7 @@ describe('App.mainAdminStackVersionsView', function () {
}),
filteredVersions: [
Em.Object.create({
- status: "INIT",
+ status: "NOT_REQUIRED",
repositoryVersion: "2.2.1.1"
}),
Em.Object.create({
@@ -128,7 +128,7 @@ describe('App.mainAdminStackVersionsView', function () {
}),
filteredVersions: [
Em.Object.create({
- status: "INIT",
+ status: "NOT_REQUIRED",
repositoryVersion: "2.2.1.1"
}),
Em.Object.create({