i *think* i'm done the gi version of disk.lvm. LVM is such a mess.

aif.xsd

@@ -357,7 +357,7 @@
                     <xs:complexType>
                         <xs:all>
                             <!-- BEGIN BLOCKDEVICES -->
-                            <xs:element name="blockDevices" minOccurs="1">
+                            <xs:element name="blockDevices" minOccurs="0" maxOccurs="1">
                                 <xs:complexType>
                                     <xs:sequence minOccurs="1" maxOccurs="unbounded">
                                         <xs:element name="disk" minOccurs="1" maxOccurs="unbounded">
@@ -670,7 +670,7 @@
                 <xs:element name="system" maxOccurs="1" minOccurs="1">
                     <xs:complexType>
                         <xs:all>
-                            <xs:element name="rootPassword" minOccurs="1" maxOccurs="1"
+                            <xs:element name="rootPassword" minOccurs="0" maxOccurs="1"
                                         type="aif:t_nixpass"/>
                             <xs:element name="locales" minOccurs="1" maxOccurs="1">
                                 <xs:complexType>
@@ -687,10 +687,10 @@
                                     </xs:sequence>
                                 </xs:complexType>
                             </xs:element>
-                            <xs:element name="users" minOccurs="1" maxOccurs="1">
+                            <xs:element name="users" minOccurs="0" maxOccurs="1">
                                 <xs:complexType>
                                     <xs:sequence>
-                                        <xs:element name="user" minOccurs="0" maxOccurs="unbounded">
+                                        <xs:element name="user" minOccurs="1" maxOccurs="unbounded">
                                             <xs:complexType>
                                                 <xs:sequence>
                                                     <xs:element name="password" minOccurs="0" maxOccurs="1"
@@ -728,7 +728,7 @@
                             <xs:element name="services" minOccurs="0" maxOccurs="1">
                                 <xs:complexType>
                                     <xs:sequence>
-                                        <xs:element name="service" minOccurs="0" maxOccurs="unbounded">
+                                        <xs:element name="service" minOccurs="1" maxOccurs="unbounded">
                                             <xs:complexType>
                                                 <xs:simpleContent>
                                                     <xs:extension base="aif:t_nonempty">

aif/disk/lvm.py

@@ -107,12 +107,13 @@ class VG(object):
         self.name = self.xml.attrib('name')
         self.lvs = []
         self.pvs = []
-        self.tags = []
+        # self.tags = []
-        for te in self.xml.findall('tags/tag'):
+        # for te in self.xml.findall('tags/tag'):
-            self.tags.append(te.text)
+        #     self.tags.append(te.text)
         _common.addBDPlugin('lvm')
         self.devpath = self.name
         self.info = None
+        self.created = False
 
     def addPV(self, pvobj):
         if not isinstance(pvobj, PV):
@@ -128,26 +129,31 @@ class VG(object):
         # FUCK. LVM. You can't *specify* a UUID.
         # u = uuid.uuid4()
         # opts.append(_BlockDev.ExtraArg.new('--uuid', str(u)))
-        for t in self.tags:
+        # for t in self.tags:
-            opts.append(_BlockDev.ExtraArg.new('--addtag', t))
+        #     opts.append(_BlockDev.ExtraArg.new('--addtag', t))
         _BlockDev.lvm.vgcreate(self.name,
                                [p.devpath for p in self.pvs],
                                0,
                                opts)
         for p in self.pvs:
             p._parseMeta()
+        self.created = True
         self.updateInfo()
         return()
 
     def createLV(self, lv_xml = None):
+        if not self.created:
+            raise RuntimeError('VG must be created before LVs can be added')
         # If lv_xml is None, we loop through our own XML.
         if lv_xml:
             lv = LV(lv_xml, self)
             lv.create()
-            self.lvs.append(lv)
+            # self.lvs.append(lv)
         else:
             for le in self.xml.findall('logicalVolumes/lv'):
-                pass
+                lv = LV(le, self)
+                lv.create()
+                # self.lvs.append(lv)
         self.updateInfo()
         return()
 
@@ -162,6 +168,8 @@ class VG(object):
         return()
 
     def updateInfo(self):
+        if not self.created:
+            return()
         _info = _BlockDev.lvm.vginfo(self.name)
         # TODO: parity with lvm_fallback.VG.updateInfo
         #       key names currently (probably) don't match and need to confirm the information's all present
@@ -182,11 +190,78 @@ class LV(object):
         self.xml = lv_xml
         self.id = self.xml.attrib('id')
         self.name = self.xml.attrib('name')
-        self.size = self.xml.attrib('size')  # Convert to bytes. Can get max from _BlockDev.lvm.vginfo(<VG>).free
+        self.size = self.xml.attrib('size')  # Convert to bytes. Can get max from _BlockDev.lvm.vginfo(<VG>).free TODO
-        self.vg = vg_obj
+        self.vg = vgobj
+        self.pvs = []
         if not isinstance(self.vg, VG):
-            raise ValueError('vg_obj must be of type aif.disk.lvm.VG')
+            raise ValueError('vgobj must be of type aif.disk.lvm.VG')
         _common.addBDPlugin('lvm')
+        self.info = None
+        self.devpath = '/dev/{0}/{1}'.format(self.vg.name, self.name)
+        self.created = False
+        self.updateInfo()
+        self._initLV()
 
-        self.devpath = None
+    def _initLV(self):
-        pass
+        self.pvs = []
+        _indexed_pvs = {i.id: i for i in self.vg.pvs}
+        for pe in self.xml.findall('pvMember'):
+            pv_id = pe.attrib('source')
+            if pv_id in _indexed_pvs.keys():
+                self.pvs.append(_indexed_pvs[pv_id])
+        if not self.pvs:  # We get all in the VG instead since none were explicitly assigned
+            self.pvs = self.vg.pvs
+        return()
+
+    def create(self):
+        if not self.pvs:
+            raise RuntimeError('Cannot create LV with no associated LVs')
+        opts = [_BlockDev.ExtraArg.new('--reportformat', 'json')]
+        # FUCK. LVM. You can't *specify* a UUID.
+        # u = uuid.uuid4()
+        # opts.append(_BlockDev.ExtraArg.new('--uuid', str(u)))
+        # for t in self.tags:
+        #     opts.append(_BlockDev.ExtraArg.new('--addtag', t))
+        _BlockDev.lvm.lvcreate(self.vg.name,
+                               self.name,
+                               self.size,
+                               None,
+                               [i.devpath for i in self.pvs],
+                               opts)
+        self.vg.lvs.append(self)
+        self.created = True
+        self.updateInfo()
+        self.vg.updateInfo()
+        return()
+
+    def start(self):
+        _BlockDev.lvm.lvactivate(self.vg.name,
+                                 self.name,
+                                 True,
+                                 None)
+        self.updateInfo()
+        return()
+
+    def stop(self):
+        _BlockDev.lvm.lvdeactivate(self.vg.name,
+                                   self.name,
+                                   None)
+        self.updateInfo()
+        return()
+
+    def updateInfo(self):
+        if not self.created:
+            return()
+        _info = _BlockDev.lvm.lvinfo(self.vg.name, self.name)
+        # TODO: parity with lvm_fallback.LV.updateInfo
+        #       key names currently (probably) don't match and need to confirm the information's all present
+        info = {}
+        for k in dir(_info):
+            if k.startswith('_'):
+                continue
+            elif k in ('copy',):
+                continue
+            v = getattr(_info, k)
+            info[k] = v
+        self.info = info
+        return()

aif/disk/mdadm.py

@@ -104,11 +104,11 @@ class Array(object):
                     self.layout = None  # TODO: log.warn?
         else:
             self.layout = None
-        self.devname = self.xml.attrib['name']
+        self.name = self.xml.attrib['name']
-        self.fulldevname = '{0}:{1}'.format(self.homehost, self.devname)
+        self.fullname = '{0}:{1}'.format(self.homehost, self.name)
         self.devpath = devpath
         if not self.devpath:
-            self.devpath = '/dev/md/{0}'.format(self.devname)
+            self.devpath = '/dev/md/{0}'.format(self.name)
         self.updateStatus()
         self.homehost = homehost
         self.members = []
@@ -128,11 +128,11 @@ class Array(object):
         opts = [_BlockDev.ExtraArg.new('--homehost',
                                        self.homehost),
                 _BlockDev.ExtraArg.new('--name',
-                                       self.devname)]
+                                       self.name)]
         if self.layout:
             opts.append(_BlockDev.ExtraArg.new('--layout',
                                                self.layout))
-        _BlockDev.md.create(self.devname,
+        _BlockDev.md.create(self.name,
                             str(self.level),
                             [i.devpath for i in self.members],
                             0,
@@ -154,7 +154,7 @@ class Array(object):
         if scan:
             target = None
         else:
-            target = self.devname
+            target = self.name
         _BlockDev.md.activate(target,
                               [i.devpath for i in self.members],  # Ignored if scan mode enabled
                               None,
@@ -164,12 +164,12 @@ class Array(object):
         return()
 
     def stop(self):
-        _BlockDev.md.deactivate(self.devname)
+        _BlockDev.md.deactivate(self.name)
         self.state = 'disassembled'
         return()
 
     def updateStatus(self):
-        _status = _BlockDev.md.detail(self.devname)
+        _status = _BlockDev.md.detail(self.name)
         # TODO: parity with mdadm_fallback.Array.updateStatus
         #       key names currently (probably) don't match and need to confirm the information's all present
         info = {}

aif/disk/mdadm_fallback.py

@@ -158,10 +158,10 @@ class Array(object):
                     self.layout = None  # TODO: log.warn?
         else:
             self.layout = None
-        self.devname = self.xml.attrib['name']
+        self.name = self.xml.attrib['name']
         self.devpath = devpath
         if not self.devpath:
-            self.devpath = '/dev/md/{0}'.format(self.devname)
+            self.devpath = '/dev/md/{0}'.format(self.name)
         self.updateStatus()
         self.homehost = homehost
         self.members = []
@@ -179,7 +179,7 @@ class Array(object):
         if not self.members:
             raise RuntimeError('Cannot create an array with no members')
         cmd = ['mdadm', '--create',
-               '--name={0}'.format(self.devname),
+               '--name={0}'.format(self.name),
                '--bitmap=internal',
                '--level={0}'.format(self.level),
                '--metadata={0}'.format(self.metadata),
@@ -224,7 +224,7 @@ class Array(object):
     def updateStatus(self):
         _info = mdstat.parse()
         for k, v in _info['devices'].items():
-            if k != self.devname:
+            if k != self.name:
                 del(_info['devices'][k])
         self.info = copy.deepcopy(_info)
         return()

examples/aif.xml

@@ -31,15 +31,15 @@
             </disk>
         </blockDevices>
         <!-- "Special" devices are processed *in the order they are specified*. This is important if you wish to
-             e.g. layer LUKS on top of LVM - you would specify <lvm> before <luks> and reference the
+             e.g. layer LVM on top of LUKS - you would specify <lvm> before <luks> and reference the
-             <luksDev id="SOMETHING" ... > as <lvmLogical source="SOMETHING" ... />.
+             <luksDev id="SOMETHING" ... > as <pv source="SOMETHING" ... />.
              Of course, a limitation of this is you cannot e.g. first assemble a LUKS volume, then an LVM
-             group, and then another LUKS volume - so plan accordingly and/or perform this in a <post> script. -->
+             group, and then another LUKS volume - so plan accordingly and/or perform that in
+             a <post> script instead. -->
         <luks>
             <luksDev id="luks_secrets" name="secrets" source="secrets1">
                 <!-- You can assign multiple secrets (or "keys") to a LUKS volume. -->
-                <secrets
+                <secrets>
-                >
                     <!-- A simple passphrase. -->
                     <passphrase>secrets1</passphrase>
                 </secrets>
@@ -63,7 +63,7 @@
                 <logicalVolumes>
                     <!-- Default is to add all available PVs in PhysicalVolumes... -->
                     <lv id="lv1" name="logical1" size="80%"/>
-                    <!-- But you can also explicitly designate them. -->
+                    <!-- But you can also explicitly designate them. They have to still be in the same volumeGroup though. -->
                     <lv id="lv2" name="logical2" size="20%">
                         <pvMember source="pv1"/>
                     </lv>
@@ -88,7 +88,7 @@
             <fs id="luks" source="luks_secrets" type="ext4">
                 <opt name="-L">seekrit</opt>
             </fs>
-            <fs  id="swap" source="swap" type="swap"/>
+            <fs id="swap" source="swap" type="swap"/>
             <fs id="vg1-lv1" source="lv1" type="ext4"/>
             <fs id="mdraid" source="mdadm1" type="ext4"/>
         </fileSystems>

examples/most_minimal.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<aif xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xmlns="http://aif-ng.io/"
+     xsi:schemaLocation="http://aif-ng.io/ http://aif-ng.io/aif.xsd"
+     version="v2_rewrite">
+    <storage>
+        <blockDevices>
+            <disk id="sda" device="auto" diskFormat="gpt">
+                <part id="boot" name="BOOT" start="0%" stop="10%" fsType="fat32">
+                    <partitionFlag>esp</partitionFlag>
+                </part>
+                <part id="root" name="root" start="10%" stop="100%" fsType="ext4">
+                    <partitionFlag>root</partitionFlag>
+                </part>
+            </disk>
+        </blockDevices>
+        <fileSystems>
+            <fs id="esp" source="boot" type="vfat">
+                <opt name="-F">32</opt>
+            </fs>
+            <fs id="rootfs" type="ext4" source="root"/>
+        </fileSystems>
+        <mountPoints>
+            <mount source="rootfs" target="/mnt/aif/"/>
+            <mount source="esp" target="/mnt/aif/boot"/>
+        </mountPoints>
+    </storage>
+    <network hostname="aiftest.square-r00t.net">
+        <iface device="auto">
+            <addresses>
+                <ipv4>
+                    <address>dhcp</address>
+                </ipv4>
+                <ipv6>
+                    <address>slaac</address>
+                </ipv6>
+            </addresses>
+            <resolvers>
+                <resolver>4.2.2.1</resolver>
+                <resolver>4.2.2.2</resolver>
+                <resolver>4.2.2.3</resolver>
+            </resolvers>
+        </iface>
+    </network>
+    <system timezone="UTC" chrootPath="/mnt/aif" reboot="1">
+        <locales>
+            <locale name="LANG">en_US.UTF-8</locale>
+        </locales>
+    </system>
+    <pacman>
+        <repos>
+            <repo name="core" enabled="true" sigLevel="default" mirror="file:///etc/pacman.d/mirrorlist"/>
+            <repo name="extra" enabled="true" sigLevel="default" mirror="file:///etc/pacman.d/mirrorlist"/>
+            <repo name="community" enabled="true" sigLevel="default" mirror="file:///etc/pacman.d/mirrorlist"/>
+            <repo name="multilib" enabled="true" sigLevel="default" mirror="file:///etc/pacman.d/mirrorlist"/>
+        </repos>
+        <mirrorList>
+            <mirror>http://arch.mirror.square-r00t.net/$repo/os/$arch</mirror>
+        </mirrorList>
+    </pacman>
+    <bootloader type="grub" target="/boot" efi="true"/>
+</aif>
+