Re: [libvirt] [PATCH 05/10] schema: Update storage pool schema.

On Mon, Oct 12, 2009 at 10:46:49AM -0400, Cole Robinson wrote: > - mpath pools weren't listed > - scsi pools were missing an adapter section > - iscsi pools were missing an auth section > - Logical pools do not require a source name to be specified > > Signed-off-by: Cole Robinson <crobinso(a)redhat.com&gt; > --- > docs/schemas/storagepool.rng | 51 +++++++++++++++++++++++++++++++++++++---- > 1 files changed, 46 insertions(+), 5 deletions(-) > > diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng > index d225f97..7ab0187 100644 > --- a/docs/schemas/storagepool.rng > +++ b/docs/schemas/storagepool.rng > @@ -16,6 +16,7 @@ > <ref name='pooldisk'/> > <ref name='pooliscsi'/> > <ref name='poolscsi'/> > + <ref name='poolmpath'/> > </choice> > </element> > </define> > @@ -90,6 +91,18 @@ > <ref name='target'/> > </define> > > + <define name='poolmpath'> > + <attribute name='type'> > + <value>mpath</value> > + </attribute> > + <ref name='commonmetadata'/> > + <ref name='sizing'/> > + <optional> > + <ref name='sourcempath'/> > + </optional> > + <ref name='target'/> > + </define> > + > <define name='commonmetadata'> > <element name='name'> > <ref name='name'/> > @@ -212,6 +225,22 @@ > </element> > </define> > > + <define name='sourceinfoauth'> > + <element name='auth'> > + <attribute name='type'> > + <choice> > + <value>chap</value> > + </choice> > + </attribute> > + <attribute name='login'> > + <text/> > + </attribute> > + <attribute name='passwd'> > + <text/> > + </attribute> > + </element> > + </define> > + > <define name='sourcefmtfs'> > <optional> > <element name='format'> > @@ -309,10 +338,14 @@ > > <define name='sourcelogical'> > <element name='source'> > - <ref name='sourceinfoname'/> > - <optional> > - <ref name='sourceinfodev'/> > - </optional> > + <oneOrMore> > + <optional> > + <ref name='sourceinfoname'/> > + </optional> > + <optional> > + <ref name='sourceinfodev'/> > + </optional> > + </oneOrMore> > <ref name='sourcefmtlogical'/> > </element> > </define> > @@ -328,15 +361,23 @@ > <element name='source'> > <ref name='sourceinfohost'/> > <ref name='sourceinfodev'/> > + <optional> > + <ref name='sourceinfoauth'/> > + </optional> > </element> > </define> > > <define name='sourcescsi'> > <element name='source'> > - <ref name='sourceinfoname'/> > + <ref name='sourceinfoadapter'/> > </element> > </define> > > + <define name='sourcempath'> > + <element name='source'> > + <empty/> > + </element> > + </define> > > <define name='name'> > <data type='string'> ACK, please push :-) Daniel