fix import cycle

drivers/LVMSR.py

@@ -39,8 +39,9 @@
 from journaler import Journaler
 from refcounter import RefCounter
 from ipc import IPCFlag
+from constants import NS_PREFIX_LVM, VG_LOCATION, VG_PREFIX
 from cowutil import getCowUtil
-from lvmcowutil import LV_PREFIX, NS_PREFIX_LVM, VG_LOCATION, VG_PREFIX, LvmCowUtil
+from lvmcowutil import LV_PREFIX, LvmCowUtil
 from lvmanager import LVActivator
 from vditype import VdiType
 import XenAPI # pylint: disable=import-error

drivers/blktap2.py

@@ -41,9 +41,9 @@
 import xs_errors
 import XenAPI # pylint: disable=import-error
 import scsiutil
+from constants import NS_PREFIX_LVM
 from syslog import openlog, syslog
 from stat import *  # S_ISBLK(), ...
-from lvmcowutil import NS_PREFIX_LVM
 from vditype import VdiType
 import nfs
 

drivers/cleanup.py

@@ -50,8 +50,9 @@
 from functools import reduce
 from time import monotonic as _time
 
+from constants import NS_PREFIX_LVM, VG_LOCATION, VG_PREFIX
 from cowutil import CowUtil, getCowUtil
-from lvmcowutil import LV_PREFIX, NS_PREFIX_LVM, VG_LOCATION, VG_PREFIX, LvmCowUtil
+from lvmcowutil import LV_PREFIX, LvmCowUtil
 from vditype import VdiType, VdiTypeExtension, VDI_COW_TYPES, VDI_TYPE_TO_EXTENSION
 
 try:

drivers/constants.py

@@ -1,4 +1,13 @@
+from sm_typing import Final
+
 EXT_PREFIX = 'XSLocalEXT-'
 CBT_BLOCK_SIZE = (64 * 1024)
 CBTLOG_TAG = "cbtlog"
 CBT_UTIL = "/usr/sbin/cbt-util"
+
+VG_LOCATION: Final = "/dev"
+VG_PREFIX: Final = "VG_XenStorage-"
+
+# Ref counting for VDI's: we need a ref count for LV activation/deactivation
+# on the master.
+NS_PREFIX_LVM: Final = "lvm-"

drivers/lvmanager.py

@@ -19,7 +19,7 @@
 import time
 import util
 
-from lvmcowutil import NS_PREFIX_LVM
+from constants import NS_PREFIX_LVM
 
 class LVManagerException(util.SMException):
     pass

drivers/lvmcache.py

@@ -19,8 +19,8 @@
 import lvutil
 import os
 import util
+from constants import NS_PREFIX_LVM
 from lock import Lock
-from lvmcowutil import NS_PREFIX_LVM
 from refcounter import RefCounter
 
 

drivers/lvmcowutil.py

@@ -29,6 +29,7 @@
 import util
 import XenAPI
 
+from constants import NS_PREFIX_LVM, VG_LOCATION, VG_PREFIX
 from cowutil import CowImageInfo, CowUtil, getCowUtil
 from journaler import Journaler
 from lvmcache import LVInfo, LVMCache
@@ -38,13 +39,6 @@
 
 # ------------------------------------------------------------------------------
 
-VG_LOCATION: Final = "/dev"
-VG_PREFIX: Final = "VG_XenStorage-"
-
-# Ref counting for VDI's: we need a ref count for LV activation/deactivation
-# on the master.
-NS_PREFIX_LVM: Final = "lvm-"
-
 LOCK_RETRY_ATTEMPTS: Final = 20
 
 LV_PREFIX: Final = {

drivers/lvutil.py

@@ -26,8 +26,7 @@
 import util
 import xs_errors
 import xml.dom.minidom
-from lvmcowutil import VG_LOCATION, VG_PREFIX
-from constants import EXT_PREFIX
+from constants import EXT_PREFIX, VG_LOCATION, VG_PREFIX
 import lvmcache
 import srmetadata
 

drivers/tapdisk-pause

@@ -27,8 +27,9 @@ import xs_errors
 import XenAPI
 import lvmcache
 
+from constants import NS_PREFIX_LVM, VG_PREFIX
 from cowutil import getCowUtil
-from lvmcowutil import LV_PREFIX, LV_PREFIX_TO_VDI_TYPE, NS_PREFIX_LVM, VG_PREFIX
+from lvmcowutil import LV_PREFIX, LV_PREFIX_TO_VDI_TYPE
 from vditype import VdiType
 
 try:

drivers/trim_util.py

@@ -23,7 +23,7 @@
 import lock
 import lvutil
 
-from lvmcowutil import VG_LOCATION, VG_PREFIX
+from constants import VG_LOCATION, VG_PREFIX
 
 TRIM_LV_TAG = "_trim_lv"
 TRIM_CAP = "SR_TRIM"

drivers/verifyVHDsOnSR.py

@@ -28,8 +28,9 @@
 
 import VDI
 
+from constants import NS_PREFIX_LVM, VG_LOCATION, VG_PREFIX
 from lock import Lock
-from lvmcowutil import NS_PREFIX_LVM, LV_PREFIX, VG_LOCATION, VG_PREFIX
+from lvmcowutil import LV_PREFIX
 from refcounter import RefCounter
 from vditype import VdiType
 

tests/test_on_slave.py

@@ -10,6 +10,8 @@
 import util
 
 import on_slave
+
+from constants import NS_PREFIX_LVM
 from vditype import VdiType
 
 
@@ -184,7 +186,7 @@ def test_multi_vdi_inactive(self, mock_refcount):
         sr_uuid = str(uuid.uuid4())
         vdi_uuid = str(uuid.uuid4())
         vdi_fileName = "test-vdi.vhd"
-        lock_ref = lvmcowutil.NS_PREFIX_LVM + sr_uuid
+        lock_ref = NS_PREFIX_LVM + sr_uuid
 
         args = {"vgName": vgName,
                 "action1": "deactivateNoRefcount",
@@ -233,7 +235,7 @@ def test_multi_update_slave_rename(self, mock_refcount):
         origParentUuid = str(uuid.uuid4())
         vdi_uuid = str(uuid.uuid4())
 
-        lock_ref = lvmcowutil.NS_PREFIX_LVM + vdi_uuid
+        lock_ref = NS_PREFIX_LVM + vdi_uuid
 
         args = {"vgName": vgName,
                 "action1": "deactivateNoRefcount",
@@ -257,7 +259,7 @@ def test_multi_refresh_on_slaves(self):
         vdi_uuid = str(uuid.uuid4())
         lv_name = 'test_lv'
 
-        lock_ref = lvmcowutil.NS_PREFIX_LVM + sr_uuid
+        lock_ref = NS_PREFIX_LVM + sr_uuid
 
         args = {"vgName": vgName,
                 "action1": "activate",
@@ -288,7 +290,7 @@ def test_multi_rename_deactivate_error(self, mock_refcount):
         origParentUuid = str(uuid.uuid4())
         vdi_uuid = str(uuid.uuid4())
 
-        lock_ref = lvmcowutil.NS_PREFIX_LVM + vdi_uuid
+        lock_ref = NS_PREFIX_LVM + vdi_uuid
 
         self.mock_lvmcache.deactivateNoRefcount.side_effect = util.CommandException(errno.EIO, 'activate')
 
@@ -317,7 +319,7 @@ def test_multi_rename_refresh_error(self, mock_refcount):
         origParentUuid = str(uuid.uuid4())
         vdi_uuid = str(uuid.uuid4())
 
-        lock_ref = lvmcowutil.NS_PREFIX_LVM + vdi_uuid
+        lock_ref = NS_PREFIX_LVM + vdi_uuid
 
         self.mock_lvmcache.activateNoRefcount.side_effect = util.CommandException(errno.EIO, 'activate')
 
@@ -343,7 +345,7 @@ def test_multi_refresh_on_slaves_activate_error(self):
         vdi_uuid = str(uuid.uuid4())
         lv_name = 'test_lv'
 
-        lock_ref = lvmcowutil.NS_PREFIX_LVM + sr_uuid
+        lock_ref = NS_PREFIX_LVM + sr_uuid
 
         self.mock_lvmcache.activate.side_effect = util.CommandException(errno.EIO, 'activate')
 
@@ -373,7 +375,7 @@ def test_multi_refresh_on_slaves_refresh_error(self):
         vdi_uuid = str(uuid.uuid4())
         lv_name = 'test_lv'
 
-        lock_ref = lvmcowutil.NS_PREFIX_LVM + sr_uuid
+        lock_ref = NS_PREFIX_LVM + sr_uuid
 
         self.mock_lvmcache.activateNoRefcount.side_effect = util.CommandException(errno.EIO, 'activate')
 
@@ -404,7 +406,7 @@ def test_multi_refresh_on_slaves_deactivate_error(self):
         vdi_uuid = str(uuid.uuid4())
         lv_name = 'test_lv'
 
-        lock_ref = lvmcowutil.NS_PREFIX_LVM + sr_uuid
+        lock_ref = NS_PREFIX_LVM + sr_uuid
 
         self.mock_lvmcache.deactivate.side_effect = util.CommandException(errno.EIO, 'activate')