Added methods to add/delete Snapshots to/from Datasets.

Signed-off-by: Niclas Berglind <nb@kjam.se>

diff --git a/src/Dataset.php b/src/Dataset.php
index e1611416a73d8fd00102d3f958881eeae2878118..c766f4e699ce2619a982d2df22a4bfc60e9b75b1 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -72,7 +72,7 @@ class OMVModuleZFSDataset {
                $this->exec($cmd, $out, $res);
                foreach ($out as $line) {
                        if (preg_match('/^(' . $qname . '[^\s]+)\t.*$/', $line, $res)) {
-                               $this->snapshots[] = new OMVModuleZFSSnapshot($res[1]);
+                               $this->snapshots[$res[1]] = new OMVModuleZFSSnapshot($res[1]);
                        }
                }
        }
@@ -190,7 +190,6 @@ class OMVModuleZFSDataset {
                $this->mountPoint = $this->properties["mountpoint"]["value"];
        }
 
-
        /**
         * Destroy the Dataset.
         *
@@ -264,6 +263,32 @@ class OMVModuleZFSDataset {
                $this->updateProperty("mounted");
        }
 
+       /**
+        * Creates a Snapshot and adds it to the existing list of snapshots associated
+        * with the Dataset.
+        *
+        * @param string $snap_name Name of the Snapshot to create.
+        * @param array $properties Optional array of properties to set on Snapshot
+        * @return void
+        * @access public
+        */
+       public function addSnapshot($snap_name, array $properties = null) {
+               $snap = new OMVModuleZFSSnapshot($snap_name);
+               $snap->create($properties);
+               $this->snapshots[$snap_name] = $snap;
+       }
+
+       /**
+        * Destroys a Snapshot on commandline and removes it from the Dataset.
+        *
+        * @param string $snap_name Name of the Snapshot to delete.
+        * @return void
+        * @access public
+        */
+       public function deleteSnapshot($snap_name) {
+               $this->snapshots[$snap_name]->destroy();
+               unset($this->snapshots[$snap_name]);
+       }
 
        /**
         * Helper function to execute a command and throw an exception on error

diff --git a/src/Snapshot.php b/src/Snapshot.php
index 23231fe5bf5084294fb678135eed6806e0e89853..ef90283de51c343696835a45cbab573e1c2c0ce4 100644 (file)
--- a/src/Snapshot.php
+++ b/src/Snapshot.php
@@ -124,8 +124,12 @@ class OMVModuleZFSSnapshot {
                $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]);
+                       }
                }
        }
 
@@ -143,6 +147,17 @@ class OMVModuleZFSSnapshot {
                $this->setProperties($properties);
        }
 
+       /**
+        * 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).