External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

schema: fix idmap validation

Browse Source 
When idmap was added to LXC, we forgot to cover it in the testsuite.
The schema was missing an <element> layer, and as a result,
virt-xml-validate was failing on valid dumpxml output.

Reported by Eduard - Gabriel Munteanu on IRC.

* docs/schemas/domaincommon.rng (idmap): Include <idmap> element,
and support interleaves.
* tests/lxcxml2xmldata/lxc-idmap.xml: New file.
* tests/lxcxml2xmltest.c (mymain): Test it.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-01-10 10:40:01 -07:00
parent 558ffad55e
commit dd0dda2e4a
3 changed files with 71 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
docs/schemas/domaincommon.rng
View File

@ -506,32 +506,38 @@
</interleave> </interleave>
</define> </define>
<define name="idmap"> <define name="idmap">
<zeroOrMore> <element name="idmap">
<element name="uid"> <interleave>
<attribute name="start"> <zeroOrMore>
<ref name="unsignedInt"/> <element name="uid">
</attribute> <attribute name="start">
<attribute name="target"> <ref name="unsignedInt"/>
<ref name="unsignedInt"/> </attribute>
</attribute> <attribute name="target">
<attribute name="count"> <ref name="unsignedInt"/>
<ref name="unsignedInt"/> </attribute>
</attribute> <attribute name="count">
</element> <ref name="unsignedInt"/>
</zeroOrMore> </attribute>
<zeroOrMore> <empty/>
<element name="gid"> </element>
<attribute name="start"> </zeroOrMore>
<ref name="unsignedInt"/> <zeroOrMore>
</attribute> <element name="gid">
<attribute name="target"> <attribute name="start">
<ref name="unsignedInt"/> <ref name="unsignedInt"/>
</attribute> </attribute>
<attribute name="count"> <attribute name="target">
<ref name="unsignedInt"/> <ref name="unsignedInt"/>
</attribute> </attribute>
</element> <attribute name="count">
</zeroOrMore> <ref name="unsignedInt"/>
</attribute>
<empty/>
</element>
</zeroOrMore>
</interleave>
</element>
</define> </define>
<!-- <!--
Resources usage defines the amount of memory (maximum and possibly Resources usage defines the amount of memory (maximum and possibly

38
tests/lxcxml2xmldata/lxc-idmap.xml Normal file
View File

@ -0,0 +1,38 @@
<domain type='lxc'>
<name>jessie</name>
<uuid>e21987a5-e98e-9c99-0e35-803e4d9ad1fe</uuid>
<memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<resource>
<partition>/machine</partition>
</resource>
<os>
<type arch='x86_64'>exe</type>
<init>/sbin/init</init>
</os>
<idmap>
<uid start='0' target='100000' count='100000'/>
<gid start='0' target='100000' count='100000'/>
</idmap>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/libexec/libvirt_lxc</emulator>
<filesystem type='mount' accessmode='passthrough'>
<source dir='/mach/jessie'/>
<target dir='/'/>
</filesystem>
<interface type='bridge'>
<mac address='00:16:3e:0f:ef:8a'/>
<source bridge='bri0'/>
<target dev='veth0'/>
</interface>
<console type='pty'>
<target type='lxc' port='0'/>
</console>
</devices>
<seclabel type='none'/>
</domain>

1
tests/lxcxml2xmltest.c
View File

@ -138,6 +138,7 @@ mymain(void)
DO_TEST("disk-formats"); DO_TEST("disk-formats");
DO_TEST_DIFFERENT("filesystem-ram"); DO_TEST_DIFFERENT("filesystem-ram");
DO_TEST("filesystem-root"); DO_TEST("filesystem-root");
DO_TEST("idmap");
virObjectUnref(caps); virObjectUnref(caps);
virObjectUnref(xmlopt); virObjectUnref(xmlopt);