Use OMVUtil::exec

[omvzfs.git] / src / Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index 49ddfb2a466d487bd9056c90f6f9172ab2838988..025126ad167a6d09426b2184229093b592da5a3c 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -1,5 +1,6 @@
 <?php
 require_once("Exception.php");
 <?php
 require_once("Exception.php");

+require_once("openmediavault/util.inc");

 
 /**
  * XXX detailed description
 
 /**
  * XXX detailed description


@@ -17,15 +18,6 @@ class OMVModuleZFSDataset {
      * @access private
      */
     private $name;
      * @access private
      */
     private $name;

-
-    /**
-     * Size of Dataset
-     *
-     * @var    int $size
-     * @access private
-     */
-    private $size;
-

     /**
      * Mountpoint of the Dataset
      *
     /**
      * Mountpoint of the Dataset
      *


@@ -47,18 +39,21 @@ class OMVModuleZFSDataset {
 
        /**
         * Constructor
 
        /**
         * Constructor

-        * 
+        *

         * @param string $name Name of the new Dataset
         * @param string $name Name of the new Dataset

-        * @param array $features An array of features to set when creating the Dataset
+        * @param array $features An array of features (strings) in the form <key>=<value> to set when creating the Dataset
+        * @throws OMVModuleZFSException

         *
         */
        public function __construct($name, array $features = null) {
                $cmd = "zfs create ";
                if (isset($features)) {
         *
         */
        public function __construct($name, array $features = null) {
                $cmd = "zfs create ";
                if (isset($features)) {

-                       $cmd .= "-o " . implode(",", $features) . " ";
+                       foreach ($features as $feature) {
+                               $cmd .= "-o " . $feature . " ";
+                       }

                }
                $cmd .= $name . " 2>&1";
                }
                $cmd .= $name . " 2>&1";

-               exec($cmd,$out,$res);
+               OMVUtil::exec($cmd,$out,$res);

                if ($res == 1) {
                        throw new OMVModuleZFSException(implode("\n", $out));
                }
                if ($res == 1) {
                        throw new OMVModuleZFSException(implode("\n", $out));
                }


@@ -88,17 +83,6 @@ class OMVModuleZFSDataset {
                return $this->name;
        }
 
                return $this->name;
        }
 

-       /**
-        * Get the size of the Dataset
-        *
-        * @return int $size
-        * @access public
-        */
-       public function getSize() {
-               return $this->size;
-       }
-
-

        /**
         * Get the mountpoint of the Dataset
         *
        /**
         * Get the mountpoint of the Dataset
         *


@@ -120,14 +104,47 @@ class OMVModuleZFSDataset {
        }
 
        /**
        }
 
        /**

-        * XXX
+        * Sets a number of Dataset properties. If a property is already set it will be updated with the new value.

         *
         *

-        * @param  array XXX
-        * @return void XXX
+        * @param  array $features An array of strings in format <key>=<value>
+        * @return void

         * @access public
         */
         * @access public
         */

-       public function setFeatures($list) {
-               trigger_error('Not Implemented!', E_USER_WARNING);
+       public function setFeatures($features) {
+               foreach ($features as $newfeature) {
+                       $cmd = "zfs set " . $newfeature . " " . $this->name;
+                       OMVUtil::exec($cmd,$out,$res);
+                       if ($res == 1) {
+                               throw new OMVModuleZFSException(implode("\n", $out));
+                       }
+                       $tmp = explode("=", $newfeature);
+                       $newfeaturek = $tmp[0];
+                       $found = false;
+                       for ($i=0; $i<count($this->features); $i++) {
+                               $tmp = explode("=", $this->features[$i]);
+                               $oldfeaturek = $tmp[0];
+                               if (strcmp($newfeaturek, $oldfeaturek) == 0) {
+                                       $this->features[$i] = $newfeature;
+                                       $found = true;
+                                       continue;
+                               }
+                       }
+                       if (!$found) {
+                               array_push($this->features, $newfeature);
+                       }
+               }
+       }
+
+       /**
+        * Destroy the Dataset.
+        *
+        */
+       public function destroy() {
+               $cmd = "zfs destroy " . $this->name;
+               OMVUtil::exec($cmd,$out,$res);
+               if ($res == 1) {
+                       throw new OMVModuleZFSException(implode("\n", $out));
+               }

        }
 
 }
        }
 
 }