X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/6e6b3eb901069df5b343b49638c73b050f46b57e..a50e3caf1d538eb4bb0cd5eb8f634cb18e0065ab:/src/Zvol.php

diff --git a/src/Zvol.php b/src/Zvol.php
index 9ace6cf..603188a 100644
--- a/src/Zvol.php
+++ b/src/Zvol.php
@@ -1,6 +1,7 @@
 <?php
 require_once("Exception.php");
 require_once("openmediavault/util.inc");
+require_once("Snapshot.php");
 
 /**
  * XXX detailed description
@@ -36,6 +37,14 @@ class OMVModuleZFSZvol {
 	 */
 	private $properties;
 
+	/**
+	 * Array with Snapshots associated to the Zvol
+	 * 
+	 * @var     array $snapshots
+	 * @access private
+	 */
+	private $snapshots;
+
 	// Associations
 	// Operations
 
@@ -50,7 +59,7 @@ class OMVModuleZFSZvol {
 	public function __construct($name) {
 		$this->name = $name;
 		$qname = preg_quote($name, '/');
-		$cmd = "zfs list -H -t volume";
+		$cmd = "zfs list -H -t volume 2>&1";
 		$this->exec($cmd, $out, $res);
 		foreach ($out as $line) {
 			if (preg_match('/^' . $qname . '\t.*$/', $line)) {
@@ -59,6 +68,12 @@ class OMVModuleZFSZvol {
 				continue;
 			}
 		}
+		$cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
+		$this->exec($cmd, $out2, $res2);
+		foreach ($out2 as $line2) {
+			$this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+		}
+
 	}
 
 	/**
@@ -113,7 +128,7 @@ class OMVModuleZFSZvol {
 	 */
 	public function setProperties($properties) {
 		foreach ($properties as $newpropertyk => $newpropertyv) {
-			$cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name;
+			$cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name . " 2>&1";
 			$this->exec($cmd,$out,$res);
 			$this->updateProperty($newpropertyk);
 		}
@@ -126,7 +141,7 @@ class OMVModuleZFSZvol {
 	 * @access private
 	 */
 	private function updateAllProperties() {
-		$cmd = "zfs get -H all " . $this->name;
+		$cmd = "zfs get -H all " . $this->name . " 2>&1";
 		$this->exec($cmd,$out,$res);
 		unset($this->properties);
 		foreach ($out as $line) {
@@ -143,7 +158,7 @@ class OMVModuleZFSZvol {
 	 * @access private
 	 */
 	private function updateProperty($property) {
-		$cmd = "zfs get -H " . $property . " " . $this->name;
+		$cmd = "zfs get -H " . $property . " " . $this->name . " 2>&1";
 		$this->exec($cmd,$out,$res);
 		$tmpary = preg_split('/\t+/', $out[0]);
 		$this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
@@ -160,7 +175,7 @@ class OMVModuleZFSZvol {
 	 */
 	public function create($size, array $properties = null, $sparse = null) {
 		$cmd = "zfs create -p ";
-		if (isset($sparse) && $sparse == true) {
+		if ((isset($sparse)) && ($sparse == true)) {
 			$cmd .= "-s ";
 		}	
 		$cmd .= "-V " . $size . " " . $this->name . " 2>&1";
@@ -177,8 +192,21 @@ class OMVModuleZFSZvol {
 	 * @access public
 	 */
 	public function destroy() {
-		$cmd = "zfs destroy " . $this->name;
+		$cmd = "zfs destroy " . $this->name . " 2>&1";
+		$this->exec($cmd,$out,$res);
+	}
+
+	/**
+	 * Renames a Zvol
+	 * 
+	 * @param string $newname New name of the Dataset
+	 * @return void
+	 * @access public
+	 */
+	public function rename($newname) {
+		$cmd = "zfs rename -p " . $this->name . " " . $newname . " 2>&1";
 		$this->exec($cmd,$out,$res);
+		$this->name = $newname;
 	}
 
 	/**
@@ -195,6 +223,33 @@ class OMVModuleZFSZvol {
 		$this->updateProperty($property);
 	}
 
+	/**
+	 * Creates a Snapshot and adds it to the existing list of snapshots associated
+	 * with the Zvol.
+	 * 
+	 * @param string $snap_name Name of the Snapshot to create.
+	 * @param array $properties Optional array of properties to set on Snapshot
+	 * @return void
+	 * @access public
+	 */
+	public function addSnapshot($snap_name, array $properties = null) {
+		$snap = new OMVModuleZFSSnapshot($snap_name);
+		$snap->create($properties);
+		$this->snapshots[$snap_name] = $snap;
+	}
+
+	/**
+	 * Destroys a Snapshot on commandline and removes it from the Zvol.
+	 * 
+	 * @param string $snap_name Name of the Snapshot to delete.
+	 * @return void
+	 * @access public
+	 */
+	public function deleteSnapshot($snap_name) {
+		$this->snapshots[$snap_name]->destroy();
+		unset($this->snapshots[$snap_name]);
+	}
+
 	/**
 	 * Helper function to execute a command and throw an exception on error
 	 * (requires stderr redirected to stdout for proper exception message).