Restore kbps for virtual links

diff --git a/sfa/managers/vini/vini.rnc b/sfa/managers/vini/vini.rnc
index b94bd6b..a54243b 100644 (file)
--- a/sfa/managers/vini/vini.rnc
+++ b/sfa/managers/vini/vini.rnc
@@ -64,5 +64,5 @@ sliver_elements = (
 vlink = element vlink { 
    attribute endpoints { xsd:IDREFS }?,
    element description { text }?,
-   element bw { attribute units { xsd:NMTOKEN }, text }? 
+   element kbps { text }? 
 }

diff --git a/sfa/managers/vini/vini.rng b/sfa/managers/vini/vini.rng
index b7f3cc9..32f872e 100644 (file)
--- a/sfa/managers/vini/vini.rng
+++ b/sfa/managers/vini/vini.rng
@@ -240,10 +240,7 @@
         </element>
       </optional>
       <optional>
-        <element name="bw">
-          <attribute name="units">
-            <data type="NMTOKEN"/>
-          </attribute>
+        <element name="kbps">
           <text/>
         </element>
       </optional>