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

Feature #1312: Remove BUS attribute from sunstone templates, images, hotplugging

Browse Source
This commit is contained in:
Hector Sanjuan 2012-06-22 15:33:45 +02:00 committed by Carlos Martín
parent bea73f0caa
commit d5cb78a1d8
3 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sunstone/public/js/plugins/images-tab.js
View File

@ -98,15 +98,6 @@ var create_image_tmpl =
<input type="text" name="img_dev_prefix" id="img_dev_prefix" />\
<div class="tip">'+tr("Prefix for the emulated device this image will be mounted at. For instance, “hd”, “sd”. If omitted, the default value is the one defined in oned.conf (installation default is “hd”).")+'</div>\
</div>\
<div class="img_param">\
<label for="img_bus">'+tr("Bus")+':</label>\
<select name="img_bus" id="img_bus">\
<option value="ide">'+tr("IDE")+'</option>\
<option value="scsi">'+tr("SCSI")+'</option>\
<option value="virtio">'+tr("Virtio (KVM)")+'</option>\
</select>\
<div class="tip">'+tr("Type of disk device to emulate.")+'</div>\
</div>\
<div class="img_param">\
<label for="img_driver">'+tr("Driver")+':</label>\
<input type="text" name="img_driver" id="img_driver" />\
@ -909,9 +900,6 @@ function setupCreateImageDialog(){
img_json["DEV_PREFIX"] = dev_prefix;
}
var bus = $('#img_bus',this).val();
img_json["BUS"] = bus;
var driver = $('#img_driver',this).val();
if (driver.length)
img_json["DRIVER"] = driver;

30
src/sunstone/public/js/plugins/templates-tab.js
View File

@ -188,7 +188,7 @@ var create_template_tmpl = '<div id="template_create_tabs">\
\
\
<!--disks section using image or declaring\
image, image ID, bus, target, driver\
image, image ID, target, driver\
type, source, size, format, clone, save,\
readonly SEVERAL DISKS-->\
<div class="vm_section" id="disks">\
@ -211,12 +211,6 @@ var create_template_tmpl = '<div id="template_create_tabs">\
<div class="tip">'+tr("Name of the image to use")+'</div>\
<input type="hidden" id="IMAGE_UNAME" name="image_uname" value=""/>\
</div>\
<div class="vm_param kvm_opt xen_opt vmware_opt">\
<label for="BUS">'+tr("Bus")+':</label>\
<select id="BUS" name="bus">\
</select>\
<div class="tip">'+tr("Type of disk device to emulate: ide, scsi")+'</div>\
</div>\
<div class="vm_param kvm_opt xen_opt vmware_opt">\
<label for="TARGET">'+tr("Target")+':</label>\
<input type="text" id="TARGET" name="target" />\
@ -1020,7 +1014,6 @@ function setupCreateTemplateDialog(){
//empty selects
$('select#BOOT',section_os_boot).empty();
$('select#TYPE',section_disks).empty();
$('select#BUS',section_disks).empty();
//hide options about boot method
$('div#kernel_bootloader',section_os_boot).show();
@ -1082,7 +1075,6 @@ function setupCreateTemplateDialog(){
//KVM particularities:
// * Add custom disk types
// * Add custom boot options
// * Add custom bus options
// * Show boot options
// * Set the raw type to kvm
// * Show the inputs and graphics section
@ -1108,13 +1100,6 @@ function setupCreateTemplateDialog(){
$('select#BOOT',section_os_boot).parent().show();
$('select#boot_method option#no_boot',section_os_boot).html(tr("Driver default"));
var bus_opts =
'<option value="ide">'+tr("IDE")+'</option>\
<option value="scsi">'+tr("SCSI")+'</option>\
<option value="virtio">'+tr("Virtio")+'</option>';
$('select#BUS',section_disks).html(bus_opts);
$('input#TYPE', section_raw).val("kvm");
$(section_inputs).show();
@ -1130,7 +1115,6 @@ function setupCreateTemplateDialog(){
// XEN particularities:
// * Add custom disk types
// * Remove driver default boot method
// * Add custom bus types
// * Set the raw section to XEN
// * Show the graphics section
@ -1146,12 +1130,6 @@ function setupCreateTemplateDialog(){
$('select#boot_method option#no_boot',section_os_boot).html(tr("Please choose"));
var bus_opts =
'<option value="ide">'+tr("IDE")+'</option>\
<option value="scsi">'+tr("SCSI")+'</option>';
$('select#BUS',section_disks).html(bus_opts);
$('input#TYPE', section_raw).val("xen");
};
@ -1165,7 +1143,6 @@ function setupCreateTemplateDialog(){
//VMWARE particularities
// * Add custom disk types
// * Hide boot method field
// * Add custom bus types
// * Set the raw type to vmware
var type_opts =
@ -1177,11 +1154,6 @@ function setupCreateTemplateDialog(){
$('div#kernel_bootloader',section_os_boot).hide();
var bus_opts =
'<option value="ide">'+tr("IDE")+'</option>\
<option value="scsi">'+tr("SCSI")+'</option>';
$('select#BUS',section_disks).html(bus_opts);
$('input#TYPE', section_raw).val("vmware");
};

1
src/sunstone/public/js/plugins/vms-tab.js
View File

@ -1249,7 +1249,6 @@ function hotpluggingOps(){
}
disk_obj.IMAGE_ID = $('select[name="IMAGE_ID"]',this).val();
disk_obj.DEV_PREFIX = $('input[name="DEV_PREFIX"]',this).val();
disk_obj.BUS = 'scsi';
break;
case "volatile":
disk_obj.SIZE = $('input[name="SIZE"]',this).val();