Removed mountpoint attribute from Zvol.

[omvzfs.git] / src / Zvol.php

diff --git a/src/Zvol.php b/src/Zvol.php
index a26224113bd1491d1ae4d47f4bcdefd414ca0f44..82569d433531965ce6f6b377c0c15e5cf30c8362 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
@@ -26,14 +28,6 @@ class OMVModuleZFSZvol {
         */
        private $size;
 
-       /**
-        * Mountpoint of the Zvol
-        *
-        * @var    string $mountPoint
-        * @access private
-        */
-       private $mountPoint;
-
        /**
         * Array with properties assigned to the Zvol
         * 
@@ -44,25 +38,37 @@ class OMVModuleZFSZvol {
 
        // Associations
        // Operations
-       
+
        /**
-        * Return name of the Zvol
+        * Constructor. If the Zvol already exists in the system the object will be updated with all
+        * associated properties from commandline.
         * 
-        * @return string $name
+        * @param string $name Name of the new Zvol
+        * @return void
         * @access public
         */
-       public function getName() {
-               return $this->name;
+       public function __construct($name) {
+               $this->name = $name;
+               $qname = preg_quote($name, '/');
+               $cmd = "zfs list -H -t volume";
+               $this->exec($cmd, $out, $res);
+               foreach ($out as $line) {
+                       if (preg_match('/^' . $qname . '\t.*$/', $line)) {
+                               $this->updateAllProperties();
+                               $this->size = $this->properties["volsize"]["value"];
+                               continue;
+                       }
+               }
        }
 
        /**
-        * Get the mountpoint of the Zvol
+        * Return name of the Zvol
         * 
-        * @return string $mountPoint
+        * @return string $name
         * @access public
         */
-       public function getMountPoint() {
-               return $this->mountPoint;
+       public function getName() {
+               return $this->name;
        }
 
        /**
@@ -88,7 +94,6 @@ class OMVModuleZFSZvol {
                return $this->properties;
        }
 
-
        /**
         * XXX
         *
@@ -110,6 +115,42 @@ class OMVModuleZFSZvol {
                trigger_error('Not Implemented!', E_USER_WARNING);
        }
 
+       /**
+        * Get all Zvol properties from commandline and update object properties attribute
+        * 
+        * @return void
+        * @access private
+        */
+       private function updateAllProperties() {
+               $cmd = "zfs get -H all " . $this->name;
+               $this->exec($cmd,$out,$res);
+               unset($this->properties);
+               foreach ($out as $line) {
+                       $tmpary = preg_split('/\t+/', $line);
+                       $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 creating the dataset.
+        * @return void
+        * @access public
+        */
+       public function create($size, array $properties = null, bool $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"];
+       }
+
        /**
         * Helper function to execute a command and throw an exception on error
         * (requires stderr redirected to stdout for proper exception message).
@@ -128,7 +169,6 @@ class OMVModuleZFSZvol {
                }
                return $tmp;
        }
-
 }
 
 ?>