From: Andy Bavier <acb@cs.princeton.edu>
Date: Mon, 8 Feb 2010 21:49:30 +0000 (+0000)
Subject: Restore kbps for virtual links
X-Git-Tag: sfa-0.9-11~132
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=755b01ac641842e860ccc7038e8e26c276b4489d;p=sfa.git

Restore kbps for virtual links
---

diff --git a/sfa/managers/vini/vini.rnc b/sfa/managers/vini/vini.rnc
index b94bd6be..a54243b0 100644
--- 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 b7f3cc99..32f872e8 100644
--- 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>