D'OH

aif/config.py

@@ -146,7 +146,7 @@ class LocalFile(Config):
     def __init__(self, path, xsd_path = None, *args, **kwargs):
         super().__init__(xsd_path = xsd_path, *args, **kwargs)
         self.type = 'local'
-        self.source = _patterns['local'].search(path).group('path')
+        self.source = path
 
     def fetch(self):
         self.source = os.path.realpath(self.source)

aif/disk/__init__.py

@@ -2,4 +2,4 @@ from . import block
 from . import filesystem
 from . import luks
 from . import lvm
-from . import mdadm
+from . import mdadm

aif/disk/filesystem.py

@@ -4,10 +4,10 @@ import subprocess
 ##
 import psutil
 ##
-from aif.disk.block import Partition
-from aif.disk.luks import LUKS
-from aif.disk.lvm import LV as LVMVolume
-from aif.disk.mdadm import Array as MDArray
+import aif.disk.block
+import aif.disk.luks
+import aif.disk.lvm
+import aif.disk.mdadm
 
 # I wish there was a better way of doing this.
 # https://unix.stackexchange.com/a/98680
@@ -44,7 +44,11 @@ for i in os.listdir(_mod_dir):
 class FS(object):
     def __init__(self, fs_xml, sourceobj):
         self.xml = fs_xml
-        if not isinstance(sourceobj, (Partition, LUKS, LVMVolume, MDArray)):
+        if not isinstance(sourceobj, (aif.disk.block.Disk,
+                                      aif.disk.block.Partition,
+                                      aif.disk.luks.LUKS,
+                                      aif.disk.lvm.LV,
+                                      aif.disk.mdadm.Array)):
             raise ValueError(('sourceobj must be of type '
                               'aif.disk.block.Partition, '
                               'aif.disk.luks.LUKS, '

aif/disk/luks.py

@@ -1,6 +1,7 @@
-from aif.disk.block import Disk, Partition
-from aif.disk.lvm import LV
-from aif.disk.mdadm import Array
+import aif.disk.block
+import aif.disk.lvm
+import aif.disk.mdadm
+
 
 class LUKS(object):
     def __init__(self, partobj):

aif/disk/lvm.py

@@ -7,9 +7,9 @@ except ImportError:
     import subprocess
     has_mod = False
 ##
-from aif.disk.block import Disk, Partition
-from aif.disk.luks import LUKS
-from aif.disk.mdadm import Array
+import aif.disk.block
+import aif.disk.luks
+import aif.disk.mdadm
 
 
 class PV(object):

aif/disk/mdadm.py

@@ -7,9 +7,9 @@ import uuid
 ##
 import mdstat
 ##
-from aif.disk.block import Disk, Partition
-from aif.disk.luks import LUKS
-from aif.disk.lvm import LV
+import aif.disk.block
+import aif.disk.luks
+import aif.disk.lvm
 
 
 SUPPORTED_LEVELS = (0, 1, 4, 5, 6, 10)
@@ -50,7 +50,11 @@ class Member(object):
     def __init__(self, member_xml, partobj):
         self.xml = member_xml
         self.device = partobj
-        if not isinstance(self.device, (Partition, Disk, Array)):
+        if not isinstance(self.device, (aif.disk.block.Partition,
+                                        aif.disk.block.Disk,
+                                        aif.disk.mdadm.Array,
+                                        aif.disk.lvm.LV,
+                                        aif.disk.luks.LUKS)):
             raise ValueError(('partobj must be of type aif.disk.block.Partition, '
                               'aif.disk.block.Disk, or aif.disk.mdadm.Array'))
         self.devpath = self.device.devpath