Attach disk

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

@@ -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>

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

@@ -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>

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

@@ -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">

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

@@ -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);
   }