[capabilities] Solaris can detect disk.scsireserv.sg_persist

opensvc · Nov 17, 2021 · fd2e85d · fd2e85d
1 parent fe604ed
commit fd2e85d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/opensvc/drivers/resource/disk/scsireserv/linux.py b/opensvc/drivers/resource/disk/scsireserv/linux.py
@@ -5,6 +5,7 @@
 
 DRIVER_GROUP = "disk"
 DRIVER_BASENAME = "scsireserv"
+assert driver_capabilities  # ensure driver scan its capabilities
 
 
 class DiskScsireserv(DiskScsireservSg):

diff --git a/opensvc/drivers/resource/disk/scsireserv/sg.py b/opensvc/drivers/resource/disk/scsireserv/sg.py
@@ -4,13 +4,12 @@
 import core.exceptions as ex
 from core.capabilities import capabilities
 from env import Env
-from utilities.proc import justcall
+from utilities.proc import justcall, which
 from . import BaseDiskScsireserv
 
 
 # noinspection PyUnusedLocal
 def driver_capabilities(node=None):
-    from utilities.proc import which
     data = []
     if which("sg_persist"):
         data.append("disk.scsireserv")

diff --git a/opensvc/drivers/resource/disk/scsireserv/sunos.py b/opensvc/drivers/resource/disk/scsireserv/sunos.py
@@ -1,7 +1,8 @@
-from .sg import DiskScsireservSg
+from .sg import DiskScsireservSg, driver_capabilities
 
 DRIVER_GROUP = "disk"
 DRIVER_BASENAME = "scsireserv"
+assert driver_capabilities  # ensure driver can scan its capabilities
 
 
 class DiskScsireserv(DiskScsireservSg):