Tweaks to request element

diff --git a/sfa/managers/vini/vini.rnc b/sfa/managers/vini/vini.rnc
index a54243b..0be7640 100644 (file)
--- a/sfa/managers/vini/vini.rnc
+++ b/sfa/managers/vini/vini.rnc
@@ -32,7 +32,9 @@ link = element link {
    vlink*
 }
 request = element request {
-   sliver+,
+   attribute name { xsd:NMTOKEN },
+   sliver_defaults?,
+   sliver*,
    vlink*
 }
 sliver = element sliver { 

diff --git a/sfa/managers/vini/vini.rng b/sfa/managers/vini/vini.rng
index 32f872e..1545cb5 100644 (file)
--- a/sfa/managers/vini/vini.rng
+++ b/sfa/managers/vini/vini.rng
@@ -105,9 +105,15 @@
   </define>
   <define name="request">
     <element name="request">
-      <oneOrMore>
+      <attribute name="name">
+        <data type="NMTOKEN"/>
+      </attribute>
+      <optional>
+        <ref name="sliver_defaults"/>
+      </optional>
+      <zeroOrMore>
         <ref name="sliver"/>
-      </oneOrMore>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="vlink"/>
       </zeroOrMore>