From: Andy Bavier <acb@cs.princeton.edu>
Date: Thu, 18 Feb 2010 18:42:32 +0000 (+0000)
Subject: Tweaks to request element
X-Git-Tag: sfa-0.9-11~88
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=5f13a2c073a01e40fe0f31bd29ee696724e7ca25

Tweaks to request element
---

diff --git a/sfa/managers/vini/vini.rnc b/sfa/managers/vini/vini.rnc
index a54243b0..0be7640a 100644
--- 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 32f872e8..1545cb5b 100644
--- 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>