From 2be18980848e7169b6b955655f662b6a697dae85 Mon Sep 17 00:00:00 2001
From: Andy Bavier <acb@cs.princeton.edu>
Date: Tue, 9 Feb 2010 15:55:21 +0000
Subject: [PATCH] Updated VINI RSpec

---
 sfa/managers/vini/vini.xml | 331 +++++++++++++++++++++----------------
 1 file changed, 184 insertions(+), 147 deletions(-)

diff --git a/sfa/managers/vini/vini.xml b/sfa/managers/vini/vini.xml
index 6c67eea8..3788b5b0 100644
--- a/sfa/managers/vini/vini.xml
+++ b/sfa/managers/vini/vini.xml
@@ -5,332 +5,369 @@
       <name>Princeton</name>
       <node id="n1">
         <hostname>node1.princeton.vini-veritas.net</hostname>
-        <kbps>999000</kbps>
+        <bw_unallocated units="kbps">999000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s3">
       <name>PSG</name>
-      <node id="n25">
-        <hostname>node2.psg.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
       <node id="n6">
         <hostname>node1.psg.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n25">
+        <hostname>node2.psg.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s4">
-      <name>NLR_Chicago</name>
-      <node id="n3">
-        <hostname>node2.chic.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
+      <name>NLR Chicago</name>
       <node id="n2">
         <hostname>node1.chic.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n3">
+        <hostname>node2.chic.nlr.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s5">
-      <name>NLR_Houston</name>
+      <name>NLR Houston</name>
       <node id="n4">
         <hostname>node1.hous.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
       <node id="n5">
         <hostname>node2.hous.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s6">
-      <name>NLR_Atlanta</name>
-      <node id="n9">
-        <hostname>node2.atla.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
+      <name>NLR Atlanta</name>
       <node id="n8">
         <hostname>node1.atla.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n9">
+        <hostname>node2.atla.nlr.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s7">
-      <name>NLR_Seattle</name>
-      <node id="n11">
-        <hostname>node2.seat.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
+      <name>NLR Seattle</name>
       <node id="n10">
         <hostname>node1.seat.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n11">
+        <hostname>node2.seat.nlr.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s8">
-      <name>NLR_Los_Angeles</name>
-      <node id="n13">
-        <hostname>node2.losa.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
+      <name>NLR Los Angeles</name>
       <node id="n12">
         <hostname>node1.losa.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n13">
+        <hostname>node2.losa.nlr.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s9">
-      <name>NLR_New_York</name>
-      <node id="n15">
-        <hostname>node2.newy.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
+      <name>NLR New York</name>
       <node id="n14">
         <hostname>node1.newy.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n15">
+        <hostname>node2.newy.nlr.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s10">
-      <name>NLR_Wash_DC</name>
-      <node id="n17">
-        <hostname>node2.wash.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
+      <name>NLR Wash DC</name>
       <node id="n16">
         <hostname>node1.wash.nlr.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n17">
+        <hostname>node2.wash.nlr.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s11">
-      <name>I2_Chicago</name>
+      <name>I2 Chicago</name>
       <node id="n18">
         <hostname>node1.chic.internet2.vini-veritas.net</hostname>
-        <kbps>963000</kbps>
+        <bw_unallocated units="kbps">963000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
       <node id="n19">
         <hostname>node2.chic.internet2.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s12">
-      <name>I2_New_York</name>
-      <node id="n21">
-        <hostname>node2.newy.internet2.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
+      <name>I2 New York</name>
       <node id="n20">
         <hostname>node1.newy.internet2.vini-veritas.net</hostname>
-        <kbps>988000</kbps>
+        <bw_unallocated units="kbps">988000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n21">
+        <hostname>node2.newy.internet2.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s13">
-      <name>I2_Wash_DC</name>
-      <node id="n23">
-        <hostname>node2.wash.internet2.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
+      <name>I2 Wash DC</name>
       <node id="n22">
         <hostname>node1.wash.internet2.vini-veritas.net</hostname>
-        <kbps>964000</kbps>
+        <bw_unallocated units="kbps">964000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n23">
+        <hostname>node2.wash.internet2.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s14">
-      <name>Georgia_Tech</name>
+      <name>Georgia Tech</name>
       <node id="n45">
         <hostname>node1.gatech.vini-veritas.net</hostname>
-        <kbps>999000</kbps>
+        <bw_unallocated units="kbps">999000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s15">
-      <name>I2_Atlanta</name>
+      <name>I2 Atlanta</name>
       <node id="n26">
         <hostname>node1.atla.internet2.vini-veritas.net</hostname>
-        <kbps>964000</kbps>
+        <bw_unallocated units="kbps">964000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
       <node id="n27">
         <hostname>node2.atla.internet2.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s16">
       <name>CESNET</name>
-      <node id="n43">
-        <hostname>node2.cesnet.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
       <node id="n42">
         <hostname>node1.cesnet.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n43">
+        <hostname>node2.cesnet.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
       </node>
     </site>
     <site id="s17">
-      <name>I2_Kansas_City</name>
-      <node id="n29">
-        <hostname>node2.kans.internet2.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
+      <name>I2 Kansas City</name>
       <node id="n28">
         <hostname>node1.kans.internet2.vini-veritas.net</hostname>
-        <kbps>961000</kbps>
+        <bw_unallocated units="kbps">961000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n29">
+        <hostname>node2.kans.internet2.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s19">
-      <name>I2_Houston</name>
+      <name>I2 Houston</name>
       <node id="n30">
         <hostname>node1.hous.internet2.vini-veritas.net</hostname>
-        <kbps>964000</kbps>
+        <bw_unallocated units="kbps">964000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
       <node id="n31">
         <hostname>node2.hous.internet2.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s20">
-      <name>I2_Los_Angeles</name>
+      <name>I2 Los Angeles</name>
       <node id="n36">
         <hostname>node1.losa.internet2.vini-veritas.net</hostname>
-        <kbps>964000</kbps>
+        <bw_unallocated units="kbps">964000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
       <node id="n37">
         <hostname>node2.losa.internet2.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s21">
-      <name>I2_Seattle</name>
+      <name>I2 Seattle</name>
       <node id="n34">
         <hostname>node1.seat.internet2.vini-veritas.net</hostname>
-        <kbps>975000</kbps>
+        <bw_unallocated units="kbps">975000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
       <node id="n35">
         <hostname>node2.seat.internet2.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s22">
-      <name>I2_Salt_Lake</name>
-      <node id="n33">
-        <hostname>node2.salt.internet2.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
-      </node>
+      <name>I2 Salt Lake</name>
       <node id="n32">
         <hostname>node1.salt.internet2.vini-veritas.net</hostname>
-        <kbps>962000</kbps>
+        <bw_unallocated units="kbps">962000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
+      </node>
+      <node id="n33">
+        <hostname>node2.salt.internet2.vini-veritas.net</hostname>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
+        <bw_limit units="kbps">1000000</bw_limit>
       </node>
     </site>
     <site id="s24">
       <name>UMKC</name>
       <node id="n48">
         <hostname>node1.umkc.vini-veritas.net</hostname>
-        <kbps>999000</kbps>
+        <bw_unallocated units="kbps">999000</bw_unallocated>
       </node>
       <node id="n50">
         <hostname>node2.umkc.vini-veritas.net</hostname>
-        <kbps>1000000</kbps>
+        <bw_unallocated units="kbps">1000000</bw_unallocated>
       </node>
     </site>
     <link endpoints="s2 s12">
-      <description>Princeton -- I2_New_York</description>
-      <kbps>1000000</kbps>
+      <description>Princeton -- I2 New York</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s4 s5">
-      <description>NLR_Chicago -- NLR_Houston</description>
-      <kbps>1000000</kbps>
+      <description>NLR Chicago -- NLR Houston</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s4 s6">
-      <description>NLR_Chicago -- NLR_Atlanta</description>
-      <kbps>1000000</kbps>
+      <description>NLR Chicago -- NLR Atlanta</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s4 s7">
-      <description>NLR_Chicago -- NLR_Seattle</description>
-      <kbps>1000000</kbps>
+      <description>NLR Chicago -- NLR Seattle</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s4 s9">
-      <description>NLR_Chicago -- NLR_New_York</description>
-      <kbps>1000000</kbps>
+      <description>NLR Chicago -- NLR New York</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s4 s10">
-      <description>NLR_Chicago -- NLR_Wash_DC</description>
-      <kbps>1000000</kbps>
+      <description>NLR Chicago -- NLR Wash DC</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s5 s6">
-      <description>NLR_Houston -- NLR_Atlanta</description>
-      <kbps>1000000</kbps>
+      <description>NLR Houston -- NLR Atlanta</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s5 s8">
-      <description>NLR_Houston -- NLR_Los_Angeles</description>
-      <kbps>1000000</kbps>
+      <description>NLR Houston -- NLR Los Angeles</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s6 s10">
-      <description>NLR_Atlanta -- NLR_Wash_DC</description>
-      <kbps>1000000</kbps>
+      <description>NLR Atlanta -- NLR Wash DC</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s6 s14">
-      <description>NLR_Atlanta -- Georgia_Tech</description>
-      <kbps>1000000</kbps>
+      <description>NLR Atlanta -- Georgia Tech</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s7 s8">
-      <description>NLR_Seattle -- NLR_Los_Angeles</description>
-      <kbps>1000000</kbps>
+      <description>NLR Seattle -- NLR Los Angeles</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s9 s10">
-      <description>NLR_New_York -- NLR_Wash_DC</description>
-      <kbps>1000000</kbps>
+      <description>NLR New York -- NLR Wash DC</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s11 s13">
-      <description>I2_Chicago -- I2_Wash_DC</description>
-      <kbps>988000</kbps>
+      <description>I2 Chicago -- I2 Wash DC</description>
+      <bw_unallocated units="kbps">988000</bw_unallocated>
     </link>
     <link endpoints="s11 s15">
-      <description>I2_Chicago -- I2_Atlanta</description>
-      <kbps>988000</kbps>
+      <description>I2 Chicago -- I2 Atlanta</description>
+      <bw_unallocated units="kbps">988000</bw_unallocated>
     </link>
     <link endpoints="s11 s16">
-      <description>I2_Chicago -- CESNET</description>
-      <kbps>1000000</kbps>
+      <description>I2 Chicago -- CESNET</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s11 s17">
-      <description>I2_Chicago -- I2_Kansas_City</description>
-      <kbps>987000</kbps>
+      <description>I2 Chicago -- I2 Kansas City</description>
+      <bw_unallocated units="kbps">987000</bw_unallocated>
     </link>
     <link endpoints="s12 s13">
-      <description>I2_New_York -- I2_Wash_DC</description>
-      <kbps>988000</kbps>
+      <description>I2 New York -- I2 Wash DC</description>
+      <bw_unallocated units="kbps">988000</bw_unallocated>
     </link>
     <link endpoints="s13 s15">
-      <description>I2_Wash_DC -- I2_Atlanta</description>
-      <kbps>988000</kbps>
+      <description>I2 Wash DC -- I2 Atlanta</description>
+      <bw_unallocated units="kbps">988000</bw_unallocated>
     </link>
     <link endpoints="s14 s15">
-      <description>Georgia_Tech -- I2_Atlanta</description>
-      <kbps>1000000</kbps>
+      <description>Georgia Tech -- I2 Atlanta</description>
+      <bw_unallocated units="kbps">1000000</bw_unallocated>
     </link>
     <link endpoints="s15 s19">
-      <description>I2_Atlanta -- I2_Houston</description>
-      <kbps>988000</kbps>
+      <description>I2 Atlanta -- I2 Houston</description>
+      <bw_unallocated units="kbps">988000</bw_unallocated>
     </link>
     <link endpoints="s17 s19">
-      <description>I2_Kansas_City -- I2_Houston</description>
-      <kbps>988000</kbps>
+      <description>I2 Kansas City -- I2 Houston</description>
+      <bw_unallocated units="kbps">988000</bw_unallocated>
     </link>
     <link endpoints="s17 s22">
-      <description>I2_Kansas_City -- I2_Salt_Lake</description>
-      <kbps>987000</kbps>
+      <description>I2 Kansas City -- I2 Salt Lake</description>
+      <bw_unallocated units="kbps">987000</bw_unallocated>
     </link>
     <link endpoints="s17 s24">
-      <description>I2_Kansas_City -- UMKC</description>
-      <kbps>999000</kbps>
+      <description>I2 Kansas City -- UMKC</description>
+      <bw_unallocated units="kbps">999000</bw_unallocated>
     </link>
     <link endpoints="s19 s20">
-      <description>I2_Houston -- I2_Los_Angeles</description>
-      <kbps>988000</kbps>
+      <description>I2 Houston -- I2 Los Angeles</description>
+      <bw_unallocated units="kbps">988000</bw_unallocated>
     </link>
     <link endpoints="s20 s21">
-      <description>I2_Los_Angeles -- I2_Seattle</description>
-      <kbps>988000</kbps>
+      <description>I2 Los Angeles -- I2 Seattle</description>
+      <bw_unallocated units="kbps">988000</bw_unallocated>
     </link>
     <link endpoints="s20 s22">
-      <description>I2_Los_Angeles -- I2_Salt_Lake</description>
-      <kbps>988000</kbps>
+      <description>I2 Los Angeles -- I2 Salt Lake</description>
+      <bw_unallocated units="kbps">988000</bw_unallocated>
     </link>
     <link endpoints="s21 s22">
-      <description>I2_Seattle -- I2_Salt_Lake</description>
-      <kbps>987000</kbps>
+      <description>I2 Seattle -- I2 Salt Lake</description>
+      <bw_unallocated units="kbps">987000</bw_unallocated>
     </link>
   </network>
 </RSpec>
-- 
2.47.0