shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

F #4913 vcenter create/update template

Browse Source 
- Removed VM disks Keep checkbox
   - Removed KEEP_DISKS_ON_DONE attribute
   - Removed selection Default Datastore
   - Removed selection Default Resource Pool
This commit is contained in:
juanmont 2017-03-30 12:09:46 +02:00
parent 453e7a9f44
commit abb9d28e5c
2 changed files with 0 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
View File

@ -207,48 +207,6 @@ define(function(require) {
var userInputs = {};
// Retrieve Datastore Attribute
var dsInput = $(".vcenter_datastore_input", context);
if (dsInput.length > 0) {
var dsModify = WizardFields.retrieveInput($('.modify_datastore', dsInput));
var dsInitial = WizardFields.retrieveInput($('.initial_datastore', dsInput));
var dsParams = WizardFields.retrieveInput($('.available_datastores', dsInput));
if (dsModify === 'fixed' && dsInitial !== '') {
templateJSON['VCENTER_DATASTORE'] = dsInitial;
} else if (dsModify === 'list' && dsParams !== '') {
var dsUserInputsStr = UserInputs.marshall({
type: 'list',
description: Locale.tr("Which datastore you want this VM to run on?"),
initial: dsInitial,
params: dsParams
});
userInputs['VCENTER_DATASTORE'] = dsUserInputsStr;
}
}
// Retrieve Resource Pool Attribute
var rpInput = $(".vcenter_rp_input", context);
if (rpInput.length > 0) {
var rpModify = WizardFields.retrieveInput($('.modify_rp', rpInput));
var rpInitial = WizardFields.retrieveInput($('.initial_rp', rpInput));
var rpParams = WizardFields.retrieveInput($('.available_rps', rpInput));
if (rpModify === 'fixed' && rpInitial !== '') {
templateJSON['RESOURCE_POOL'] = rpInitial;
} else if (rpModify === 'list' && rpParams !== '') {
var rpUserInputs = UserInputs.marshall({
type: 'list',
description: Locale.tr("Which resource pool you want this VM to run in?"),
initial: rpInitial,
params: WizardFields.retrieveInput($('.available_rps', rpInput))
});
userInputs['RESOURCE_POOL'] = rpUserInputs;
}
}
// Since the USER_INPUTS section is not enabled for vCenter, we can assume that there are no more user inputs defined
if (!$.isEmptyObject(userInputs)) {
templateJSON['USER_INPUTS'] = userInputs;
@ -272,14 +230,6 @@ define(function(require) {
delete sunstone_template["NETWORK_SELECT"];
}
if (templateJSON["HYPERVISOR"] == 'vcenter' &&
templateJSON["KEEP_DISKS_ON_DONE"] &&
templateJSON["KEEP_DISKS_ON_DONE"].toLowerCase() == "yes" ) {
$("#KEEP_DISKS", context).attr("checked", "checked");
}
delete templateJSON["KEEP_DISKS_ON_DONE"];
if (Config.isFeatureEnabled("vcenter_deploy_folder")) {
if (templateJSON["HYPERVISOR"] == 'vcenter' &&
templateJSON["DEPLOY_FOLDER"]) {
@ -333,13 +283,6 @@ define(function(require) {
}
}
if (templateJSON["VCENTER_DATASTORE"]) {
$('.modify_datastore', context).val('fixed');
WizardFields.fillInput($('.initial_datastore', context), templateJSON["VCENTER_DATASTORE"]);
delete templateJSON["VCENTER_DATASTORE"];
}
if (templateJSON["RESOURCE_POOL"]) {
$('.modify_rp', context).val('fixed');
WizardFields.fillInput($('.initial_rp', context), templateJSON["RESOURCE_POOL"]);

58
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs
View File

@ -61,64 +61,6 @@
</label>
<input type="text" id="vcenter_template_ref"/>
</div>
<div class="medium-6 columns">
<div class="row">
<div class="large-6 columns">
<label>
{{tr "VM disks"}}
{{{tip (tr "If selected, VM disks won't be deleted after the VM finishes its lifecycle.")}}}
</label>
<input type="checkbox" id="KEEP_DISKS" name="KEEP_DISKS"/>
<label for="KEEP_DISKS">{{tr "Keep"}}</label>
</div>
</div>
</div>
</div>
<div class="vcenter_datastore_input row">
<div class="large-3 medium-6 columns">
<label>
{{tr "Default Datastore"}}
<input type="text" class="initial_datastore" value="{{datastore.initial}}"/>
</label>
</div>
<div class="large-3 medium-6 columns">
<label>
{{tr "Type"}}
<select class="modify_datastore">
<option value="fixed">{{tr "Fixed"}}</option>
<option value="list">{{tr "Provide on instantiation"}}</option>
</select>
</label>
</div>
<div class="large-6 medium-12 columns">
<label>
{{tr "Available Datastores"}}
<input type="text" class="available_datastores" value="{{datastore.params}}"/>
</label>
</div>
</div>
<div class="vcenter_rp_input row">
<div class="large-3 medium-6 columns">
<label>
{{tr "Default Resource Pool"}}
<input type="text" class="initial_rp" value="{{resourcePool.initial}}"/>
</label>
</div>
<div class="large-3 medium-6 columns">
<label>
{{tr "Type"}}
<select class="modify_rp">
<option value="fixed">{{tr "Fixed"}}</option>
<option value="list">{{tr "Provide on instantiation"}}</option>
</select>
</label>
</div>
<div class="large-6 medium-12 columns">
<label>
{{tr "Available Resource Pools"}}
<input type="text" class="available_rps" value="{{resourcePool.params}}"/>
</label>
</div>
</div>
<div class="vcenter_deploy_folder_input row">
<div class="medium-6 columns">