shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-28 17:57:22 +03:00
Code Releases Wiki Activity

Feature #4913: Attach disk (PR #233)

Browse Source 
* Attach disk | SWAP removed for vCenter templates

* Attach disk | qcow2 removed for vCenter templates

* Attach disk | SWAP & cowq2 removed for vCenter vms

* VM attach disk | Changed 'Advanced options' for vCenter disks

* Restyled import image

* Update html.hbs

Add missing ;
This commit is contained in:
Abel Coronado 2017-03-29 14:21:59 +02:00 committed by Tino Vázquez
parent f90a3ce9e3
commit 940ce3b38d
4 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs
View File

@ -31,19 +31,21 @@
<label for="vcenter_password">{{tr "Password"}}</label>
<input type="password" name="vcenter_password" id="vcenter_password" required />
</div>
<div class="large-2 medium-6 columns">
<div class="large-5 medium-6 columns">
<label>{{tr "Datastore"}}</label>
<div id="vcenter_datastore_wrapper"/>
</div>
<div class="large-3 medium-6 columns">
<label>&nbsp;</label>
<button type="submit" class="button radius">
{{tr "Get Images"}}
</button>
</div>
<div class="row">
<div style="float:right">
<label>&nbsp;</label>
<button type="submit" class="button radius">
{{tr "Get Images"}}
</button>
</div>
</div>
</form>
<div class="row collapse">
{{{vCenterImagesHTML}}}
</div>
</div>
</div>

10
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs
View File

@ -74,19 +74,25 @@
<label for="TYPE">
{{tr "Disk type"}}
</label>
<select wizard_field="TYPE" id="TYPE" name="type">
<select class="hypervisor only_kvm" wizard_field="TYPE" id="TYPE" name="type">
<option value="fs">{{tr "FS"}}</option>
<option value="swap">{{tr "Swap"}}</option>
</select>
<select class="hypervisor only_vcenter" style="display: none" wizard_field="TYPE" id="TYPE" name="type">
<option value="fs">{{tr "FS"}}</option>
</select>
</div>
<div class="medium-6 columns">
<label for="FORMAT">
{{tr "Filesystem format"}}
</label>
<select wizard_field="FORMAT" name="format" id="FORMAT">
<select class="hypervisor only_kvm" wizard_field="FORMAT" name="format" id="FORMAT">
<option value="raw" selected="selected">raw</option>
<option value="qcow2">qcow2</option>
</select>
<select class="hypervisor only_vcenter" style="display: none" wizard_field="FORMAT" name="format" id="FORMAT">
<option value="raw" selected="selected">raw</option>
</select>
</div>
</div>
<br>

30
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs
View File

@ -1,5 +1,5 @@
<div class="row">
<div class="medium-6 columns">
<div class="medium-6 columns hypervisor only_kvm">
<label for="TARGET">
{{tr "Target device"}}
{{{tip (tr "Device to map image disk. If set, it will overwrite the default device mapping.")}}}
@ -20,7 +20,7 @@
</div>
</div>
<div class="row">
<div class="medium-6 columns">
<div class="medium-6 columns hypervisor only_kvm">
<label>
{{tr "BUS"}}
<select id="disk_dev_prefix" name="disk_dev_prefix">
@ -35,7 +35,7 @@
<input type="text" id="custom_disk_dev_prefix" name="custom_disk_dev_prefix" />
</div>
</div>
<div class="medium-6 columns">
<div class="medium-6 columns hypervisor only_kvm">
<label for="READONLY">
{{tr "Read-only"}}
</label>
@ -45,6 +45,30 @@
<option value="no">{{tr "no"}}</option>
</select>
</div>
<div class="medium-6 columns hypervisor only_vcenter">
<label for="vcenter_adapter_type">
{{tr "Bus adapter controller"}}
</label>
<select wizard_field="VCENTER_ADAPTER_TYPE" name="vcenter_adapter_type" id="vcenter_adapter_type">
<option value="" selected="selected"></option>
<option value="lsiLogic">lsiLogic</option>
<option value="ide">ide</option>
<option value="busLogic">busLogic</option>
<option value="custom">custom</option>
</select>
</div>
<div class="medium-6 columns only_vcenter">
<label for="vcenter_disk_type">
{{tr "Disk provisioning type"}}
</label>
<select wizard_field="VCENTER_DISK_TYPE" name="vcenter_disk_type" id="vcenter_disk_type">
<option value="" selected="selected"></option>
<option value="thin">Thin</option>
<option value="thick">Thick</option>
<option value="eagerZeroedThick">Eager Zeroed Thick</option>
<option value="custom">custom</option>
</select>
</div>
</div>
<div class="row vm_param">
<div class="medium-6 columns hypervisor only_kvm">

7
src/sunstone/public/app/tabs/vms-tab/panels/storage.js
View File

@ -436,6 +436,10 @@ define(function(require) {
context.on('click', '#attach_disk', function() {
var dialog = Sunstone.getDialog(ATTACH_DISK_DIALOG_ID);
dialog.setElement(that.element);
if(that.element.USER_TEMPLATE.HYPERVISOR && that.element.USER_TEMPLATE.HYPERVISOR == 'venter'){
$('.hypervisor.only_kvm').hide();
$('.hypervisor.only_vcenter').show();
}
dialog.show();
return false;
});
@ -445,7 +449,6 @@ define(function(require) {
context.off('click', '.detachdisk');
context.on('click', '.detachdisk', function() {
var disk_id = $(this).parents('tr').attr('disk_id');
Sunstone.getDialog(CONFIRM_DIALOG_ID).setParams({
//header :
headerTabId: TAB_ID,
@ -596,7 +599,7 @@ define(function(require) {
return false;
});
}
Tree.setup(context);
}