X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/cc1caa78f4dc963669b7a9cc5529b04cbe957d88..a6c3a4dd0c35379fcdec4462739dc92d758a882f:/gui/rpc/zfs.inc?ds=sidebyside

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index f52f5db..75b5c23 100644
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -31,6 +31,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		$this->registermethod("getSharedParams");
 		$this->registermethod("createShare");
 		$this->registermethod("getObjectDetails");
+		$this->registermethod("expandPool");
 	}
 
 	public function addPool($params, $context) {
@@ -525,6 +526,55 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		$output .= implode("\n\r", $out);
 		return array("details" => $output);
 	}
+	
+	public function expandPool($params, $context) {
+		$this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
+		// Validate the parameters of the RPC service method.
+		$this->validateMethodParams($params, '{
+			  "type":"object",
+			  "properties":{
+				  "pool_type":{"type":"string","enum":["Basic","Mirror",' .
+					'"Raidz1","Raidz2","Raidz3"]},
+				  "name":{"type":"string"},
+				  "devices":{"type":"string"}
+			  }
+		}');
+		$pool = new OMVModuleZFSZpool($params['name']);
+		switch ($params['pool_type']) {
+		case "Basic":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSPLAIN;
+			break;
+		case "Mirror":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSMIRROR;
+			break;
+		case "Raidz1":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ1;
+			break;
+		case "Raidz2":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ2;
+			break;
+		case "Raidz3":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ3;
+			break;
+		default:
+			throw new OMVModuleZFSException("Incorrect pool type specified");
+			break;
+		}
+		//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/")) {
+			$tmp_disks = array();
+			foreach ($disks as $disk) {
+				$tmp_disks[] = OMVModuleZFSUtil::getDiskPath($disk);
+			}
+			$disks = $tmp_disks;
+		}
+		$vdev[] = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);
+		$pool->addVdev($vdev);
+		//Ugly fix to solve the problem of blkid not displaying info on newly created pools
+		$pool->export();
+		$pool->import($pool->getName());
+	}
 }
 
 // Register the RPC service.