that's... a little better. gonna be more of a PITA in-code though.

This commit is contained in:
brent s 2019-11-06 12:52:50 -05:00
parent 5f8caf48d6
commit fbd1d4b0f3
2 changed files with 11 additions and 16 deletions

25
aif.xsd
View File

@ -490,6 +490,16 @@
<xs:element name="lv" minOccurs="1" <xs:element name="lv" minOccurs="1"
maxOccurs="unbounded"> maxOccurs="unbounded">
<xs:complexType> <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" <xs:attribute name="id" type="xs:ID"
use="required"/> use="required"/>
<xs:attribute name="name" type="aif:t_nonempty" <xs:attribute name="name" type="aif:t_nonempty"
@ -501,24 +511,10 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </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:all>
<xs:attribute name="id" type="xs:ID" use="required"/> <xs:attribute name="id" type="xs:ID" use="required"/>
<xs:attribute name="name" type="aif:t_nonempty" use="required"/> <xs:attribute name="name" type="aif:t_nonempty" use="required"/>
</xs:complexType> </xs:complexType>
<!-- <xs:unique name="uniq_vg_tags">-->
<!-- <xs:selector xpath="aif:tags"/>-->
<!-- <xs:field xpath="tag"/>-->
<!-- </xs:unique>-->
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
@ -526,7 +522,6 @@
<xs:selector xpath="aif:volumeGroup"/> <xs:selector xpath="aif:volumeGroup"/>
<xs:field xpath="@name"/> <xs:field xpath="@name"/>
</xs:unique> </xs:unique>
<!-- ??? doesn't seem to work. -->
<xs:unique name="uniq_vg_lv"> <xs:unique name="uniq_vg_lv">
<xs:selector xpath=".//aif:lv"/> <xs:selector xpath=".//aif:lv"/>
<xs:field xpath="@name"/> <xs:field xpath="@name"/>

View File

@ -64,7 +64,7 @@
<!-- Default is to add all available PVs in PhysicalVolumes... --> <!-- Default is to add all available PVs in PhysicalVolumes... -->
<lv id="lv1" name="logical1" size="80%"/> <lv id="lv1" name="logical1" size="80%"/>
<!-- But you can also explicitly designate them. --> <!-- But you can also explicitly designate them. -->
<lv id="lv2" name="logical1" size="20%"> <lv id="lv2" name="logical2" size="20%">
<pvMember source="pv1"/> <pvMember source="pv1"/>
</lv> </lv>
</logicalVolumes> </logicalVolumes>