Changes to registry manager. SA.

[sfa.git] / sfa / managers / vini / vini.rng

diff --git a/sfa/managers/vini/vini.rng b/sfa/managers/vini/vini.rng
index b7f3cc9..387c831 100644 (file)
--- a/sfa/managers/vini/vini.rng
+++ b/sfa/managers/vini/vini.rng
@@ -5,6 +5,12 @@
   </start>
   <define name="RSpec">
     <element name="RSpec">
+      <attribute name="expires">
+        <data type="NMTOKEN"/>
+      </attribute>
+      <attribute name="generated">
+        <data type="NMTOKEN"/>
+      </attribute>
       <attribute name="type">
         <data type="NMTOKEN"/>
       </attribute>
@@ -105,9 +111,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>
@@ -240,10 +252,7 @@
         </element>
       </optional>
       <optional>
-        <element name="bw">
-          <attribute name="units">
-            <data type="NMTOKEN"/>
-          </attribute>
+        <element name="kbps">
           <text/>
         </element>
       </optional>