From 3b3ca998608e7e527f357133c8863f80e5d3bee9 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Tue, 22 Dec 2015 18:00:21 +0100
Subject: [PATCH] Feature #4238: Add iSCSI DS type to Sunstone

---
 .../tabs/datastores-tab/form-panels/create.js | 39 +++++++++++++++++++
 .../form-panels/create/wizard.hbs             | 31 +++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
index b546e87597..febfc76a0a 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
@@ -148,6 +148,9 @@ define(function(require) {
         case 'dev':
           _selectDevices(dialog);
           break;
+        case 'iscsi':
+          _selectISCSI(dialog);
+          break;
         case 'custom':
           _selectCustom(dialog);
           break;
@@ -192,6 +195,9 @@ define(function(require) {
     var rbd_format      = $('#rbd_format', dialog).val();
     var staging_dir     = $('#staging_dir', dialog).val();
     var ceph_conf       = $('#ceph_conf', dialog).val();
+    var iscsi_host      = $('#iscsi_host', dialog).val();
+    var iscsi_user      = $('#iscsi_user', dialog).val();
+    var iscsi_usage     = $('#iscsi_usage', dialog).val();
 
     var ds_obj = {
       "datastore" : {
@@ -265,6 +271,15 @@ define(function(require) {
     if (ceph_conf)
         ds_obj.datastore.ceph_conf = ceph_conf;
 
+    if (iscsi_host)
+        ds_obj.datastore.iscsi_host = iscsi_host;
+
+    if (iscsi_user)
+        ds_obj.datastore.iscsi_user = iscsi_user;
+
+    if (iscsi_usage)
+        ds_obj.datastore.iscsi_usage = iscsi_usage;
+
     Sunstone.runAction("Datastore.create", ds_obj);
     return false;
   }
@@ -308,6 +323,9 @@ define(function(require) {
     $('label[for="rbd_format"],input#rbd_format', dialog).parent().hide();
     $('label[for="staging_dir"],input#staging_dir', dialog).parent().hide();
     $('label[for="ceph_conf"],input#ceph_conf', dialog).parent().hide();
+    $('label[for="iscsi_host"],input#ceph_conf', dialog).parent().hide();
+    $('label[for="iscsi_user"],input#ceph_conf', dialog).parent().hide();
+    $('label[for="iscsi_usage"],input#ceph_conf', dialog).parent().hide();
     $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().hide();
     $('label[for="no_decompress"],input#no_decompress', dialog).parent().hide();
     $('select#ds_mad', dialog).removeAttr('disabled');
@@ -478,6 +496,27 @@ define(function(require) {
     $('input#restricted_dirs', dialog).attr('disabled', 'disabled');
   }
 
+  function _selectISCSI(dialog) {
+    $('select#ds_mad', dialog).val('iscsi');
+    $('select#ds_mad', dialog).attr('disabled', 'disabled');
+    $('select#tm_mad', dialog).val('iscsi');
+    $('select#tm_mad', dialog).attr('disabled', 'disabled');
+    $('input#image_ds_type', dialog).click();
+    $('input[name=ds_type]', dialog).attr('disabled', 'disabled');
+    $('label[for="iscsi_host"],input#iscsi_host', dialog).parent().fadeIn();
+    $('label[for="iscsi_user"],input#iscsi_user', dialog).parent().fadeIn();
+    $('label[for="iscsi_usage"],input#iscsi_usage', dialog).parent().fadeIn();
+    $('select#disk_type', dialog).val('iscsi');
+    $('select#disk_type', dialog).attr('disabled', 'disabled');
+    $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().hide();
+    $('label[for="no_decompress"],input#no_decompress', dialog).parent().hide();
+    $('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().hide();
+    $('input#safe_dirs', dialog).attr('disabled', 'disabled');
+    $('input#base_path', dialog).attr('disabled', 'disabled');
+    $('input#limit_mb', dialog).attr('disabled', 'disabled');
+    $('input#restricted_dirs', dialog).attr('disabled', 'disabled');
+  }
+
   function _selectCustom(dialog) {
     _hideAll(dialog);
     $('select#ds_mad', dialog).val('fs');
diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs
index e55b8c5cec..cf469bd207 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs
@@ -32,6 +32,7 @@
         <option value="ceph">{{tr "Ceph"}}</option>
         <option value="gluster">{{tr "Gluster"}}</option>
         <option value="dev">{{tr "Devices"}}</option>
+        <option value="iscsi">{{tr "iSCSI"}}</option>
         <option value="custom">{{tr "Custom"}}</option>
       </select>
     </div>
@@ -68,6 +69,7 @@
             <option value="vmfs">{{tr "VMFS"}}</option>
             <option value="ceph">{{tr "Ceph"}}</option>
             <option value="dev">{{tr "Devices"}}</option>
+            <option value="iscsi">{{tr "iSCSI"}}</option>
             <option value="custom">{{tr "Custom"}}</option>
           </select>
           <div>
@@ -86,6 +88,7 @@
             <option value="vmfs">{{tr "VMFS"}}</option>
             <option value="ceph">{{tr "Ceph"}}</option>
             <option value="dev">{{tr "Devices"}}</option>
+            <option value="iscsi">{{tr "iSCSI"}}</option>
             <option value="custom">{{tr "Custom"}}</option>
           </select>
           <div>
@@ -104,6 +107,7 @@
         <option value="block">{{tr "Block"}}</option>
         <option value="RBD">{{tr "RBD"}}</option>
         <option value="gluster">{{tr "Gluster"}}</option>
+        <option value="iscsi">{{tr "iSCSI"}}</option>
       </select>
     </div>
   </div>
@@ -267,5 +271,32 @@
       </label>
       <input type="text" name="ceph_conf" id="ceph_conf" />
     </div>
+    <div class="medium-6 columns">
+      <label for="iscsi_host">
+        {{tr "iSCSI Host"}}
+        <span class="tip">
+          {{tr "The iSCSI Host. Example: 'host' or 'host:port' (if no port is specified, the default one is chosen)."}}
+        </span>
+      </label>
+      <input type="text" name="iscsi_host" id="iscsi_host" />
+    </div>
+    <div class="medium-6 columns">
+      <label for="iscsi_user">
+        {{tr "iSCSI User"}}
+        <span class="tip">
+          {{tr "The iSCSI User."}}
+        </span>
+      </label>
+      <input type="text" name="iscsi_user" id="iscsi_user" />
+    </div>
+    <div class="medium-6 columns">
+      <label for="iscsi_usage">
+        {{tr "iSCSI Usage"}}
+        <span class="tip">
+          {{tr "'Usage' of the registered secret that contains the CHAP Authentication string."}}
+        </span>
+      </label>
+      <input type="text" name="iscsi_usage" id="iscsi_usage" />
+    </div>
   </div>
 </form>