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

F #4913 vCenter Sunstone for new Storage Management (PR #232)

Browse Source 
* vCenter image

* Enabled System in create Datastore when vCenter is selecting
This commit is contained in:
Abel Coronado 2017-03-24 18:00:42 +01:00 committed by Tino Vázquez
parent 2245d7d5ce
commit f90a3ce9e3
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
View File

@ -183,7 +183,6 @@ define(function(require) {
break; break;
case "vcenter": case "vcenter":
$('input#system_ds_type', dialog).attr('disabled', 'disabled');
$('input#file_ds_type', dialog).attr('disabled', 'disabled'); $('input#file_ds_type', dialog).attr('disabled', 'disabled');
_selectvCenter(dialog); _selectvCenter(dialog);
break; break;

24
src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
View File

@ -205,8 +205,8 @@ define(function(require) {
}); });
// Custom Adapter Type // Custom Adapter Type
var custom_attrs = ["adapter_type", var custom_attrs = ["vcenter_adapter_type",
"disk_type", "vcenter_disk_type",
"img_dev_prefix", "img_dev_prefix",
"img_driver"]; "img_driver"];
@ -414,12 +414,12 @@ define(function(require) {
if (target) if (target)
img_json["TARGET"] = target; img_json["TARGET"] = target;
var adapter_type = WizardFields.retrieveInput($('#adapter_type', context)); var vcenter_adapter_type = WizardFields.retrieveInput($('#vcenter_adapter_type', context));
if (adapter_type) { if (vcenter_adapter_type) {
if (adapter_type == "custom") { if (vcenter_adapter_type == "custom") {
adapter_type = WizardFields.retrieveInput($('#custom_adapter_type', context)); vcenter_adapter_type = WizardFields.retrieveInput($('#custom_vcenter_adapter_type', context));
} }
img_json["VCENTER_ADAPTER_TYPE"] = adapter_type; img_json["VCENTER_ADAPTER_TYPE"] = vcenter_adapter_type;
} }
switch ($('#src_path_select input:checked', context).val()){ switch ($('#src_path_select input:checked', context).val()){
@ -431,12 +431,12 @@ define(function(require) {
size = WizardFields.retrieveInput($('#img_size', context)); size = WizardFields.retrieveInput($('#img_size', context));
if (size) img_json["SIZE"] = size; if (size) img_json["SIZE"] = size;
var disk_type = WizardFields.retrieveInput($('#disk_type', context)); var vcenter_disk_type = WizardFields.retrieveInput($('#vcenter_disk_type', context));
if (disk_type) { if (vcenter_disk_type) {
if (disk_type == "custom"){ if (vcenter_disk_type == "custom"){
disk_type = WizardFields.retrieveInput($('#custom_disk_type', context)); vcenter_disk_type = WizardFields.retrieveInput($('#custom_disk_type', context));
} }
img_json["DISK_TYPE"] = disk_type; img_json["VCENTER_DISK_TYPE"] = vcenter_disk_type;
} }
break; break;

12
src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
View File

@ -104,10 +104,10 @@
<input type="text" name="img_size" id="img_size" /> <input type="text" name="img_size" id="img_size" />
</div> </div>
<div class="medium-6 columns only_vcenter"> <div class="medium-6 columns only_vcenter">
<label for="disk_type"> <label for="vcenter_disk_type">
{{tr "Disk provisioning type"}} {{tr "Disk provisioning type"}}
</label> </label>
<select name="disk_type" id="disk_type"> <select name="vcenter_disk_type" id="vcenter_disk_type">
<option value="" selected="selected"></option> <option value="" selected="selected"></option>
<option value="thin">Thin</option> <option value="thin">Thin</option>
<option value="thick">Thick</option> <option value="thick">Thick</option>
@ -115,7 +115,7 @@
<option value="custom">custom</option> <option value="custom">custom</option>
</select> </select>
<div> <div>
<input type="text" id="custom_disk_type" name="custom_disk_type" /> <input type="text" id="custom_vcenter_disk_type" name="custom_vcenter_disk_type" />
</div> </div>
</div> </div>
</div> </div>
@ -126,10 +126,10 @@
<div class="medium-6 columns"> <div class="medium-6 columns">
<div class="row only_vcenter"> <div class="row only_vcenter">
<div class="large-12 columns"> <div class="large-12 columns">
<label for="adapter_type"> <label for="vcenter_adapter_type">
{{tr "Bus adapter controller"}} {{tr "Bus adapter controller"}}
</label> </label>
<select name="adapter_type" id="adapter_type"> <select name="vcenter_adapter_type" id="vcenter_adapter_type">
<option value="" selected="selected"></option> <option value="" selected="selected"></option>
<option value="lsiLogic">lsiLogic</option> <option value="lsiLogic">lsiLogic</option>
<option value="ide">ide</option> <option value="ide">ide</option>
@ -137,7 +137,7 @@
<option value="custom">custom</option> <option value="custom">custom</option>
</select> </select>
<div> <div>
<input type="text" id="custom_adapter_type" name="custom_adapter_type" /> <input type="text" id="custom_vcenter_adapter_type" name="custom_vcenter_adapter_type" />
</div> </div>
</div> </div>
</div> </div>