From fbd1d4b0f35ab5e97669b3b651ad6cfbf1f1f70e Mon Sep 17 00:00:00 2001
From: brent s <r00t@square-r00t.net>
Date: Wed, 6 Nov 2019 12:52:50 -0500
Subject: [PATCH] that's... a little better. gonna be more of a PITA in-code
 though.

---
 aif.xsd          | 25 ++++++++++---------------
 examples/aif.xml |  2 +-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/aif.xsd b/aif.xsd
index 83b9df3..3e31758 100644
--- a/aif.xsd
+++ b/aif.xsd
@@ -490,6 +490,16 @@
                                                                 <xs:element name="lv" minOccurs="1"
                                                                             maxOccurs="unbounded">
                                                                     <xs:complexType>
+                                                                        <xs:sequence minOccurs="0"
+                                                                                     maxOccurs="unbounded">
+                                                                            <xs:element name="pvMember" minOccurs="1" maxOccurs="unbounded">
+                                                                                <xs:complexType>
+                                                                                    <xs:attribute name="source"
+                                                                                                  use="required"
+                                                                                                  type="xs:IDREF"/>
+                                                                                </xs:complexType>
+                                                                            </xs:element>
+                                                                        </xs:sequence>
                                                                         <xs:attribute name="id" type="xs:ID"
                                                                                       use="required"/>
                                                                         <xs:attribute name="name" type="aif:t_nonempty"
@@ -501,24 +511,10 @@
                                                             </xs:sequence>
                                                         </xs:complexType>
                                                     </xs:element>
-                                                    <!-- PV creation doesn't really support tags, it seems,
-                                                         in libblockdev. So we'll simplify and just skip them. -->
-<!--                                                    <xs:element name="tags" minOccurs="0" maxOccurs="1">-->
-<!--                                                        <xs:complexType>-->
-<!--                                                            <xs:sequence>-->
-<!--                                                                <xs:element name="tag" type="aif:t_nonempty"-->
-<!--                                                                            minOccurs="1" maxOccurs="unbounded"/>-->
-<!--                                                            </xs:sequence>-->
-<!--                                                        </xs:complexType>-->
-<!--                                                    </xs:element>-->
                                                 </xs:all>
                                                 <xs:attribute name="id" type="xs:ID" use="required"/>
                                                 <xs:attribute name="name" type="aif:t_nonempty" use="required"/>
                                             </xs:complexType>
-<!--                                            <xs:unique name="uniq_vg_tags">-->
-<!--                                                <xs:selector xpath="aif:tags"/>-->
-<!--                                                <xs:field xpath="tag"/>-->
-<!--                                            </xs:unique>-->
                                         </xs:element>
                                     </xs:sequence>
                                 </xs:complexType>
@@ -526,7 +522,6 @@
                                     <xs:selector xpath="aif:volumeGroup"/>
                                     <xs:field xpath="@name"/>
                                 </xs:unique>
-                                <!-- ??? doesn't seem to work. -->
                                 <xs:unique name="uniq_vg_lv">
                                     <xs:selector xpath=".//aif:lv"/>
                                     <xs:field xpath="@name"/>
diff --git a/examples/aif.xml b/examples/aif.xml
index 24c07bf..fe660d6 100644
--- a/examples/aif.xml
+++ b/examples/aif.xml
@@ -64,7 +64,7 @@
                     <!-- Default is to add all available PVs in PhysicalVolumes... -->
                     <lv id="lv1" name="logical1" size="80%"/>
                     <!-- But you can also explicitly designate them. -->
-                    <lv id="lv2" name="logical1" size="20%">
+                    <lv id="lv2" name="logical2" size="20%">
                         <pvMember source="pv1"/>
                     </lv>
                 </logicalVolumes>