create skript now uses also executor

1 files changed, 9 insertions, 15 deletions

diff --git a/createAndExportDisk.py b/createAndExportDisk.py
index 125f957..aaf01be 100755
--- a/createAndExportDisk.py
+++ b/createAndExportDisk.py
@@ -30,23 +30,17 @@ elif len(args) > 1:
 
 vmName = parseVmName(args[0])
 diskSize, diskSizeUnit = parseDiskSize(options.size)
-#ip, ipLastBlock = parseIp(args[1])
 
-pl = ProgressLogger(3)
+exe = Executor([
+    ExecRecepie('create logical volume',
+        ["lvcreate", "-n", vmName, "-L", str(diskSize) + str(diskSizeUnit)]),
+    ExecRecepie('format logical volume  with ext4',
+        ["mkfs.ext4", "/dev/" + volumeGroupName + "/" + vmName, "-l",vmName]),
+    ExecRecepie('export iscsi lun',
+        ["addIscsiDisk", vmName])
+])
 
-lf = openLogFile(sys.argv[0] + "-" + vmName)
-
-pl.start('create logical volume')
-execute(["lvcreate", "-n", vmName, "-L", str(diskSize) + str(diskSizeUnit)],lf)
-pl.done()
-
-pl.start('format logical volume  with ext4')
-execute(["mkfs.ext4", "/dev/" + volumeGroupName + "/" + vmName, "-l",vmName],lf)
-pl.done()
-
-pl.start('adding iscsi export')
-execute(["addIscsiDisk", vmName],lf)
-pl.done()
+exe.do()
 
 logInfo("all done. SSH to (pang|peng).spline.de an install your vm there!")
 sys.exit(0)