Recreate Storagepool (#5)

[karesansui/karesansui.git] / karesansui / gadget / hostby1storagepool.py

diff --git a/karesansui/gadget/hostby1storagepool.py b/karesansui/gadget/hostby1storagepool.py
index 93ebe26..3fde401 100644 (file)
--- a/karesansui/gadget/hostby1storagepool.py
+++ b/karesansui/gadget/hostby1storagepool.py
@@ -193,26 +193,27 @@ def create_pool_iscsi_job(obj, machine, name, type_, host_name, device_path, aut
 
     automount_options = {}
     automount_options["type"] = STORAGE_POOL_TYPE['TYPE_FS']
-    checkmount_options = {}
 
     for disk in automount_list:
-        checkmount_options["dev"] = "%s/%s" % (ISCSI_DEVICE_DIR, disk['symlink_name'])
-        #checkmount_options["format"] = None
+        readymount_options = {}
+        readymount_options["dev"] = "%s/%s" % (ISCSI_DEVICE_DIR, disk['symlink_name'])
+        if "is_format" in disk:
+            readymount_options["format"] = None
 
         automount_options["name"] = disk['symlink_name']
         automount_options["device_path"] = "%s/%s" % (ISCSI_DEVICE_DIR, disk['symlink_name'])
         automount_options["target_path"] = "%s/%s" % (VENDOR_DATA_ISCSI_MOUNT_DIR, disk['symlink_name'])
 
-        checkmount_cmd = dict2command(
-            "%s/%s" % (karesansui.config['application.bin.dir'], ISCSI_COMMAND_READY_MOUNT), checkmount_options)
-        checkmount_job = Job('Check mount command', 0, checkmount_cmd)
+        readymount_cmd = dict2command(
+            "%s/%s" % (karesansui.config['application.bin.dir'], ISCSI_COMMAND_READY_MOUNT), readymount_options)
+        readymount_job = Job('Check mount command', 0, readymount_cmd)
 
         automount_cmd = dict2command(
             "%s/%s" % (karesansui.config['application.bin.dir'], cmd), automount_options)
         automount_job = Job('%s command' % cmdname, 1, automount_cmd)
 
         jobgroup = JobGroup(cmdname, karesansui.sheconf['env.uniqkey'])
-        jobgroup.jobs.append(checkmount_job)
+        jobgroup.jobs.append(readymount_job)
         jobgroup.jobs.append(automount_job)
 
         machine2jobgroup = m2j_new(machine=machine,
@@ -230,7 +231,6 @@ def create_pool_iscsi_job(obj, machine, name, type_, host_name, device_path, aut
 
     return True
 
-
 class HostBy1StoragePool(Rest):
 
     @auth
@@ -359,8 +359,10 @@ class HostBy1StoragePool(Rest):
             automount_list = []
             for disk in disk_list:
                 if is_param(self.input, "iscsi-disk-use-type-%s" % (disk['symlink_name'])):
-                    if self.input["iscsi-disk-use-type-%s" % (disk['symlink_name'])] == "mount" and \
-                            disk['is_partitionable'] is False:
+                    if self.input["iscsi-disk-use-type-%s" % (disk['symlink_name'])] == "mount" and disk['is_partitionable'] is False:
+                        if is_param(self.input, "iscsi-disk-format-%s" % (disk['symlink_name'])):
+                            if self.input["iscsi-disk-format-%s" % (disk['symlink_name'])] == "true":
+                                disk["is_format"] = True
                         automount_list.append(disk)
 
             if create_pool_iscsi_job(self,