X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/77a007e04e6b82eaee3c3f00ba96d8aea97c0c36..a238c1a16ee1162aa28919ea82d20b83a69c03c1:/gui/rpc/zfs.inc?ds=inline

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index e72038e..ead4ee5 100644
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -126,13 +126,18 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			  "type":"object",
 			  "properties":{
 				  "type":{"type":"string","enum":["filesystem","snapshot",' .
-					'"volume"]},
+					'"volume","clone"]},
 				  "path":{"type":"string"},
 				  "name":{"type":"string"},
-				  "size":{"type":"string"}
+				  "size":{"type":"string"},
+				  "clonename":{"type":"string"}
 			  }
 		  }');
 		switch ($params['type']) {
+		case "clone":
+			$tmp = new OMVModuleZFSSnapshot($params['path']);
+			$tmp->clonesnap($params['clonename']);
+			break;
 		case "filesystem":
 			$name = $params['path'] . "/" . $params['name'];
 			$tmp = new OMVModuleZFSDataset($name);
@@ -159,7 +164,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			  "type":"object",
 			  "properties":{
 				  "type":{"type":"string","enum":["Filesystem","Snapshot",' .
-					'"Volume","Clone","Pool"]},
+					'"Volume","Pool"]},
 				  "name":{"type":"string"}
 			  }
 		  }');
@@ -171,10 +176,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$tmp = new OMVModuleZFSDataset($name);
 			$tmp->destroy();
 			break;
-		case "Clone":
-			$tmp = new OMVModuleZFSDataset($name);
-			$tmp->destroy();
-			break;
 		case "Snapshot":
 			$tmp = new OMVModuleZFSSnapshot($name);
 			$tmp->destroy();
@@ -217,7 +218,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		$name = $params['name'];
 		switch ($params['type']) {
 		case "Filesystem":
-		case "Clone":
 			$tmp = new OMVModuleZFSDataset($name);
 			break;
 		case "Snapshot":
@@ -252,7 +252,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			"type":"object",
 				"properties":{
 					"type":{"type":"string","enum":["Filesystem","Snapshot",' .
-						'"Volume","Clone","Pool"]},
+						'"Volume","Pool"]},
 					"name":{"type":"string"},
 					"properties":{"type":"array","items":{
 						"type":"object",
@@ -264,7 +264,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		global $xmlConfig;
 		switch ($params['type']) {
 		case "Filesystem":
-		case "Clone":
 			$tmp = new OMVModuleZFSDataset($params['name']);
 			break;
 		case "Snapshot":
@@ -298,7 +297,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			  "type":"object",
 			  "properties":{
 				  "type":{"type":"string","enum":["Filesystem","Snapshot",' .
-					'"Volume","Clone","Pool"]},
+					'"Volume","Pool"]},
 				  "name":{"type":"string"},
 				  "property":{"type":"string"}
 			  }
@@ -316,7 +315,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$this->updateBgProcStatus($bgStatusFilename, "outputfilename", $bgOutputFilename);
 			switch ($params['type']) {
 			case "Filesystem":
-			case "Clone":
 				$tmp = new OMVModuleZFSDataset($params['name']);
 				break;
 			case "Snapshot":
@@ -368,7 +366,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			  "type":"object",
 			  "properties":{
 				  "name":{"type":"string"},
-				  "type":{"type":"string","enum":["Filesystem","Clone"]},
+				  "type":{"type":"string","enum":["Filesystem"]},
 				  "sharename":{'.$GLOBALS['OMV_JSONSCHEMA_SHARENAME'].'},
 				  "comment":{"type":"string"},
 				  "mode":{"type":"string","enum":["700","750","755",'.
@@ -391,9 +389,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		case "Filesystem":
 			$tmp = new OMVModuleZFSDataset($params['name']);
 			break;
-		case "Clone":
-			$tmp = new OMVModuleZFSDataset($params['name']);
-			break;
 		default:
 			throw new OMVModuleZFSException("Illegal type provided: " . $params['type']);
 			break;
@@ -516,8 +511,18 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$cmd = "zfs get all {$params['name']}";
 			break;
 		case "Pool":
-			$output .= "Pool details (zpool get all):\n\r\n\r";
+			$output .= "Pool status (zpool status):\n\r\n\r";
+			$cmd = "zpool status {$params['name']}";
+			OMVModuleZFSUtil::exec($cmd,$out,$res);
+			$output .= implode("\n\r", $out);
+			unset($out);
+			$output .= "\n\r\n\rPool details (zpool get all):\n\r\n\r";
 			$cmd = "zpool get all {$params['name']}";
+			OMVModuleZFSUtil::exec($cmd,$out,$res);
+			$output .= implode("\n\r", $out);
+			unset($out);
+			$output .= "\n\r\n\rPool filesystem details (zfs get all):\n\r\n\r";
+			$cmd = "zfs get all {$params['name']}";
 			break;
 		default:
 			throw new OMVModuleZFSException("Incorrect type provided");
@@ -536,7 +541,8 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 				  "vdevtype":{"type":"string","enum":["basic","mirror",' .
 					'"raidz1","raidz2","raidz3"]},
 				  "name":{"type":"string"},
-				  "devices":{"type":"string"}
+				  "devices":{"type":"string"},
+				  "force":{"type":"boolean"}
 			  }
 		}');
 		$pool = new OMVModuleZFSZpool($params['name']);
@@ -560,6 +566,9 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			throw new OMVModuleZFSException("Incorrect pool type specified");
 			break;
 		}
+		if ($params['force']) {
+			$opts .= "-f ";
+		}
 		//Use /dev/disk/by-path as deafult when creating new pools as suggested in ZoL FAQ.
 		$disks = preg_split("/[,;]/", $params['devices']);
 		if (file_exists("/dev/disk/by-path/")) {
@@ -570,7 +579,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$disks = $tmp_disks;
 		}
 		$vdev[] = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);
-		$pool->addVdev($vdev);
+		$pool->addVdev($vdev, $opts);
 		//Ugly fix to solve the problem of blkid not displaying info on newly created pools
 		$pool->export();
 		$pool->import($pool->getName());