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

B #1782: qcow2 driver should be automatically marked when a volatile qcow2 disk is added (#1783)

Browse Source
This commit is contained in:
Abel Coronado 2018-02-26 16:44:37 +01:00 committed by Tino Vázquez
parent bd3cac1781
commit dbbbc5fb5f
1 changed files with 62 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
View File

@ -19,19 +19,19 @@ define(function(require) {
DEPENDENCIES
*/
var Config = require('sunstone-config');
var Locale = require('utils/locale');
var Tips = require('utils/tips');
var ImageTable = require('tabs/images-tab/datatable')
var WizardFields = require('utils/wizard-fields');
var UniqueId = require('utils/unique-id');
var TemplateUtils = require('utils/template-utils');
var Config = require("sunstone-config");
var Locale = require("utils/locale");
var Tips = require("utils/tips");
var ImageTable = require("tabs/images-tab/datatable")
var WizardFields = require("utils/wizard-fields");
var UniqueId = require("utils/unique-id");
var TemplateUtils = require("utils/template-utils");
/*
TEMPLATES
*/
var TemplateHTML = require('hbs!./disk-tab/html');
var TemplateHTML = require("hbs!./disk-tab/html");
/*
CONSTANTS
@ -42,11 +42,11 @@ define(function(require) {
*/
function DiskTab(diskTabId) {
this.diskTabId = 'diskTab' + diskTabId + UniqueId.id();
this.diskTabId = "diskTab" + diskTabId + UniqueId.id();
this.imageTable = new ImageTable(this.diskTabId + 'Table', {
'select': true,
'selectOptions': {
this.imageTable = new ImageTable(this.diskTabId + "Table", {
"select": true,
"selectOptions": {
"filter_fn": function(image) { return image.STATE != 5; }
}});
}
@ -66,8 +66,8 @@ define(function(require) {
function _html() {
return TemplateHTML({
'diskTabId': this.diskTabId,
'imageTableSelectHTML': this.imageTable.dataTableHTML
"diskTabId": this.diskTabId,
"imageTableSelectHTML": this.imageTable.dataTableHTML
});
}
@ -78,14 +78,14 @@ define(function(require) {
function _setup(context) {
var that = this;
that.imageTable.initialize({
'selectOptions': {
'select_callback': function(aData, options) {
"selectOptions": {
"select_callback": function(aData, options) {
// If the image is selected by Id, avoid overwriting it with name+uname
if ($('#IMAGE_ID', context).val() != aData[options.id_index]) {
$('#IMAGE_ID', context).val("");
$('#IMAGE', context).val(aData[options.name_index]);
$('#IMAGE_UNAME', context).val(aData[options.uname_index]);
$('#IMAGE_UID', context).val("");
if ($("#IMAGE_ID", context).val() != aData[options.id_index]) {
$("#IMAGE_ID", context).val("");
$("#IMAGE", context).val(aData[options.name_index]);
$("#IMAGE_UNAME", context).val(aData[options.uname_index]);
$("#IMAGE_UID", context).val("");
}
}
}
@ -100,17 +100,17 @@ define(function(require) {
if ($("input[name='" + that.diskTabId + "']:checked", context).val() == "image") {
imageContext.toggle();
volatileContext.hide();
$("[wizard_field]", imageContext).prop('wizard_field_disabled', false);
$("[wizard_field]", volatileContext).prop('wizard_field_disabled', true);
$("[wizard_field]", imageContext).prop("wizard_field_disabled", false);
$("[wizard_field]", volatileContext).prop("wizard_field_disabled", true);
} else {
imageContext.hide();
volatileContext.toggle();
$("[wizard_field]", volatileContext).prop('wizard_field_disabled', false);
$("[wizard_field]", imageContext).prop('wizard_field_disabled', true);
$("[wizard_field]", volatileContext).prop("wizard_field_disabled", false);
$("[wizard_field]", imageContext).prop("wizard_field_disabled", true);
}
});
$("[wizard_field]", imageContext).prop('wizard_field_disabled', false);
$("[wizard_field]", volatileContext).prop('wizard_field_disabled', true);
$("[wizard_field]", imageContext).prop("wizard_field_disabled", false);
$("[wizard_field]", volatileContext).prop("wizard_field_disabled", true);
// Volatile Type FS hides Format, Type SWAP displays Format
$("select#TYPE_KVM", volatileContext).change(function() {
@ -118,9 +118,13 @@ define(function(require) {
switch (value){
case "fs":
$("select#FORMAT_KVM", volatileContext).parent().show();
if($("select#FORMAT_KVM", volatileContext).val() === "qcow2"){
$("select#DRIVER", volatileContext).val("qcow2");
}
break;
case "swap":
$("select#FORMAT_KVM", volatileContext).parent().hide();
$("select#DRIVER", volatileContext).val("");
break;
}
});
@ -131,19 +135,35 @@ define(function(require) {
switch (value){
case "fs":
$("select#FORMAT_VCENTER", volatileContext).parent().show();
if($("select#FORMAT_VCENTER", volatileContext).val() === "qcow2"){
$("select#DRIVER", volatileContext).val("qcow2");
}
break;
case "swap":
$("select#FORMAT_VCENTER", volatileContext).parent().hide();
$("select#DRIVER", volatileContext).val("");
break;
}
});
$('input[name="custom_disk_dev_prefix"]',context).parent().hide();
$('select#disk_dev_prefix',context).change(function(){
$("select[name=format]", volatileContext).change(function(){
var value = $(this).val();
switch (value){
case "qcow2":
$("select#DRIVER", volatileContext).val(value);
break;
default:
$("select#DRIVER", volatileContext).val("");
break;
}
});
$("input[name=\"custom_disk_dev_prefix\"]",context).parent().hide();
$("select#disk_dev_prefix",context).change(function(){
if ($(this).val() == "custom"){
$('input[name="custom_disk_dev_prefix"]',context).parent().show();
$("input[name=\"custom_disk_dev_prefix\"]",context).parent().show();
} else {
$('input[name="custom_disk_dev_prefix"]',context).parent().hide();
$("input[name=\"custom_disk_dev_prefix\"]",context).parent().hide();
}
});
}
@ -191,14 +211,15 @@ define(function(require) {
if($("input[name='" + this.diskTabId + "']:checked", context).val() == "image" && !tmpl["IMAGE"] && !tmpl["IMAGE_ID"]){
return {};
}
var dev_prefix = WizardFields.retrieveInput($('#disk_dev_prefix', selectedContext));
var dev_prefix = WizardFields.retrieveInput($("#disk_dev_prefix", selectedContext));
if (dev_prefix != undefined && dev_prefix.length) {
if (dev_prefix == "custom") {
dev_prefix = WizardFields.retrieveInput($('#custom_disk_dev_prefix', selectedContext));
dev_prefix = WizardFields.retrieveInput($("#custom_disk_dev_prefix", selectedContext));
}
tmpl["DEV_PREFIX"] = dev_prefix;
}
$.extend(tmpl, TemplateUtils.stringToTemplate($('#templateStr',context).val()));
$.extend(tmpl, TemplateUtils.stringToTemplate($("#templateStr", context).val()));
return tmpl;
}
@ -210,7 +231,7 @@ define(function(require) {
}
if (templateJSON.IMAGE_ID || templateJSON.IMAGE) {
$('input#' + this.diskTabId + 'radioImage', context).click();
$("input#" + this.diskTabId + "radioImage", context).click();
if (templateJSON.IMAGE_ID != undefined) {
var selectedResources = {
@ -232,22 +253,22 @@ define(function(require) {
selectedContext = $(".image", context);
} else {
$('input#' + this.diskTabId + 'radioVolatile', context).click();
$("input#" + this.diskTabId + "radioVolatile", context).click();
selectedContext = $(".volatile", context);
}
WizardFields.fill(selectedContext, templateJSON);
$('#templateStr',context).val(TemplateUtils.templateToString(templateJSON));
$("#templateStr",context).val(TemplateUtils.templateToString(templateJSON));
var dev_prefix = templateJSON["DEV_PREFIX"];
if (dev_prefix != undefined && dev_prefix.length) {
WizardFields.fillInput($('#disk_dev_prefix', selectedContext), dev_prefix);
WizardFields.fillInput($("#disk_dev_prefix", selectedContext), dev_prefix);
var val = $('#disk_dev_prefix', selectedContext).val();
var val = $("#disk_dev_prefix", selectedContext).val();
if (val == "" || val == undefined){
$('#disk_dev_prefix', selectedContext).val("custom").change();
WizardFields.fillInput($('#custom_disk_dev_prefix', selectedContext), dev_prefix);
$("#disk_dev_prefix", selectedContext).val("custom").change();
WizardFields.fillInput($("#custom_disk_dev_prefix", selectedContext), dev_prefix);
}
}
}