Fixed some commands to redirect stderr to stdout.

[omvzfs.git] / src / Zvol.php

diff --git a/src/Zvol.php b/src/Zvol.php
index e6fba7bd81c97dc4d6df37d37fae0e2d8a5c8900..9be6f5e2e869c7cedc95d2a3296cf86d2f015c4f 100644 (file)
--- a/src/Zvol.php
+++ b/src/Zvol.php
@@ -1,4 +1,6 @@
 <?php
+require_once("Exception.php");
+require_once("openmediavault/util.inc");
 
 /**
  * XXX detailed description
@@ -21,19 +23,11 @@ class OMVModuleZFSZvol {
        /**
         * Size of Zvol
         *
-        * @var int $size
+        * @var string $size
         * @access private
         */
        private $size;
 
-       /**
-        * Mountpoint of the Zvol
-        *
-        * @var    string $mountPoint
-        * @access private
-        */
-       private $mountPoint;
-
        /**
         * Array with properties assigned to the Zvol
         * 
@@ -61,8 +55,7 @@ class OMVModuleZFSZvol {
                foreach ($out as $line) {
                        if (preg_match('/^' . $qname . '\t.*$/', $line)) {
                                $this->updateAllProperties();
-                               $this->mountPoint = $this->properties["mountpoint"]["value"];
-                               $this->size = $this->properties["size"]["value"];
+                               $this->size = $this->properties["volsize"]["value"];
                                continue;
                        }
                }
@@ -78,16 +71,6 @@ class OMVModuleZFSZvol {
                return $this->name;
        }
 
-       /**
-        * Get the mountpoint of the Zvol
-        * 
-        * @return string $mountPoint
-        * @access public
-        */
-       public function getMountPoint() {
-               return $this->mountPoint;
-       }
-
        /**
         * Get a single property value associated with the Zvol
         * 
@@ -111,26 +94,29 @@ class OMVModuleZFSZvol {
                return $this->properties;
        }
 
-
        /**
-        * XXX
+        * Get the total size of the Zvol
         *
-        * @return int XXX
+        * @return string $size
         * @access public
         */
        public function getSize() {
-               trigger_error('Not Implemented!', E_USER_WARNING);
+               return $this->size;
        }
 
        /**
-        * XXX
-        *
-        * @param   $list<Feature> XXX
-        * @return void XXX
+        * Sets a number of Zvol properties. If a property is already set it will be updated with the new value.
+        * 
+        * @param  array $properties An associative array with properties to set
+        * @return void
         * @access public
         */
        public function setProperties($properties) {
-               trigger_error('Not Implemented!', E_USER_WARNING);
+               foreach ($properties as $newpropertyk => $newpropertyv) {
+                       $cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name;
+                       $this->exec($cmd,$out,$res);
+                       $this->updateProperty($newpropertyk);
+               }
        }
 
        /**
@@ -149,6 +135,79 @@ class OMVModuleZFSZvol {
                }
        }
 
+       /**
+        * Get single Datset property from commandline and update object property attribute
+        * 
+        * @param string $property Name of the property to update
+        * @return void
+        * @access private
+        */
+       private function updateProperty($property) {
+               $cmd = "zfs get -H " . $property . " " . $this->name;
+               $this->exec($cmd,$out,$res);
+               $tmpary = preg_split('/\t+/', $out[0]);
+               $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
+       }
+
+       /**
+        * Create a Zvol on commandline. Optionally provide a number of properties to set.
+        * 
+        * @param string $size Size of the Zvol that should be created
+        * @param array $properties Properties to set when creatiing the dataset.
+        * @param boolean $sparse Defines if a sparse volume should be created.
+        * @return void
+        * @access public
+        */
+       public function create($size, array $properties = null, $sparse = null) {
+               $cmd = "zfs create -p ";
+               if ((isset($sparse)) && ($sparse == true)) {
+                       $cmd .= "-s ";
+               }       
+               $cmd .= "-V " . $size . " " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+               $this->updateAllProperties();
+               $this->setProperties($properties);
+               $this->size = $this->properties["volsize"]["value"];
+       }
+
+       /**
+        * Destroy the Zvol.
+        * 
+        * @return void
+        * @access public
+        */
+       public function destroy() {
+               $cmd = "zfs destroy " . $this->name;
+               $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;
+       }
+
+       /**
+        * 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
+        * @access public
+        */
+       public function inherit($property) {
+               $cmd = "zfs inherit " . $property . " " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+               $this->updateProperty($property);
+       }
+
        /**
         * Helper function to execute a command and throw an exception on error
         * (requires stderr redirected to stdout for proper exception message).
@@ -167,7 +226,6 @@ class OMVModuleZFSZvol {
                }
                return $tmp;
        }
-
 }
 
 ?>