r00t2/aif-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

D'OH

Browse Source
This commit is contained in:
brent s
2019-10-31 23:20:05 -04:00
parent 799ef58667
commit 9e5ff48926
8 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aif/disk/__init__.py
View File

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

14
aif/disk/filesystem.py
View File

@@ -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, '

7
aif/disk/luks.py
View File

@@ -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):

6
aif/disk/lvm.py
View File

@@ -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):

12
aif/disk/mdadm.py
View File

@@ -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