Initial implementation of GUI for adding ZFS pools plus minor bugfixes.

[omvzfs.git] / src / Utils.php

diff --git a/src/Utils.php b/src/Utils.php
index bfc5f8a53334402494cbaa09f5834ac742176d7c..527d0f34890fea6258e446c289dd44e682629148 100644 (file)
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -8,6 +8,67 @@ require_once("Dataset.php");
  */
 class OMVModuleZFSUtil {
 
  */
 class OMVModuleZFSUtil {
 

+       /**
+        * Get UUID of ZFS pool by name
+        *
+        * @return string UUID of the pool
+        */
+       public static function getUUIDbyName($name) {
+               preg_match('/^([A-Za-z0-9]+)\/?.*$/', $name, $result);
+               $name = $result[1];
+               unset($result);
+               $cmd = "zpool get guid " . $name . " 2>&1";
+               OMVModuleZFSUtil::exec($cmd, $out, $res);
+               if (isset($out)) {
+                       $headers = preg_split('/[\s]+/', $out[0]);
+                       for ($i=0; $i<count($headers); $i++) {
+                               if (strcmp($headers[$i], "VALUE") === 0) {
+                                       $valuecol=$i;
+                                       break;
+                               }
+                       }
+                       $line = preg_split('/[\s]+/', $out[1]);
+                       return $line[$valuecol];
+               }
+               return null;
+       }
+
+       /**
+        * Add any missing ZFS pool to the OMV backend
+        *
+        */
+       public static function addMissingOMVMntEnt() {
+               global $xmlConfig;
+               $msg = "";
+               $cmd = "zpool list -H -o name";
+               OMVModuleZFSUtil::exec($cmd, $out, $res);
+               foreach($out as $name) {
+                       $pooluuid = OMVModuleZFSUtil::getUUIDbyName($name);
+                       if (isset($pooluuid)) {
+                               $xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
+                               $object = $xmlConfig->get($xpath);
+                               if(is_null($object)) {
+                                       $uuid = OMVUtil::uuid();
+                                       $ds = new OMVModuleZFSDataset($name);
+                                       $dir = $ds->getMountPoint();
+                                       $object = array(
+                                               "uuid" => $uuid,
+                                               "fsname" => $pooluuid,
+                                               "dir" => $dir,
+                                               "type" => "zfs",
+                                               "opts" => "rw,relatime,xattr",
+                                               "freq" => "0",
+                                               "passno" => "2"
+                                       );
+                                       $xmlConfig->set("//system/fstab",array("mntent" => $object));
+                                       $dispatcher = &OMVNotifyDispatcher::getInstance();
+                                       $dispatcher->notify(OMV_NOTIFY_CREATE,"org.openmediavault.system.fstab.mntent", $object);
+                               }
+                       }
+               }
+               return null;
+       }
+

        /**
         * Get an array with all ZFS objects
         *
        /**
         * Get an array with all ZFS objects
         *


@@ -17,99 +78,86 @@ class OMVModuleZFSUtil {
                $prefix = "root/pool-";
                $objects = array();
                $cmd = "zfs list -H -t all -o name,type 2>&1";
                $prefix = "root/pool-";
                $objects = array();
                $cmd = "zfs list -H -t all -o name,type 2>&1";

+               $expanded = true;

                OMVModuleZFSUtil::exec($cmd,$out,$res);
                foreach ($out as $line) {
                        $parts = preg_split('/\t/',$line);
                OMVModuleZFSUtil::exec($cmd,$out,$res);
                foreach ($out as $line) {
                        $parts = preg_split('/\t/',$line);

-                       if ((strpos($parts[0],'/') === false) && (strpos($parts[0],'@') === false)) {
-                               //This is a Pool, thus create both the Pool entry and a Filesystem entry corresponding to the Pool.
-                               $tmp = array('id'=>$prefix . $parts[0],
-                                       'parentid'=>'root',
-                                       'name'=>$parts[0],
-                                       'type'=>'Pool',
-                                       'icon'=>'images/raid.png',
-                                       'expanded'=>true,
-                                       'path'=>$parts[0]);
-                               array_push($objects,$tmp);
-                               $tmp = array('id'=>$prefix . $parts[0] . '/' . $parts[0],
-                                       'parentid'=>$prefix . $parts[0],
-                                       'name'=>$parts[0],
-                                       'type'=>'Filesystem',
-                                       'icon'=>'images/filesystem.png',
-                                       'path'=>$parts[0],
-                                       'expanded'=>true);
-                               array_push($objects,$tmp);
-                       } elseif (strpos($parts[0],'/') === false) {
-                               //This is a Snapshot of the Pool Filesystem.
-                               $pname = preg_split('/\@/',$parts[0]);
-                               $tmp = array('id'=>$prefix . $pname[0] . '/' . $parts[0],
-                                       'parentid'=>$prefix . $pname[0]. '/' . $pname[0],
-                                       'name'=>$pname[1],
-                                       'type'=>'Snapshot',
-                                       'icon'=>'images/zfs_snap.png',
-                                       'path'=>$parts[0],
-                                       'expanded'=>true);
-                               array_push($objects,$tmp);
-                       } elseif (preg_match('/(.*)\@(.*)$/', $parts[0], $result)) {
-                               //This is a Snapshot of any other Filesystem than the Pool.
-                               $pname = preg_split('/\//',$parts[0]);
-                               $id = $prefix . $pname[0] . "/" . $result[0];
-                               $parentid = $prefix . $pname[0] . "/" . $result[1];
-                               $name = $result[2];
-                               $type = "Snapshot";
-                               $icon = "images/zfs_snap.png";
-                               $tmp = array('id'=>$id,
-                                       'parentid'=>$parentid,
-                                       'name'=>$name,
-                                       'type'=>$type,
-                                       'icon'=>$icon,
-                                       'path'=>$parts[0],
-                                       'expanded'=>true);
-                               array_push($objects,$tmp);
-                       } elseif (preg_match('/(.*)\/(.*)$/', $parts[0], $result)) {
-                               //This is a Filesystem or a Volume
-                               $pname = preg_split('/\//',$parts[0]);
-                               $id = $prefix . $pname[0] . "/" . $result[0];
-                               $parentid = $prefix . $pname[0] . "/" . $result[1];
-                               $name = $result[2];
-                               $type = ucfirst($parts[1]);
-                               if (strcmp($type, "Filesystem") == 0) {
-                                       $icon = "images/filesystem.png";
-                                       $ds =  new OMVModuleZFSDataset($parts[0]);
+                       $path = $parts[0];
+                       $type = $parts[1];
+                       $subdirs = preg_split('/\//',$path);
+                       $root = $subdirs[0];
+                       $tmp = array();
+
+                       switch ($type) {
+                       case "filesystem":
+                               if (strpos($path,'/') === false) {
+                                       //This is a Pool, thus create both the Pool entry and a Filesystem entry corresponding to the Pool.
+                                       $tmp = array('id'=>$prefix . $path,
+                                               'parentid'=>'root',
+                                               'name'=>$path,
+                                               'type'=>'Pool',
+                                               'icon'=>'images/raid.png',
+                                               'expanded'=>$expanded,
+                                               'path'=>$path);
+                                       array_push($objects,$tmp);
+                                       $tmp = array('id'=>$prefix . $path . '/' . $path,
+                                               'parentid'=>$prefix . $path,
+                                               'name'=>$path,
+                                               'type'=>'Filesystem',
+                                               'icon'=>'images/filesystem.png',
+                                               'path'=>$path,
+                                               'expanded'=>$expanded);
+                                       array_push($objects,$tmp);
+                               } else {
+                                       //This is a Filesystem other than the Pool
+                                       preg_match('/(.*)\/(.*)$/', $path, $result);
+                                       $tmp = array('id'=>$prefix . $root . "/" . $path,
+                                               'parentid'=>$prefix . $root . "/" . $result[1],
+                                               'name'=>$result[2],
+                                               'icon'=>"images/filesystem.png",
+                                               'path'=>$path,
+                                               'expanded'=>$expanded);
+                                       $ds =  new OMVModuleZFSDataset($path);

                                        if ($ds->isClone()) {
                                                //This is a cloned Filesystem
                                        if ($ds->isClone()) {
                                                //This is a cloned Filesystem

-                                               $tmp = array('id'=>$id,
-                                                       'parentid'=>$parentid,
-                                                       'name'=>$name,
-                                                       'type'=>'Clone',
-                                                       'icon'=>$icon,
-                                                       'path'=>$parts[0],
-                                                       'expanded'=>true,
-                                                       'origin' => $ds->getOrigin());
-                                               array_push($objects,$tmp);
+                                               $tmp['type'] = "Clone";
+                                               $tmp['origin'] = $ds->getOrigin();

                                        } else {
                                                //This is a standard Filesystem.
                                        } else {
                                                //This is a standard Filesystem.

-                                               $tmp = array('id'=>$id,
-                                                       'parentid'=>$parentid,
-                                                       'name'=>$name,
-                                                       'type'=>$type,
-                                                       'icon'=>$icon,
-                                                       'path'=>$parts[0],
-                                                       'expanded'=>true,
-                                                       'origin' => $ds->getOrigin());
-                                               array_push($objects,$tmp);
+                                               $tmp['type']= ucfirst($type);

                                        }
                                        }

-                               } else {
-                                       //This is a Volume.
-                                       $icon = "images/zfs_disk.png";
-                                       $tmp = array('id'=>$id,
-                                               'parentid'=>$parentid,
-                                               'name'=>$name,
-                                               'type'=>$type,
-                                               'icon'=>$icon,
-                                               'path'=>$parts[0],
-                                               'expanded'=>true);

                                        array_push($objects,$tmp);
                                }
                                        array_push($objects,$tmp);
                                }

+                               break;
+
+                       case "volume":
+                               preg_match('/(.*)\/(.*)$/', $path, $result);
+                               $tmp = array('id'=>$prefix . $root . "/" . $path,
+                                       'parentid'=>$prefix . $root . "/" . $result[1],
+                                       'name'=>$result[2],
+                                       'type'=>ucfirst($type),
+                                       'icon'=>"images/zfs_disk.png",
+                                       'path'=>$path,
+                                       'expanded'=>$expanded);
+                               array_push($objects,$tmp);
+                               break;
+
+                       case "snapshot":
+                               preg_match('/(.*)\@(.*)$/', $path, $result);
+                               $subdirs = preg_split('/\//',$result[1]);
+                               $root = $subdirs[0];
+                               $tmp = array('id'=>$prefix . $root . "/" . $path,
+                                       'parentid'=>$prefix . $root . "/" . $result[1],
+                                       'name'=>$result[2],
+                                       'type'=>ucfirst($type),
+                                       'icon'=>'images/zfs_snap.png',
+                                       'path'=>$path,
+                                       'expanded'=>$expanded);
+                               array_push($objects,$tmp);
+                               break;
+
+                       default:
+                               break;

                        }
                }
                return $objects;
                        }
                }
                return $objects;