Minor fixes to Dataset and Zvol constructors.

[omvzfs.git] / src / Snapshot.php

diff --git a/src/Snapshot.php b/src/Snapshot.php
index 6e3269863a1405a78be9c6a9356e8ff8853679e0..b30def21c05864a622e5ddb6aa6031c1ee3e68c6 100644 (file)
--- a/src/Snapshot.php
+++ b/src/Snapshot.php
@@ -39,16 +39,18 @@ class OMVModuleZFSSnapshot {
         * @access public
         */
        public function __construct($name) {
         * @access public
         */
        public function __construct($name) {

+               $snap_exists = true;

                $this->name = $name;
                $this->name = $name;

-               $qname = preg_quote($name, '/');
-               $cmd = "zfs list -H -t snapshot";
-               $this->exec($cmd, $out, $res);
-               foreach ($out as $line) {
-                       if (preg_match('/^' . $qname . '\t.*$/', $line)) {
-                               print("Name found!!!\n");
-                               $this->updateAllProperties();
-                               continue;
-                       }
+               $cmd = "zfs list -H -t snapshot " .$name . " 2>&1";
+               try {
+                       $this->exec($cmd, $out, $res);
+                       $this->updateAllProperties();
+               }
+               catch (OMVModuleZFSException $e) {
+                       $snap_exists = false;
+               }
+               if (!$snap_exists) {
+                       $this->create();

                }
        }
 
                }
        }
 


@@ -63,24 +65,55 @@ class OMVModuleZFSSnapshot {
        }
 
        /**
        }
 
        /**

-        * XXX
-        *
-        * @return list<Feature> XXX
+        * Get a single property value associated with the Snapshot
+        * 
+        * @param string $property Name of the property to fetch
+        * @return array The returned array with the property. The property is an associative array with
+        * two elements, <value> and <source>.

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

-       public function getFeatures() {
-               trigger_error('Not Implemented!', E_USER_WARNING);
+       public function getProperty($property) {
+               return $this->properties["$property"];

        }
 
        /**
        }
 
        /**

-        * XXX
-        *
-        * @param   $list<Feature> XXX
-        * @return void XXX
+        * Get an associative array of all properties associated with the Snapshot
+        * 
+        * @return array $properties Each entry is an associative array with two elements
+        * <value> and <source>

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

-       public function setFeatures($list) {
-               trigger_error('Not Implemented!', E_USER_WARNING);
+       public function getProperties() {
+               return $this->properties;
+       }
+
+       /**
+        * Sets a number of Snapshot 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) {
+               foreach ($properties as $newpropertyk => $newpropertyv) {
+                       $cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name . " 2>&1";
+                       $this->exec($cmd,$out,$res);
+                       $this->updateProperty($newpropertyk);
+               }
+       }
+
+       /**
+        * Get single Snapshot 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 . " 2>&1";
+               $this->exec($cmd,$out,$res);
+               $tmpary = preg_split('/\t+/', $out[0]);
+               $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);

        }
 
        /**
        }
 
        /**


@@ -90,15 +123,42 @@ class OMVModuleZFSSnapshot {
         * @access private
         */
        private function updateAllProperties() {
         * @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) {
                $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]);
+                       $tmpary = preg_split('/\t/', $line);
+                       if (strlen($tmpary[2] == 0)) {
+                               $this->properties["$tmpary[1]"] = array("value" => "-", "source" => $tmpary[3]);
+                       } else {
+                               $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
+                       }

                }
        }
 
                }
        }
 

+       /**
+        * Create a Snapshot on commandline.
+        * 
+        * @return void
+        * @access private
+        */
+       private function create() {
+               $cmd = "zfs snapshot " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+               $this->updateAllProperties();
+       }
+
+       /**
+        * Destroy a Snapshot on commandline.
+        *
+        * @return void
+        * @access public
+        */
+       public function destroy() {
+               $cmd = "zfs destroy " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+       }
+

        /**
         * Helper function to execute a command and throw an exception on error
         * (requires stderr redirected to stdout for proper exception message).
        /**
         * Helper function to execute a command and throw an exception on error
         * (requires stderr redirected to stdout for proper exception message).