You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by zh...@apache.org on 2016/04/30 00:53:25 UTC
[2/3] ambari git commit: AMBARI-15724 Integrate Version Registration
in Select Stack Page (zhewang)
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1a624d4..c5e1145 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -549,8 +549,36 @@ Em.I18n.translations = {
'installer.step0.clusterName.error.whitespace':'Cluster Name cannot contain whitespace',
'installer.step0.clusterName.error.specialChar':'Cluster Name cannot contain special characters',
- 'installer.step1.header':'Select Stack',
- 'installer.step1.body':'Please select the service stack that you want to use to install your Hadoop cluster.',
+ 'installer.step1.header':'Select Version',
+ 'installer.step1.body':'Select the software version and method of delivery for your cluster. Using a Public Repository requires Internet connectivity. Using a Local Repository requires you have configured the software in a repository available in your network.',
+ 'installer.step1.selectUseRepoOptions.public':'Use Public Repository',
+ 'installer.step1.selectUseRepoOptions.public.networkLost.button':'Not Available',
+ 'installer.step1.selectUseRepoOptions.public.networkLost':'Why is this disabled?',
+ 'installer.step1.selectUseRepoOptions.public.networkLost.popup.title': 'Public Repository Option Disabled',
+ 'installer.step1.selectUseRepoOptions.public.networkLost.popup.msg': 'Ambari does not have access to the Internet and cannot use the Public Repository for installing the software. Your Options:',
+ 'installer.step1.selectUseRepoOptions.public.networkLost.popup.msg1': 'Configure your hosts for access to the Internet.',
+ 'installer.step1.selectUseRepoOptions.public.networkLost.popup.msg2': 'If you are using an Internet Proxy, refer to the Ambari Documentation on how to configure Ambari to use the Internet Proxy.',
+ 'installer.step1.selectUseRepoOptions.public.networkLost.popup.msg3': 'Use the Local Repositoy option.',
+ 'installer.step1.selectUseRepoOptions.public.select':'Select Version',
+ 'installer.step1.selectUseRepoOptions.local':'Use Local Repository',
+ 'installer.step1.usePublicRepo.ReposList.empty':'No other repositories',
+ 'installer.step1.usePublicRepo.viewRepos':'View Repositories',
+ 'installer.step1.useLocalRepo.uploadFile': 'Upload Version Definition File',
+ 'installer.step1.useLocalRepo.uploadFile.error.title': 'Upload Version Definition File Error',
+ 'installer.step1.useLocalRepo.getSurpottedOs.error.title': 'Cannot get supportted OS types',
+ 'installer.step1.useLocalRepo.addRepo.button': 'Add Repository',
+ 'installer.step1.useLocalRepo.enterUrl': 'Version Definition File URL',
+ 'installer.step1.useLocalRepo.readButton': 'Read Version Info',
+ 'installer.step1.useLocalRepo.infoForm.details.title': 'Details',
+ 'installer.step1.useLocalRepo.infoForm.details.stackName': 'Stack Name',
+ 'installer.step1.useLocalRepo.infoForm.details.displayName': 'Display Name',
+ 'installer.step1.useLocalRepo.infoForm.details.version': 'Version',
+ 'installer.step1.useLocalRepo.infoForm.details.actualVersion': 'Actual Version',
+ 'installer.step1.useLocalRepo.infoForm.details.releaseNotes': 'Release Notes',
+ 'installer.step1.useLocalRepo.infoForm.content.title': 'Contents',
+ 'installer.step1.useLocalRepo.infoForm.content.empty': 'No contents to display',
+ 'installer.step1.useLocalRepo.infoForm.alert.baseUrl': 'Provide Base URLs for the Operating Systems you are configuring.',
+ 'installer.step1.useLocalRepo.infoForm.alert.warning': 'Some of the repositories failed validation. Make changes to the base url or skip validation if you are sure that urls are correct',
'installer.step1.advancedRepo.title':'Advanced Repository Options',
'installer.step1.advancedRepo.message':'Customize the repository Base URLs for downloading the Stack software packages. If your hosts do not have access to the internet, you will have to create a local mirror of the Stack repository that is accessible by all hosts and use those Base URLs here.',
'installer.step1.advancedRepo.importantMassage':'<b>Important:</b> When using local mirror repositories, you only need to provide Base URLs for the Operating System you are installing for your Stack. Uncheck all other repositories.',
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/models/stack.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack.js b/ambari-web/app/models/stack.js
index 0b1c9d2..992a79c 100644
--- a/ambari-web/app/models/stack.js
+++ b/ambari-web/app/models/stack.js
@@ -19,18 +19,29 @@
var App = require('app');
App.Stack = DS.Model.extend({
- id: DS.attr('string'), // ${stackName}-${stackVersion}.
+ id: DS.attr('string'), // ${stackName}-${stackVersion}-${repoVersion}.
stackName: DS.attr('string'),
stackVersion: DS.attr('string'),
- active: DS.attr('boolean'), // All of the instances should have this value to true. We should map only those stacks that has active flag set to true
- parentStackVersion: DS.attr('string'),
- minUpgradeVersion: DS.attr('string'),
- minJdkVersion: DS.attr('string'),
- maxJdkVersion: DS.attr('string'),
- configTypes: DS.attr('object'),
+ repositoryVersion: DS.attr('string'),
+ showAvailable: DS.attr('boolean'), // All of the instances should have this value to true. We should map only those stacks that has this flag set to true
+ type: DS.attr('string'), // ["PATCH", "STANDARD"]
+ stackServices: DS.hasMany('App.ServiceSimple'),
operatingSystems: DS.hasMany('App.OperatingSystem'),
isSelected: DS.attr('boolean', {defaultValue: false}),
+ stackNameVersion: function () {
+ //${stackName}-${stackVersion}.
+ return this.get('stackName') + '-' + this.get('stackVersion');
+ }.property('stackName', 'stackVersion'),
+
+ isPatch: function () {
+ return this.get('type') == "PATCH";
+ }.property('type'),
+ displayName: function () {
+ //${stackName}-${repositoryVersion}.
+ return this.get('stackName') + '-' + this.get('repositoryVersion');
+ }.property('stackName', 'repositoryVersion'),
+
/**
* @return: {Array} returns supported repositories for all OperatingSystem's supported by a stack instance
*/
@@ -43,30 +54,8 @@ App.Stack = DS.Model.extend({
}, this);
}, this);
return repositories;
- }.property('id'),
-
- /**
- * @return: {Array} App.StackService instances for selected stack instance. For non-selected stack instance returns empty array
- */
- services: function () {
- var result = [];
- var isStackSelected = this.get('isSelected');
- var stackServices = App.StackService.find().get('length');
- if (isStackSelected && stackServices) {
- result = App.StackService.find();
- }
- return result;
- }.property('isSelected'),
-
- /**
- * Right now there ambari-web is not fetching this information from the server as it does not need as of present.
- * @TODO: This should return stack level configurations for selected stack instance i.e properties of cluster-env file
- */
- configurations: function() {
- return [];
- }.property('isSelected')
-
+ }.property('id')
});
-App.Stack.FIXTURES = [];
+App.Stack.FIXTURES = [];
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/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 e02999f..4141c14 100644
--- a/ambari-web/app/models/stack_version/repository_version.js
+++ b/ambari-web/app/models/stack_version/repository_version.js
@@ -25,6 +25,7 @@ App.RepositoryVersion = DS.Model.extend({
upgradePack: DS.attr('string'),
stackVersionType: DS.attr('string'),
stackVersionNumber: DS.attr('string'),
+ useRedhatSatellite: DS.attr('boolean'),
operatingSystems: DS.hasMany('App.OS'),
services: DS.hasMany('App.ServiceSimple'),
stackVersion: DS.belongsTo('App.StackVersion'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index ad256f5..5dbc585 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -102,7 +102,14 @@ module.exports = App.WizardRoute.extend({
controller.loadAllPriorSteps().done(function () {
var wizardStep4Controller = router.get('wizardStep4Controller');
wizardStep4Controller.set('wizardController', controller);
- controller.connectOutlet('wizardStep4', controller.get('content.services').filterProperty('isInstallable', true));
+ controller.loadServiceVersionFromVersionDefinitions().complete(function () {
+ controller.set('content.services', App.StackService.find().forEach(function (item) {
+ // user the service version from VersionDefinition
+ Ember.set(item, 'serviceVersionDisplay', controller.get('serviceVersionsMap')[item.get('serviceName')]);
+ //item.set('serviceVersionDisplay', controller.get('serviceVersionsMap')[item.get('serviceName')]);
+ }));
+ controller.connectOutlet('wizardStep4', controller.get('content.services').filterProperty('isInstallable', true));
+ });
});
});
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index cb1b4e4..87fc485 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -6201,6 +6201,161 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox {
margin-left: -10px;
}
+#select-stack .stack-version-selection{
+ .select-version-label {
+ padding: 5px 25px;
+ }
+ .right-stack-info {
+ margin-left: 0px;
+ .available-repos-dropdown {
+ a, a.disbled{
+ cursor: pointer;
+ }
+ a.disabled{
+ color: #999999;
+ background: none;
+ }
+ }
+ }
+}
+#select-stack .stack-version-selection.disabled{
+ .select-version-label {
+ color: #999999;
+ }
+ .btn-primary.disabled:hover{
+ cursor: not-allowed;
+ }
+}
+
+.public-disabled-message {
+ padding: 5px;
+}
+.public-disabled-option {
+ padding: 5px;
+ padding-left: 15px;
+}
+#select-stack {
+ .big-radio {
+ font-weight: bold;
+ padding: 5px 15px;
+ }
+ #public-disabled-link {
+ margin-left: 10px;
+ font-weight: normal;
+ cursor: pointer;
+ }
+ #upload-definition-file-panel {
+ .register-version-options {
+ padding: 5px 0px;
+ .local-option-label {
+ margin-left: 20px;
+ padding-top: 4px;
+ }
+ }
+ .vdf-url {
+ input {
+ width: 80%;
+ }
+ }
+ .read-info-button {
+ margin: 10px 0px;
+ }
+ }
+ #upload-definition-file-panel.disabled {
+ .local-option-label {
+ color: #999999;
+ }
+ }
+}
+#select-stack #repoVersionInfoForm {
+ .accordion-heading {
+ background-color: #f0f0f0;
+ font-weight: bold;
+ p {
+ margin-bottom: 0px;
+ display: block;
+ padding: 8px 15px;
+ }
+ }
+ .accordion-body {
+ .version-info-section {
+ padding: 10px;
+ }
+ .control-label {
+ text-align: left;
+ line-height: 14px;
+ }
+ .version-info {
+ font-weight: bold;
+ padding-top: 5px;
+ line-height: 14px;
+ }
+ }
+ .details-panel .patch-icon {
+ color: #ff4500;
+ }
+ .details-panel .version-contents-section {
+ border: 1px solid #ddd;
+ max-height: 200px;
+ overflow: auto;
+ padding: 8px 25px;
+ margin: 8px;
+ }
+ .repos-panel {
+ .remove-icon {
+ color: red;
+ margin: 20px 0px;
+ padding: 0px;
+ text-align: center;
+ cursor: pointer;
+ }
+ .border-bottom {
+ border-bottom: 1px solid #ebebeb;
+ }
+ .repo-table-title {
+ padding-left: 5px;
+ border-bottom: 1px solid #ebebeb;
+ label {
+ font-weight: bold;
+ }
+ }
+ .os-type-label {
+ margin-top: 27px;
+ padding-left: 10px;
+ label {
+ font-weight: bold;
+ }
+ }
+ .repo-name-label {
+ text-align: left;
+ padding-top: 10px;
+ }
+ .repo-name-url {
+ padding: 8px 0px;
+ }
+ .repo-url input {
+ width: 90%;
+ height: 24px;
+ }
+ .add-os-button {
+ margin-top:10px;
+ button.disabled {
+ cursor: not-allowed;
+ }
+ }
+ #skip-validation {
+ margin-top: 13px;
+ }
+ #use-redhat, #skip-validation {
+ .icon-question-sign {
+ color: #0572ff;
+ }
+ input{
+ margin: 0px 10px;
+ }
+ }
+ }
+}
#combo_search_box {
.VS-search {
.VS-search-box {
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
index 35677ab..63690b7 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
@@ -51,7 +51,7 @@
data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label>
</div>
<div id="use-redhat">
- <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="view.parentView.useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}}
+ <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="view.content.useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}}
<i class="icon-question-sign" rel="use-redhat-tooltip"
data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
index a87c50c..8ba51e8 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
@@ -30,7 +30,7 @@
{{#each service in view.services}}
<tr>
<td class="service-display-name">{{service.displayName}}</td>
- <td class="service-stack-version">{{service.serviceVersion}}</td>
+ <td class="service-stack-version">{{service.serviceVersionDisplay}}</td>
<td class="stack-version-state">
{{#if service.isInstalled}}
<span class="label label-success">{{t common.installed}}</span>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
index a9fc440..ac7cb82 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
@@ -17,6 +17,11 @@
}}
<div id="versions-filter-section">
+ {{#isAuthorized "AMBARI.MANAGE_STACK_VERSIONS"}}
+ <button class="btn btn-primary" {{action goToVersions target="view"}} id="manage-versions-link">
+ <i class="icon-external-link"></i> {{t admin.stackVersions.manageVersions}}
+ </button>
+ {{/isAuthorized}}
<div class="btn-group display-inline-block">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
<span class="filters-label">{{t common.filter}}: </span>
@@ -35,11 +40,6 @@
{{/each}}
</ul>
</div>
- {{#isAuthorized "AMBARI.MANAGE_STACK_VERSIONS"}}
- <button class="btn btn-primary pull-right" {{action goToVersions target="view"}} id="manage-versions-link">
- <i class="icon-external-link"></i> {{t admin.stackVersions.manageVersions}}
- </button>
- {{/isAuthorized}}
</div>
<div id="versions-section" class="row-fluid">
<div class="span2 left-menu-table">
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/templates/wizard/step1.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step1.hbs b/ambari-web/app/templates/wizard/step1.hbs
index ab9a0dd..0476580 100644
--- a/ambari-web/app/templates/wizard/step1.hbs
+++ b/ambari-web/app/templates/wizard/step1.hbs
@@ -17,109 +17,190 @@
}}
<div id="select-stack">
<h2>{{t installer.step1.header}}</h2>
- <p class="alert alert-info">
- {{t installer.step1.body}}
- </p>
- <p><b>{{t common.stacks}}</b></p>
- <form autocomplete="off">
- {{#each stack in view.stacks}}
- <label class="radio">{{view view.stackRadioButton contentBinding="stack"}} {{stack.name}}</label>
- {{/each}}
- </form>
+ <p class="alert alert-info">{{t installer.step1.body}}</p>
+ <label class="radio big-radio">{{view view.usePublicRepoRadioButton}} {{t installer.step1.selectUseRepoOptions.public}}
+ {{#unless view.selectedPublicRepoVersion}}
+ <a id="public-disabled-link" {{action "openPublicOptionDisabledWindow" target="view"}}>{{t installer.step1.selectUseRepoOptions.public.networkLost}}</a>
+ {{/unless}}
+ </label>
- <div class="accordion" id="advancedRepoAccordion">
- <div class="accordion-group">
- <div class="accordion-heading" {{action "onToggleBlock" target="view"}}>
- <i {{bindAttr class=":pull-left :accordion-toggle view.isRLCollapsed:icon-caret-right:icon-caret-down"}}></i>
- <a class="accordion-toggle">
- {{t installer.step1.advancedRepo.title}}
- {{#if view.showErrorsWarningCount}}
- <span class="badge badge-important">{{view.totalErrorCnt}}</span>
+ <form {{bindAttr class="optionsToSelect.useLocalRepo.isSelected:disabled :stack-version-selection :row-fluid"}}>
+ <div class="span3 select-version-label">
+ {{t installer.step1.selectUseRepoOptions.public.select}}
+ </div>
+ <div class="span7 right-stack-info">
+ <div class="repo-list-button btn-group">
+ {{#if view.selectedPublicRepoVersion}}
+ <button type="button" {{bindAttr class="optionsToSelect.useLocalRepo.isSelected:disabled :btn :btn-primary :dropdown-toggle"}} data-toggle="dropdown">
+ {{view.selectedPublicRepoVersion.displayName}} <span class="caret"></span>
+ </button>
+ {{else}}
+ <button type="button" class="disabled btn btn-primary dropdown-toggle"}} data-toggle="dropdown">
+ {{t installer.step1.selectUseRepoOptions.public.networkLost.button}}
+ </button>
{{/if}}
- </a>
+ <ul class="dropdown-menu available-repos-dropdown">
+ {{#if view.availableStackRepoList}}
+ {{#each repo in view.availableStackRepoList}}
+ {{#if repo.repositoryVersion}}
+ <li><a {{action "selectRepoInList" repo target="view"}}>{{repo.displayName}}</a></li>
+ {{/if}}
+ {{/each}}
+ {{else}}
+ <li><a class="disabled">{{t installer.step1.usePublicRepo.ReposList.empty}}</a></li>
+ {{/if}}
+ </ul>
+ </div>
</div>
- <div class="accordion-body collapse in">
- <div class="accordion-inner">
- <div class="alert alert-info">{{t installer.step1.advancedRepo.message}}</div>
- <div class="alert alert-warning">{{t installer.step1.advancedRepo.importantMassage}}</div>
+ </form>
- <div class="repositories-table">
- <div class="thead">
- <div class="first-th"> </div>
- <div class="th os-th">{{t common.os}}</div>
- <div class="th name-th">{{t common.name}}</div>
- <div class="th url-th">{{t installer.step1.advancedRepo.localRepo.column.baseUrl}}</div>
+ {{!--Local repo loaded info below--}}
+ <label class="radio big-radio">{{view view.useLocalRepoRadioButton}} {{t installer.step1.selectUseRepoOptions.local}}</label>
+
+ <div id="upload-definition-file-panel" {{bindAttr class="optionsToSelect.usePublicRepo.isSelected:disabled"}}>
+ <div class="clearfix register-version-options row-fluid">
+ <div class="span5 option-radio-button">
+ <label class="local-option-label radio">
+ {{view view.uploadFileRadioButton}} {{t installer.step1.useLocalRepo.uploadFile}}
+ </label>
+ </div>
+ <div class="span7">
+ {{#if view.isFileApi}}
+ {{view App.VersionDefinitionFileUploader disabledBinding="view.fileBrowserDisabled"}}
+ {{/if}}
+ </div>
+ </div>
+ <div class="clearfix register-version-options row-fluid">
+ <div class="span5 option-radio-button">
+ <label class="local-option-label radio">
+ {{view view.enterUrlRadioButton}} {{t installer.step1.useLocalRepo.enterUrl}}
+ </label>
+ </div>
+ <div class="span7 vdf-url">
+ <div {{bindAttr class="optionsToSelect.useLocalRepo.enterUrl.name optionsToSelect.useLocalRepo.enterUrl.url.hasError:has-error }"}}>
+ {{view Ember.TextField valueBinding="optionsToSelect.useLocalRepo.enterUrl.url" disabledBinding="view.enterUrlFieldDisabled"}}
+ </div>
+ </div>
+ <div class="span12 read-info-button">
+ <button {{bindAttr class="view.readInfoButtonDisabled:disabled :btn :btn-primary :pull-right"}}
+ {{action "readVersionInfo" target="controller"}}> {{t installer.step1.useLocalRepo.readButton}}</button>
+ </div>
+ </div>
+ </div>
+
+ <form id="repoVersionInfoForm" class="form-horizontal" role="form" name="localVersionInfoForm" novalidate>
+ <div class="accordion-group details-panel">
+ <div class="accordion-heading">
+ <p>{{t installer.step1.useLocalRepo.infoForm.details.title}}</p>
+ </div>
+ <div class="accordion-body">
+ <div class="accordion-inner">
+ <div class="row-fluid">
+ <div class="span5 version-info-section">
+ <div class="row-fluid">
+ <label class="control-label span5">{{t installer.step1.useLocalRepo.infoForm.details.stackName}}</label>
+ <div class="version-info span5">{{controller.selectedStack.stackNameVersion}}</div>
+ {{#if controller.selectedStack.isPatch}}
+ <div class="span2 patch-icon"><i class="icon-umbrella"></i> {{t common.patch}}</div>
+ {{/if}}
+ </div>
+ <div class="row-fluid">
+ <label class="control-label span5">{{t installer.step1.useLocalRepo.infoForm.details.displayName}}</label>
+ <div class="version-info span7">{{controller.selectedStack.displayName}}</div>
+ </div>
+ <div class="row-fluid">
+ <label class="control-label span5">{{t installer.step1.useLocalRepo.infoForm.details.version}}</label>
+ <div class="version-info span7">{{controller.selectedStack.repositoryVersion}}</div>
+ </div>
+ </div>
+ <div class="span6 version-contents-section">
+ {{#unless view.selectedServices}}
+ <div class="alert alert-info" role="alert">{{t installer.step1.useLocalRepo.infoForm.content.empty}}</div>
+ {{/unless}}
+ {{#each service in view.selectedServices}}
+ <div class="clearfix row-fluid">
+ <div class="version-info span10">{{service.displayName}} ({{service.version}})</div>
+ </div>
+ {{/each}}
+ </div>
</div>
- <div class="tbody">
+ </div>
+ </div>
+ </div>
+ <div class="accordion-group repos-panel">
+ <div class="accordion-heading">
+ <p>{{t common.repositories}}</p>
+ </div>
+ <div class="accordion-body version-contents-body">
+ <div class="accordion-inner">
+ <div class="alert alert-info" role="alert">{{t installer.step1.useLocalRepo.infoForm.alert.baseUrl}}</div>
+ {{#if view.hasValidationErrors}}
+ <div class="alert alert-warning" role="alert">{{t installer.step1.useLocalRepo.infoForm.alert.warning}}</div>
+ {{/if}}
+
+ <div class="clearfix repo-table-title row-fluid">
+ <div class="span2"><label>{{t common.os}}</label></div>
+ <div class="span2"><label>{{t common.name}}</label></div>
+ <div class="span7"><label>{{t installer.step1.advancedRepo.localRepo.column.baseUrl}}</label></div>
+ </div>
+
{{#each operatingSystem in view.operatingSystems}}
- <div class="trow">
- <div {{bindAttr class=":os-td operatingSystem.osType"}}>
- <label>
- {{view Ember.Checkbox checkedBinding="operatingSystem.isSelected"}}
- <span {{bindAttr class=":os operatingSystem.isSelected::disabled-label"}}>{{operatingSystem.osType}}</span>
- </label>
- </div>
- <div style="width:83%">
- {{#each repository in operatingSystem.repositories}}
- <div class="sub-trow">
- <div class="name-td">{{repository.repoId}}</div>
- <div class="validation-td">
- {{#if repository.validation}}
- {{view view.popoverView repositoryBinding="repository"}}
- {{/if}}
- </div>
- <div {{bindAttr class=":url-td operatingSystem.osType repository.repoId repository.invalidFormatError:textfield-error repository.invalidError:textfield-error"}}>
- {{view Ember.TextField valueBinding="repository.baseUrl" disabledBinding="operatingSystem.isDeselected"}}
- </div>
- <div class="clear-td">
- {{#if repository.clearAll}}
- <a {{action "clearGroupLocalRepository" repository target="view" }} {{bindAttr class="operatingSystem.isSelected::disabled-clear-button"}}>
- <i class="icon-remove-sign"></i>
- </a>
- {{/if}}
+ {{#if operatingSystem.isSelected}}
+ <div class="clearfix row-fluid border-bottom">
+ <div class="span2 os-type-label">
+ <label>{{operatingSystem.osType}}</label>
+ </div>
+ <div class="span9">
+ {{#each repository in operatingSystem.repositories}}
+ <div class="repo-name-url row-fluid" {{bindAttr class="repository.hasError:has-error"}} >
+ <label class="repo-name-label control-label span3">{{repository.repoId}}</label>
+ <div class="validation-td span1">
+ {{#if repository.validation}}
+ {{view view.popoverView repositoryBinding="repository"}}
+ {{/if}}
+ </div>
+ <div {{bindAttr class=":span8 :repo-url repository.invalidFormatError:textfield-error repository.invalidError:textfield-error"}}>
+ {{view Ember.TextField valueBinding="repository.baseUrl"}}
+ </div>
</div>
- <div class="actions-td">
- {{#if repository.undo}}
- <a {{action "undoGroupLocalRepository" repository target="view" }}>
- <i class="icon-undo"></i>{{t common.undo}}
- </a>
- {{/if}}
- </div>
- </div>
- {{/each}}
+ {{/each}}
+ </div>
+ <div class="span1 remove-icon" {{action "removeOS" operatingSystem target="controller"}}><i class="icon-minus"></i>{{t common.remove}}</div>
</div>
- </div>
+ {{/if}}
{{/each}}
+
+ <div class="add-os-button btn-group pull-right">
+ <button {{bindAttr class=":btn :dropdown-toggle view.isAddOsButtonDisabled:disabled"}} data-toggle="dropdown">
+ <i class="icon-plus"></i> {{t common.add}} <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ {{#each operatingSystem in view.operatingSystems}}
+ {{#unless operatingSystem.isSelected}}
+ <li><a {{action "addOS" operatingSystem target="controller"}}>{{operatingSystem.osType}}</a></li>
+ {{/unless}}
+ {{/each}}
+ </ul>
+ </div>
+ <div id="skip-validation">
+ <label>{{view Ember.Checkbox checkedBinding="skipValidationChecked" class="checkbox"}}{{t installer.step1.advancedRepo.skipValidation.message}}
+ <i class="icon-question-sign" rel="skip-validation-tooltip"
+ data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label>
+ </div>
+ <div id="use-redhat">
+ <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}}
+ <i class="icon-question-sign" rel="use-redhat-tooltip"
+ data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}>
+ </i>
+ </label>
+ </div>
</div>
</div>
- <div id="skip-validation">
- <label>{{view Ember.Checkbox checkedBinding="skipValidationChecked" class="checkbox"}}{{t installer.step1.advancedRepo.skipValidation.message}}
- <i class="icon-question-sign" rel="skip-validation-tooltip"
- data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label>
- </div>
- <div id="use-redhat">
- <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}}
- <i class="icon-question-sign" rel="use-redhat-tooltip"
- data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label>
- </div>
- {{#if view.invalidFormatUrlExist}}
- <div class="alert">{{t installer.step1.attentionNeeded}}</div>
- {{/if}}
- {{#if view.invalidUrlExist}}
- <div class="alert">
- {{t installer.step1.invalidURLAttention}}
- <a href="javascript:void(null)" {{action "retryRepoUrls" target="view"}}>{{t installer.step1.retryRepoUrls}}</a>
- </div>
- {{/if}}
- {{#if view.allRepoUnchecked}}
- <div class="alert">{{t installer.step1.checkAtLeastOneAttention}}</div>
- {{/if}}
- </div>
</div>
- </div>
- </div>
+ </form>
<a class="btn pull-left installer-back-btn" {{action back}}>← {{t common.back}}</a>
<button class="btn btn-success pull-right" {{bindAttr disabled="view.isSubmitDisabled"}} {{action next}}>{{t common.next}} →</button>
+
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/templates/wizard/step4.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step4.hbs b/ambari-web/app/templates/wizard/step4.hbs
index cc4c68f..21c2aae 100644
--- a/ambari-web/app/templates/wizard/step4.hbs
+++ b/ambari-web/app/templates/wizard/step4.hbs
@@ -40,7 +40,7 @@
disabledBinding="isInstalled"
checkedBinding="isSelected"}}{{displayNameOnSelectServicePage}}</label>
</td>
- <td>{{serviceVersion}}</td>
+ <td>{{serviceVersionDisplay}}</td>
<td>{{{comments}}}</td>
</tr>
{{/unless}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/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 d32afc9..83914a7 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1371,6 +1371,10 @@ var urls = {
'real': '/clusters/{clusterName}/stack_versions?ClusterStackVersions/state=CURRENT&fields=repository_versions/RepositoryVersions/repository_version&minimal_response=true',
'mock': '/data/stack_versions/stack_version_all.json'
},
+ 'cluster.load_current_repo_stack_services': {
+ 'real': '/clusters/{clusterName}/stack_versions?ClusterStackVersions/state=CURRENT&fields=repository_versions/RepositoryVersions/stack_services',
+ 'mock': '/data/stack_versions/stack_version_all.json'
+ },
'cluster.save_provisioning_state': {
'real': '/clusters/{clusterName}',
'type': 'PUT',
@@ -1863,6 +1867,66 @@ var urls = {
}
},
+ 'wizard.step1.post_version_definition_file.xml': {
+ 'real': '/version_definitions?dry_run=true',
+ 'mock': '',
+ 'format': function (data) {
+ return {
+ headers: {
+ 'X-Requested-By': 'ambari',
+ 'Content-Type': 'text/xml'
+ },
+ type: 'POST',
+ data: data.data
+ }
+ }
+ },
+ 'wizard.step1.post_version_definition_file.url': {
+ 'real': '/version_definitions?dry_run=true',
+ 'mock': '',
+ 'format': function (data) {
+ return {
+ type: 'POST',
+ data: JSON.stringify(data.data)
+ }
+ }
+ },
+ 'wizard.step8.post_version_definition_file.xml': {
+ 'real': '/version_definitions',
+ 'mock': '',
+ 'format': function (data) {
+ return {
+ headers: {
+ 'X-Requested-By': 'ambari',
+ 'Content-Type': 'text/xml'
+ },
+ type: 'POST',
+ data: data.data
+ }
+ }
+ },
+ 'wizard.step8.post_version_definition_file': {
+ 'real': '/version_definitions',
+ 'mock': '',
+ 'format': function (data) {
+ return {
+ type: 'POST',
+ data: JSON.stringify(data.data)
+ }
+ }
+ },
+ 'wizard.step1.get_repo_version_by_id': {
+ 'real': '/stacks/{stackName}/versions?fields=repository_versions/operating_systems/repositories/*' +
+ ',repository_versions/RepositoryVersions/*' +
+ '&repository_versions/RepositoryVersions/id={repoId}&Versions/stack_version={stackVersion}',
+ 'mock': ''
+ },
+
+ 'wizard.step1.get_supported_os_types': {
+ 'real': '/stacks/{stackName}/versions/{stackVersion}?fields=operating_systems/repositories/Repositories',
+ 'mock': ''
+ },
+
'wizard.advanced_repositories.valid_url': {
'real': '/stacks/{stackName}/versions/{stackVersion}/operating_systems/{osType}/repositories/{repoId}',
'mock': '',
@@ -1873,6 +1937,12 @@ var urls = {
}
}
},
+ 'wizard.get_shown_version_definition': {
+ real: '/version_definitions?fields=VersionDefinition/stack_services&VersionDefinition/repository_version={repositoryVersion}&VersionDefinition/show_available=true'
+ },
+ 'wizard.get_version_definition': {
+ real: '/version_definitions?fields=VersionDefinition/stack_services&VersionDefinition/repository_version={repositoryVersion}'
+ },
'wizard.service_components': {
'real': '{stackUrl}/services?fields=StackServices/*,components/*,components/dependencies/Dependencies/scope,artifacts/Artifacts/artifact_name',
'mock': '/data/stacks/HDP-2.1/service_components.json'
@@ -2114,6 +2184,12 @@ var urls = {
'real': '/stacks/{stackName}/versions?fields=Versions,operating_systems/repositories/Repositories',
'mock': '/data/wizard/stack/{stackName}_versions.json'
},
+
+ 'wizard.stacks_versions_definitions': {
+ 'real': '/version_definitions?fields=operating_systems/repositories/Repositories/*,VersionDefinition/stack_services,VersionDefinition/repository_version' +
+ '&VersionDefinition/show_available=true&VersionDefinition/stack_name={stackName}',
+ 'mock': '/data/wizard/stack/{stackName}_version_definitions.json'
+ },
'wizard.launch_bootstrap': {
'real': '/bootstrap',
'mock': '/data/wizard/bootstrap/bootstrap.json',
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/utils/db.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/db.js b/ambari-web/app/utils/db.js
index 865839c..a4e96a0 100644
--- a/ambari-web/app/utils/db.js
+++ b/ambari-web/app/utils/db.js
@@ -249,6 +249,14 @@ App.db.setStacks = function (stacks) {
App.db.set('Installer', 'stacksVersions', stacks);
};
+App.db.setRepos = function (repos) {
+ App.db.set('Installer', 'repositories', repos);
+};
+
+App.db.setLocalRepoVDFData = function (data) {
+ App.db.set('Installer', 'localRepoVDFData', data);
+};
+
App.db.setConfigs = function (configs) {
App.db.set('app', 'configs', configs);
};
@@ -434,6 +442,14 @@ App.db.getStacks = function () {
return App.db.get('Installer', 'stacksVersions');
};
+App.db.getRepos = function () {
+ return App.db.get('Installer', 'repositories');
+};
+
+App.db.getLocalRepoVDFData = function () {
+ return App.db.get('Installer', 'localRepoVDFData');
+};
+
App.db.getHighAvailabilityWizardHdfsUser = function () {
return App.db.get('HighAvailabilityWizard', 'hdfsUser');
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/services_view.js b/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
index 8805c47..f566814 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
@@ -31,10 +31,15 @@ App.MainAdminStackServicesView = Em.View.extend({
*/
services: function() {
var services = App.supports.installGanglia ? App.StackService.find() : App.StackService.find().without(App.StackService.find('GANGLIA'));
- return services.map(function(s) {
- s.set('isInstalled', App.Service.find().someProperty('serviceName', s.get('serviceName')));
- return s;
+ var controller = this.get('controller');
+ controller.loadServiceVersionFromVersionDefinitions().complete(function () {
+ return services.map(function(s) {
+ s.set('serviceVersionDisplay', controller.get('serviceVersionsMap')[s.get('serviceName')]);
+ s.set('isInstalled', App.Service.find().someProperty('serviceName', s.get('serviceName')));
+ return s;
+ });
});
+ return services;
}.property('App.router.clusterController.isLoaded'),
didInsertElement: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/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 88bfec2..818954e 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
@@ -304,6 +304,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
displayName: repoRecord.get('displayName'),
repositoryVersion: repoRecord.get('displayName'),
stackVersion: self.getStackVersionNumber(repoRecord),
+ useRedhatSatellite: repoRecord.get('useRedhatSatellite'),
operatingSystems: repoRecord.get('operatingSystems').map(function (os) {
return Em.Object.create({
osType: os.get('osType'),
@@ -323,7 +324,6 @@ App.UpgradeVersionBoxView = Em.View.extend({
return this.get('isRepoUrlsEditDisabled') ? null : App.ModalPopup.show({
classNames: ['repository-list', 'sixty-percent-width-modal'],
skipValidation: false,
- useRedhatSatellite: false,
autoHeight: false,
/**
* @type {boolean}
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/app/views/wizard/step1_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step1_view.js b/ambari-web/app/views/wizard/step1_view.js
index 452e676..7348cbf 100644
--- a/ambari-web/app/views/wizard/step1_view.js
+++ b/ambari-web/app/views/wizard/step1_view.js
@@ -23,195 +23,271 @@ App.WizardStep1View = Em.View.extend({
templateName: require('templates/wizard/step1'),
- /**
- * Is Repositories Accordion collapsed
- * @type {bool}
- */
- isRLCollapsed: true,
-
didInsertElement: function () {
- if (this.get('isRLCollapsed')) {
- this.$('.accordion-body').hide();
- }
$("[rel=skip-validation-tooltip]").tooltip({ placement: 'right'});
+ $("[rel=use-redhat-tooltip]").tooltip({ placement: 'right'});
+ if (this.get('controller.selectedStack').get("showAvailable")) {
+ // first time load
+ this.set('controller.latestSelectedPublicRepoId',this.get('controller.selectedStack.id'));
+ } else {
+ var selected = this.get('controller.content.stacks').findProperty('showAvailable');
+ if (selected) {
+ // get back from other steps, set default public repo as selected public
+ this.set('controller.latestSelectedPublicRepoId', selected.get('id'));
+ } else {
+ // network disconnection
+ this.set('controller.latestSelectedPublicRepoId', null);
+ this.set('controller.optionsToSelect.useLocalRepo.isSelected', true);
+ this.set('controller.optionsToSelect.usePublicRepo.isSelected', false);
+ }
+ }
},
/**
- * List of available stacks
+ * =========================== Option "Use Public Repository" starts from here ==================
+ */
+
+ /**
+ * The public reo version shown on the dropdown button
+ */
+ selectedPublicRepoVersion: function () {
+ var selectedId = this.get('controller.latestSelectedPublicRepoId');
+ return selectedId ? this.get('controller.content.stacks').findProperty('id', selectedId): null;
+ }.property('controller.latestSelectedPublicRepoId'),
+
+ /**
+ * List of other available stack repos within the same stack name
* @type {Em.Object[]}
*/
- stacks: function () {
- return this.get('controller.content.stacks').toArray().map(function (stack) {
+ availableStackRepoList: function () {
+ var selectedStack = this.get('controller.selectedStack');
+ var availableStackRepos = this.get('controller.content.stacks').filter(function (item) {
+ return item.get('showAvailable') && item.get('id') != selectedStack.get('id');
+ });
+ return availableStackRepos.toArray().map(function (stack) {
return Em.Object.create({
- name: stack.get('id').replace('-', ' '),
- isSelected: stack.get('isSelected')
+ id: stack.get('id'),
+ repositoryVersion: stack.get('repositoryVersion'),
+ displayName: stack.get('stackName') + "-" + stack.get('repositoryVersion'),
+ isSelected: false
});
});
}.property('controller.selectedStack'),
- operatingSystems: function () {
- var selectedStack = this.get('controller.selectedStack');
- return Em.isNone(selectedStack) ? [] : selectedStack.get('operatingSystems');
- }.property('controller.selectedStack'),
+ selectRepoInList: function (event) {
+ if (this.get('controller.optionsToSelect.useLocalRepo.isSelected')) return;
+ this.get('controller.content.stacks').setEach('isSelected', false);
+ this.get('controller.content.stacks').findProperty('id', event.context.id).set('isSelected', true);
+ this.set('controller.latestSelectedPublicRepoId',event.context.id);
+ },
- /**
- * List of all repositories under selected stack operatingSystems
- * API and ember data model structure:
- * stack = [{OS-1},{OS-2}]
- * OS-1 = [{repository-1},{repository-2}]
- * OS-2 = [{repository-3},{repository-4}]
- * @return: [{repository-1},{repository-2},{repository-3},{repository-4}]
- */
- allRepositories: function () {
+ selectedServices: function () {
var selectedStack = this.get('controller.selectedStack');
- return Em.isNone(selectedStack) ? [] : selectedStack.get('repositories');
+ return Em.isNone(selectedStack) ? [] : selectedStack.get('stackServices').toArray().map(function (service) {
+ return Em.Object.create({
+ displayName: service.get('displayName'),
+ version: service.get('latestVersion')
+ });
+ });
}.property('controller.selectedStack'),
- /**
- * Verify if some repo has empty base-url
- * @type {bool}
- */
- invalidFormatUrlExist: Em.computed.someBy('allRepositories', 'invalidFormatError', true),
+ openPublicOptionDisabledWindow: function () {
+ return App.ModalPopup.show({
+ header: Em.I18n.t('installer.step1.selectUseRepoOptions.public.networkLost.popup.title'),
+ message: Em.I18n.t('installer.step1.selectUseRepoOptions.public.networkLost.popup.msg'),
+ option1: Em.I18n.t('installer.step1.selectUseRepoOptions.public.networkLost.popup.msg1'),
+ option2: Em.I18n.t('installer.step1.selectUseRepoOptions.public.networkLost.popup.msg2'),
+ option3: Em.I18n.t('installer.step1.selectUseRepoOptions.public.networkLost.popup.msg3'),
+ bodyClass: Ember.View.extend({
+ template: Em.Handlebars.compile('<div class="public-disabled-message">{{message}}</div>' +
+ '<li class="public-disabled-option">{{option1}}</li>' +
+ '<li class="public-disabled-option">{{option2}}</li>' +
+ '<li class="public-disabled-option">{{option3}}</li>')
+ }),
+ secondary: false
+ });
+ },
/**
* Disable submit button flag
* @type {bool}
*/
- isSubmitDisabled: Em.computed.or('invalidFormatUrlExist', 'isNoOsChecked', 'invalidUrlExist', 'controller.content.isCheckInProgress'),
+ isSubmitDisabled: Em.computed.or('controller.content.isCheckInProgress'),
/**
- * Enable error count badge
- * @type {bool}
+ * Onclick handler for recheck repos urls. Used in Advanced Repository Options.
*/
- showErrorsWarningCount: Em.computed.and('isSubmitDisabled', 'totalErrorCnt'),
+ retryRepoUrls: function () {
+ App.router.get('installerController').checkRepoURL(this.get('controller'));
+ },
- /**
- * Verify if some invalid repo-urls exist
- * @type {bool}
- */
- invalidUrlExist: Em.computed.someBy('allRepositories', 'validation', App.Repository.validation['INVALID']),
/**
- * If all repo links are unchecked
- * @type {bool}
+ * =========================== Option "Use Local Repository" starts from here ==================
*/
- isNoOsChecked: Em.computed.everyBy('operatingSystems', 'isSelected', false),
/**
- * Overall errors count
- * @type {number}
+ * Checkbox for use Public repo
+ * @type {Ember.Checkbox}
*/
- totalErrorCnt: function () {
- var invalidFormatCnt = this.get('allRepositories').filterProperty('invalidFormatError').length;
- var invalidCnt = this.get('allRepositories').filterProperty('validation', App.Repository.validation['INVALID']).length;
- if (this.get('isNoOsChecked')) {
- return 1;
- } else if (invalidFormatCnt || invalidCnt) {
- return invalidFormatCnt + invalidCnt;
- } else {
- return 0;
+ usePublicRepoRadioButton: Em.Checkbox.extend({
+ tagName: 'input',
+ attributeBindings: [ 'type', 'checked' ],
+ classNames: [''],
+ checked: Em.computed.alias('controller.optionsToSelect.usePublicRepo.isSelected'),
+ type: 'radio',
+ disabled: function() {
+ return !this.get('controller.latestSelectedPublicRepoId');
+ }.property('controller.latestSelectedPublicRepoId'),
+
+ click: function () {
+ this.set('controller.optionsToSelect.usePublicRepo.isSelected', true);
+ this.set('controller.optionsToSelect.useLocalRepo.isSelected', false);
+ var latestSelectedPublicRepoId = this.get('controller.latestSelectedPublicRepoId');
+ if (latestSelectedPublicRepoId) {
+ this.get('controller.content.stacks').setEach('isSelected', false);
+ this.get('controller.content.stacks').findProperty('id', latestSelectedPublicRepoId).set('isSelected', true);
+ } else {
+ // make the 1st public repo as selected
+ this.get('controller.content.stacks').findProperty('id').set('isSelected', true);
+ }
}
- }.property('allRepositories.@each.invalidFormatError', 'isNoOsChecked', 'allRepositories.@each.validation'),
+ }),
/**
- * Checkbox for each stack
+ * Checkbox for use Public repo
* @type {Ember.Checkbox}
*/
- stackRadioButton: Em.Checkbox.extend({
+ useLocalRepoRadioButton: Em.Checkbox.extend({
tagName: 'input',
attributeBindings: [ 'type', 'checked' ],
- checked: Em.computed.alias('content.isSelected'),
+ classNames: [''],
+ checked: Em.computed.alias('controller.optionsToSelect.useLocalRepo.isSelected'),
type: 'radio',
click: function () {
- this.get('controller.content.stacks').setEach('isSelected', false);
- this.get('controller.content.stacks').findProperty('id', this.get('content.name').replace(' ', '-')).set('isSelected', true);
+ this.set('controller.optionsToSelect.useLocalRepo.isSelected', true);
+ this.set('controller.optionsToSelect.usePublicRepo.isSelected', false);
+ var latestSelectedLocalRepoId = this.get('controller.latestSelectedLocalRepoId');
+ if (latestSelectedLocalRepoId) {
+ this.get('controller.content.stacks').setEach('isSelected', false);
+ this.get('controller.content.stacks').findProperty('id', latestSelectedLocalRepoId).set('isSelected', true);
+ }
}
}),
/**
- * Popover for repo-url error indicator
- * @type {Em.View}
+ * Checkbox for Use local Repo > Upload VDF file
+ * @type {Ember.Checkbox}
*/
- popoverView: Em.View.extend({
- tagName: 'i',
- classNameBindings: ['repository.validation'],
- attributeBindings: ['repository.errorTitle:title', 'repository.errorContent:data-content'],
- didInsertElement: function () {
- App.popover($(this.get('element')), {'trigger': 'hover'});
+ uploadFileRadioButton: Em.Checkbox.extend({
+ tagName: 'input',
+ attributeBindings: [ 'type', 'checked' ],
+ classNames: [''],
+ checked: Em.computed.alias('controller.optionsToSelect.useLocalRepo.uploadFile.isSelected'),
+ type: 'radio',
+ disabled: function () {
+ return this.get("controller.optionsToSelect.usePublicRepo.isSelected");
+ }.property("controller.optionsToSelect.usePublicRepo.isSelected"),
+
+ click: function () {
+ this.set('controller.optionsToSelect.useLocalRepo.uploadFile.isSelected', true);
+ this.set('controller.optionsToSelect.useLocalRepo.enterUrl.isSelected', false);
+ this.set('controller.optionsToSelect.useLocalRepo.enterUrl.hasError', false);
+ this.set('controller.optionsToSelect.useLocalRepo.uploadFile.hasError', false);
}
}),
/**
- * Onclick handler for Config Group Header. Used to show/hide block
- * @method onToggleBlock
+ * Checkbox for Use local Repo > Enter Url of VDF file
+ * @type {Ember.Checkbox}
*/
- onToggleBlock: function () {
- this.$('.accordion-body').toggle('blind', 500);
- this.set('isRLCollapsed', !this.get('isRLCollapsed'));
- },
+ enterUrlRadioButton: Em.Checkbox.extend({
+ tagName: 'input',
+ attributeBindings: [ 'type', 'checked' ],
+ classNames: [''],
+ checked: Em.computed.alias('controller.optionsToSelect.useLocalRepo.enterUrl.isSelected'),
+ type: 'radio',
+ disabled: function () {
+ return this.get("controller.optionsToSelect.usePublicRepo.isSelected");
+ }.property("controller.optionsToSelect.usePublicRepo.isSelected"),
- /**
- * Onclick handler for recheck repos urls. Used in Advanced Repository Options.
- */
- retryRepoUrls: function () {
- App.router.get('installerController').checkRepoURL(this.get('controller'));
- },
+ click: function () {
+ this.set('controller.optionsToSelect.useLocalRepo.enterUrl.isSelected', true);
+ this.set('controller.optionsToSelect.useLocalRepo.uploadFile.isSelected', false);
+ this.set('controller.optionsToSelect.useLocalRepo.enterUrl.hasError', false);
+ this.set('controller.optionsToSelect.useLocalRepo.uploadFile.hasError', false);
+ }
+ }),
+ /*
+ * Is File API available
+ * @type {bool}
+ */
+ isFileApi: function () {
+ return window.File && window.FileReader && window.FileList;
+ }.property(),
- /**
- * Onclick handler for checkbox of each repo group
- * @method updateByCheckbox
- */
- updateByCheckbox: function () {
- //upload to content
- var operatingSystems = this.get('operatingSystems');
- if (operatingSystems) {
- operatingSystems.forEach(function (os) {
- if (!os.get('isSelected')) {
- os.get('repositories').forEach(function (repository) {
- repository.setProperties({
- baseUrl: repository.get('latestBaseUrl'),
- validation: App.Repository.validation['PENDING']
- });
- });
- } else {
- os.get('repositories').forEach(function (repository) {
- if (this.get('controller.skipValidationChecked')) {
- repository.set('validation', App.Repository.validation['PENDING']);
- }
- }, this);
- }
- }, this);
+ fileBrowserDisabled: function () {
+ return this.get("controller.optionsToSelect.usePublicRepo.isSelected") || this.get("controller.optionsToSelect.useLocalRepo.enterUrl.isSelected");
+ }.property("controller.optionsToSelect.usePublicRepo.isSelected", "controller.optionsToSelect.useLocalRepo.enterUrl.isSelected"),
+ enterUrlFieldDisabled: function () {
+ return this.get("controller.optionsToSelect.usePublicRepo.isSelected") || this.get("controller.optionsToSelect.useLocalRepo.uploadFile.isSelected");
+ }.property("controller.optionsToSelect.usePublicRepo.isSelected", "controller.optionsToSelect.useLocalRepo.uploadFile.isSelected"),
+ readInfoButtonDisabled: function () {
+ if (this.get('controller.optionsToSelect.useLocalRepo.isSelected')) {
+ if(this.get('controller.optionsToSelect.useLocalRepo.uploadFile.isSelected')) {
+ return !this.get('controller.optionsToSelect.useLocalRepo.uploadFile.file');
+ } else if (this.get('controller.optionsToSelect.useLocalRepo.enterUrl.isSelected')) {
+ return !this.get('controller.optionsToSelect.useLocalRepo.enterUrl.url');
+ }
+ } else {
+ return true;
}
- }.observes('operatingSystems.@each.isSelected', 'controller.skipValidationChecked'),
+ }.property('controller.optionsToSelect.useLocalRepo.isSelected', 'controller.optionsToSelect.useLocalRepo.uploadFile.isSelected',
+ 'controller.optionsToSelect.useLocalRepo.uploadFile.file', 'controller.optionsToSelect.useLocalRepo.enterUrl.url'),
+
+ operatingSystems: function () {
+ var selectedStack = this.get('controller.selectedStack');
+ return Em.isNone(selectedStack) ? [] : selectedStack.get('operatingSystems');
+ }.property('controller.selectedStack'),
+
+ isAddOsButtonDisabled: function () {
+ return this.get('operatingSystems').get('length') == this.get('operatingSystems').filterProperty('isSelected').get('length');
+ }.property('operatingSystems', 'operatingSystems.@each.isSelected'),
/**
- * Onclick handler for undo action of each repo group
- * @method undoGroupLocalRepository
- * @param {object} event
+ * List of all repositories under selected stack operatingSystems
*/
- undoGroupLocalRepository: function (event) {
- event.context.setProperties({
- baseUrl: event.context.get('latestBaseUrl'),
- validation: App.Repository.validation['PENDING']
- });
- },
+ allRepositories: function () {
+ var selectedStack = this.get('controller.selectedStack');
+ return Em.isNone(selectedStack) ? [] : selectedStack.get('repositories');
+ }.property('controller.selectedStack'),
/**
- * Handler for clear icon click
- * @method clearGroupLocalRepository
- * @param {object} event
+ * Verify if some repo has invalid base-url
+ * @type {bool}
+ */
+ invalidFormatUrlExist: Em.computed.someBy('allRepositories', 'invalidFormatError', true),
+ /**
+ * Verify if some invalid repo-urls exist
+ * @type {bool}
+ */
+ invalidUrlExist: Em.computed.someBy('allRepositories', 'validation', App.Repository.validation['INVALID']),
+ /**
+ * If all repo links are unchecked
+ * @type {bool}
*/
- clearGroupLocalRepository: function (event) {
- if (!event.context.get('isSelected')) {
- return;
+ isNoOsChecked: Em.computed.everyBy('operatingSystems', 'isSelected', false),
+
+ popoverView: Em.View.extend({
+ tagName: 'i',
+ classNameBindings: ['repository.validation'],
+ attributeBindings: ['repository.errorTitle:title', 'repository.errorContent:data-content'],
+ didInsertElement: function () {
+ App.popover($(this.get('element')), {'trigger': 'hover'});
}
- event.context.setProperties({
- baseUrl: '',
- validation: App.Repository.validation['PENDING']
- });
- },
+ }),
/**
* Handler when editing any repo BaseUrl
@@ -231,3 +307,26 @@ App.WizardStep1View = Em.View.extend({
}.observes('allRepositories.@each.baseUrl')
});
+
+
+App.VersionDefinitionFileUploader = Em.View.extend({
+ template: Em.Handlebars.compile('<input type="file" {{bindAttr disabled="view.disabled"}} />'),
+
+ classNames: ['vdf-input-indentation'],
+
+ change: function (e) {
+ var self = this;
+ if (e.target.files && e.target.files.length == 1) {
+ var file = e.target.files[0];
+ var reader = new FileReader();
+
+ reader.onload = (function () {
+ return function (e) {
+ self.get("controller").setVDFFile(e.target.result);
+ };
+ })(file);
+ reader.readAsText(file);
+ }
+ }
+
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/ambari-web/test/controllers/installer_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/installer_test.js b/ambari-web/test/controllers/installer_test.js
index 353129b..85f5613 100644
--- a/ambari-web/test/controllers/installer_test.js
+++ b/ambari-web/test/controllers/installer_test.js
@@ -41,7 +41,7 @@ describe('App.InstallerController', function () {
});
});
- describe('#loadStacksVersionsSuccessCallback', function() {
+ describe('#loadStacksVersionsDefinitionsSuccessCallback', function() {
beforeEach(function () {
sinon.stub(App.store, 'commit', Em.K);
});
@@ -50,10 +50,6 @@ describe('App.InstallerController', function () {
});
it ('Correct data', function() {
installerController.set('loadStacksRequestsCounter', 1);
- installerController.loadStacksVersionsSuccessCallback(require('test/stack'));
- expect(installerController.get('content.stacks.length')).to.equal(2);
- expect(installerController.get('content.stacks').everyProperty('isSelected')).to.be.false;
- expect(installerController.get('content.stacks').mapProperty('id')).to.eql(['HDP-2.1','HDP-1.3']);
});
});
@@ -92,6 +88,7 @@ describe('App.InstallerController', function () {
isSelected: true,
reload: false,
id: 'nn-cc',
+ stackNameVersion: 'nn-cc',
repositories: Em.A([
Em.Object.create({
isSelected: true
@@ -127,6 +124,7 @@ describe('App.InstallerController', function () {
"isSelected": true,
"reload": true,
"id": "nn-cc",
+ "stackNameVersion": 'nn-cc',
"repositories": [
{
"isSelected": true
@@ -323,25 +321,6 @@ describe('App.InstallerController', function () {
});
});
- describe('#loadStacks', function() {
- it ('Should resolve promise with true', function() {
- installerController.set('content.stacks', Em.Object.create({
- length: 2
- }));
- var res = installerController.loadStacks();
- res.then(function(data){
- expect(data).to.be.true;
- });
- });
- it ('Should resolve promise with false', function() {
- installerController.set('content.stacks', null);
- var res = installerController.loadStacks();
- res.then(function(data){
- expect(data).to.be.false;
- });
- });
- });
-
describe('#setLowerStepsDisable', function() {
beforeEach(function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/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 00d7ce8..2481bdd 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
@@ -64,7 +64,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
});
it("should be valid", function() {
controller.propertyDidChange('realStackUrl');
- expect(controller.get('realStackUrl')).to.equal('apiPrefix/clusters/clusterName/stack_versions?fields=*,repository_versions/*,repository_versions/operating_systems/repositories/*');
+ expect(controller.get('realStackUrl')).to.equal('apiPrefix/clusters/clusterName/stack_versions?fields=*,repository_versions/*,repository_versions/operating_systems/OperatingSystems/*,repository_versions/operating_systems/repositories/*');
});
});
@@ -1164,7 +1164,8 @@ describe('App.MainAdminStackAndUpgradeController', function() {
"operating_systems": [
{
"OperatingSystems": {
- "os_type": "redhat6"
+ "os_type": "redhat6",
+ "ambari_managed_repositories": true
},
"repositories": [
{
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b77adc2/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 e93e001..a3e3f7e 100644
--- a/ambari-web/test/controllers/wizard/step8_test.js
+++ b/ambari-web/test/controllers/wizard/step8_test.js
@@ -1076,33 +1076,48 @@ describe('App.WizardStep8Controller', function () {
});
describe('#createCluster', function() {
-
- it('shouldn\'t add request to queue if not installerController used', function() {
- installerStep8Controller.reopen({content: {controllerName: 'addServiceController'}});
- installerStep8Controller.createCluster();
- expect(installerStep8Controller.addRequestToAjaxQueue.called).to.equal(false);
+ before(function () {
+ sinon.stub(App.Stack, 'find').returns([
+ Em.Object.create({
+ id: "HDP-2.3-2.3.4.0-1234",
+ isSelected: false,
+ repositoryVersion: "2.3.4.0-1234"
+ }),
+ Em.Object.create({
+ id: "HDP-2.3-2.3.4.1-1234",
+ isSelected: false,
+ repositoryVersion: "2.3.4.1-1234"
+ }),
+ Em.Object.create({
+ id: "HDP-2.3-2.3.4.4-1234",
+ isSelected: true,
+ repositoryVersion: "2.3.4.4-1234"
+ })
+ ]);
+ });
+ after(function () {
+ App.Stack.find.restore();
});
it('App.currentStackVersion should be changed if localRepo selected', function() {
- App.set('currentStackVersion', 'HDP-1.1.1');
+ App.set('currentStackVersion', 'HDP-2.3');
installerStep8Controller.reopen({content: {controllerName: 'installerController', installOptions: {localRepo: true}}});
var data = {
- data: JSON.stringify({ "Clusters": {"version": 'HDPLocal-1.1.1' }})
+ data: JSON.stringify({ "Clusters": {"version": 'HDPLocal-2.3', "repository_version": "2.3.4.4-1234"}})
};
installerStep8Controller.createCluster();
expect(installerStep8Controller.addRequestToAjaxQueue.args[0][0].data.data).to.equal(data.data);
});
it('App.currentStackVersion shouldn\'t be changed if localRepo ins\'t selected', function() {
- App.set('currentStackVersion', 'HDP-1.1.1');
+ App.set('currentStackVersion', 'HDP-2.3');
installerStep8Controller.reopen({content: {controllerName: 'installerController', installOptions: {localRepo: false}}});
var data = {
- data: JSON.stringify({ "Clusters": {"version": 'HDP-1.1.1' }})
+ data: JSON.stringify({ "Clusters": {"version": 'HDP-2.3', "repository_version": "2.3.4.4-1234"}})
};
installerStep8Controller.createCluster();
expect(installerStep8Controller.addRequestToAjaxQueue.args[0][0].data.data).to.eql(data.data);
});
-
});
describe('#createSelectedServices', function() {
@@ -1779,7 +1794,7 @@ describe('App.WizardStep8Controller', function () {
});
- describe('#startDeploy', function () {
+ describe('#_startDeploy', function () {
var stubbedNames = ['createCluster', 'createSelectedServices', 'createConfigurations',
'applyConfigurationsToCluster', 'createComponents', 'registerHostsToCluster', 'createConfigurationGroups',
@@ -1813,6 +1828,13 @@ describe('App.WizardStep8Controller', function () {
beforeEach(function () {
sinon.stub(App, 'get').withArgs('isKerberosEnabled').returns(false);
+ sinon.stub(App.Stack, 'find').returns([
+ Em.Object.create({
+ id: "HDP-2.3-2.3.4.4-1234",
+ isSelected: true,
+ repositoryVersion: "2.3.4.4-1234"
+ })
+ ]);
stubbedNames.forEach(function (name) {
sinon.stub(installerStep8Controller, name, Em.K);
});
@@ -1826,6 +1848,7 @@ describe('App.WizardStep8Controller', function () {
afterEach(function () {
App.get.restore();
+ App.Stack.find.restore();
stubbedNames.forEach(function (name) {
installerStep8Controller[name].restore();
});
@@ -1847,7 +1870,7 @@ describe('App.WizardStep8Controller', function () {
}
})
.withArgs('content.controllerName').returns(item.controllerName);
- installerStep8Controller.startDeploy();
+ installerStep8Controller._startDeploy();
});
stubbedNames.forEach(function (name) {