X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/60a2cc94505c648d15a4ec3f1a07b47babde2b9b..c03e412f97676566404534e126c000585743e5aa:/src/Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index f053fae..2ba1bed 100644
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -46,14 +46,15 @@ class OMVModuleZFSDataset {
 	 *
 	 */
 	public function __construct($name, array $properties = null) {
-		$cmd = "zfs create " . $name . " 2>&1";
+		$cmd = "zfs create -p " . $name . " 2>&1";
 		OMVUtil::exec($cmd,$out,$res);
 		if ($res) {
 			throw new OMVModuleZFSException(implode("\n", $out));
 		}
 		$this->name = $name;
+		$this->updateAllProperties();
 		$this->setProperties($properties);
-		$this->mountPoint = $this->properties["mountpoint"];
+		$this->mountPoint = $this->properties["mountpoint"][0];
 	}
 
 	/**
@@ -80,7 +81,7 @@ class OMVModuleZFSDataset {
 	 * Get a single property value associated with the Dataset
 	 *
 	 * @param string $property Name of the property to fetch
-	 * @return string
+	 * @return array The returned array key 0=property value and key 1=property source.
 	 * @access public
 	 */
 	public function getProperty($property) {
@@ -88,9 +89,11 @@ class OMVModuleZFSDataset {
 	}
 
 	/**
-	 * Get an array of all properties associated with the Dataset
+	 * Get an associative array of all properties associated with the Dataset.
+	 *
+	 * @return array $properties Each entry is an array where key 0=property value and key
+	 * 1=property source.
 	 *
-	 * @return array $properties
 	 * @access public
 	 */
 	public function getProperties() {
@@ -111,14 +114,14 @@ class OMVModuleZFSDataset {
 			if ($res) {
 				throw new OMVModuleZFSException(implode("\n", $out));
 			}
-			$this->properties["$newpropertyk"] = $newpropertyv;
+			$this->updateProperty($newpropertyk);
 		}
-		$this->updateAllProperties();
 	}
 
 	/**
 	 * Get all Dataset properties from commandline and update object properties attribute
 	 *
+	 * @return void
 	 * @throws OMVModuleZFSException
 	 * @access private
 	 */ 
@@ -131,13 +134,32 @@ class OMVModuleZFSDataset {
 		unset($this->properties);
 		foreach ($out as $line) {
 			$tmpary = preg_split('/\t+/', $line);
-			$this->properties["$tmpary[1]"] = $tmpary[2];
+			$this->properties["$tmpary[1]"] = array($tmpary[2], $tmpary[3]);
 		}
 	}
 
+	/**
+	 * Get single Datset property from commandline and update object property attribute
+	 *
+	 * @param string $property Name of the property to update
+	 * @return void
+	 * @throws OMVModuleZFSException
+	 * @access private
+	 */
+	private function updateProperty($property) {
+		$cmd = "zfs get -H " . $property . " " . $this->name;
+		OMVUtil::exec($cmd,$out,$res);
+		if ($res) {
+			throw new OMVModuleZFSException(implode("\n", $out));
+		}
+		$tmpary = preg_split('/\t+/', $out[0]);
+		$this->properties["$tmpary[1]"] = array($tmpary[2], $tmpary[3]);
+	}
+
 	/**
 	 * Destroy the Dataset.
 	 *
+	 * @return void
 	 * @throws OMVModuleZFSException
 	 * @access public
 	 */
@@ -149,6 +171,41 @@ class OMVModuleZFSDataset {
 		}
 	}
 
+	/**
+	 * Renames a Dataset
+	 *
+	 * @param string $newname New name of the Dataset
+	 * @return void
+	 * @throws OMVModuleZFSException
+	 * @access public
+	 */
+	public function rename($newname) {
+		$cmd = "zfs rename -p " . $this->name . " " . $newname . " 2>&1";
+		OMVUtil::exec($cmd,$out,$res);
+		if ($res) {
+			throw new OMVModuleZFSException(implode("\n", $out));
+		}
+		$this->name = $newname;
+	}
+
+	/**
+	 * Clears a previously set proporty and specifies that it should be
+	 * inherited from it's parent.
+	 *
+	 * @param string $property Name of the property to inherit.
+	 * @return void
+	 * @throws OMVModuleZFSException
+	 * @access public
+	 */
+	public function inherit($property) {
+		$cmd = "zfs inherit " . $property . " " . $this->name . " 2>&1";
+		OMVUtil::exec($cmd,$out,$res);
+		if ($res) {
+			throw new OMVModuleZFSException(implode("\n", $out));
+		}
+		$this->updateProperty($property);
+	}
+
 }
 
 ?>