Made it optional to create Dataset on commandline in constructor. Changed properties...

[omvzfs.git] / src / Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index db3a165f848a6f8ee876e774c8bd5e6cf4e37359..55358eae5630034ef24bfcebde265e7deba2ebce 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -18,7 +18,8 @@ class OMVModuleZFSDataset {
      * @access private
      */
     private $name;
-    /**
+       
+       /**
      * Mountpoint of the Dataset
      *
      * @var    string $mountPoint
@@ -42,15 +43,18 @@ class OMVModuleZFSDataset {
         *
         * @param string $name Name of the new Dataset
         * @param array $properties An associative array with properties to set when creating the Dataset
+        * @param bool $create Should the Dataset be created on commandline? Defaults to false.
         *
         */
-       public function __construct($name, array $properties = null) {
-               $cmd = "zfs create -p " . $name . " 2>&1";
-               $this->exec($cmd,$out,$res);
+       public function __construct($name, array $properties = null, $create = false) {
+               if ($create) {
+                       $cmd = "zfs create -p " . $name . " 2>&1";
+                       $this->exec($cmd,$out,$res);
+               }
                $this->name = $name;
                $this->updateAllProperties();
                $this->setProperties($properties);
-               $this->mountPoint = $this->properties["mountpoint"][0];
+               $this->mountPoint = $this->properties["mountpoint"]["value"];
        }
 
        /**
@@ -123,7 +127,7 @@ class OMVModuleZFSDataset {
                unset($this->properties);
                foreach ($out as $line) {
                        $tmpary = preg_split('/\t+/', $line);
-                       $this->properties["$tmpary[1]"] = array($tmpary[2], $tmpary[3]);
+                       $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
                }
        }
 
@@ -138,7 +142,7 @@ class OMVModuleZFSDataset {
                $cmd = "zfs get -H " . $property . " " . $this->name;
                $this->exec($cmd,$out,$res);
                $tmpary = preg_split('/\t+/', $out[0]);
-               $this->properties["$tmpary[1]"] = array($tmpary[2], $tmpary[3]);
+               $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
        }
 
        /**
@@ -179,6 +183,42 @@ class OMVModuleZFSDataset {
                $this->updateProperty($property);
        }
 
+       /**
+        * Upgrades the Dataset to latest filesystem version
+        *
+        * @return void
+        * @access public
+        */
+       public function upgrade() {
+               $cmd = "zfs upgrade " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+       }
+
+       /**
+        * Mount the Dataset
+        *
+        * @return void
+        * @access public
+        */
+       public function mount() {
+               $cmd = "zfs mount " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+               $this->updateProperty("mounted");
+       }
+
+       /**
+        * Unmount the Dataset
+        *
+        * @return void
+        * @access public
+        */
+       public function unmount() {
+               $cmd = "zfs unmount " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+               $this->updateProperty("mounted");
+       }
+
+
        /**
         * Helper function to execute a command and throw an exception on error
         * (requires stderr redirected to stdout for proper exception message).