From: Andy Bavier <acb@cs.princeton.edu>
Date: Thu, 12 Nov 2009 19:25:53 +0000 (+0000)
Subject: Change <bw> to <kbps>
X-Git-Tag: sfa-0.9-6~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=20b743cceed0422a89ef11a41e5a452211aa9d03;p=sfa.git

Change <bw> to <kbps>
---

diff --git a/sfa/rspecs/aggregates/vini/rspec.py b/sfa/rspecs/aggregates/vini/rspec.py
index fb08c1ad..d391a716 100644
--- a/sfa/rspecs/aggregates/vini/rspec.py
+++ b/sfa/rspecs/aggregates/vini/rspec.py
@@ -25,7 +25,7 @@ class ViniRSpec(RSpec):
                 ndict = {}
                 ndict['hostname'] = [node.hostname]
                 ndict['name'] = node.tag
-                ndict['bw'] = [format_tc_rate(node.bps)] 
+                ndict['kbps'] = [int(node.bps/1000)] 
                 nodespecs.append(ndict)
             sdict['NodeSpec'] = nodespecs
             sdict['name'] = site.name
@@ -35,7 +35,7 @@ class ViniRSpec(RSpec):
                 if sl.end1 == site:
                     sldict = {}
                     sldict['endpoint'] = [sl.end1.name, sl.end2.name]
-                    sldict['bw'] = [format_tc_rate(sl.bps)]
+                    sldict['kbps'] = [int(sl.bps/1000)]
                     sitelinkspecs.append(sldict)
                     
         d['RSpec']['Capacity'][0]['NetSpec'][0]['SiteSpec'] = sitespecs
@@ -48,7 +48,7 @@ class ViniRSpec(RSpec):
         for link in topo.nodelinks:
             edict = {}
             edict['endpoint'] = [link.end1.tag, link.end2.tag]
-            edict['bw'] = [format_tc_rate(link.bps)]
+            edict['kbps'] = [int(link.bps/1000)]
             linkspecs.append(edict)
 
         d = self.toDict()
diff --git a/sfa/rspecs/aggregates/vini/utils.py b/sfa/rspecs/aggregates/vini/utils.py
index c3118877..b5bfa5c7 100644
--- a/sfa/rspecs/aggregates/vini/utils.py
+++ b/sfa/rspecs/aggregates/vini/utils.py
@@ -7,62 +7,62 @@ default_topo_xml = """
             <LinkSpec>
                 <endpoint>i2atla1</endpoint>
                 <endpoint>i2chic1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2atla1</endpoint>
                 <endpoint>i2hous1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2atla1</endpoint>
                 <endpoint>i2wash1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2chic1</endpoint>
                 <endpoint>i2kans1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2chic1</endpoint>
                 <endpoint>i2wash1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2hous1</endpoint>
                 <endpoint>i2kans1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2hous1</endpoint>
                 <endpoint>i2losa1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2kans1</endpoint>
                 <endpoint>i2salt1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2losa1</endpoint>
                 <endpoint>i2salt1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2losa1</endpoint>
                 <endpoint>i2seat1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2newy1</endpoint>
                 <endpoint>i2wash1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2salt1</endpoint>
                 <endpoint>i2seat1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>"""
       
 # Taken from bwlimit.py
@@ -494,7 +494,7 @@ class Topology:
         for l in linkspecs:
             n1 = nodedict[l['endpoint'][0]]
             n2 = nodedict[l['endpoint'][1]]
-            bps = get_tc_rate(l['bw'][0])
+            bps = l['kbps'][0] * 1000
             self.nodelinks.append(Link(n1, n2, bps))
  
     def nodeTopoFromSliceTags(self, slice):
@@ -578,8 +578,8 @@ class Topology:
                 xml += """
                 <NodeSpec name="%s">
                     <hostname>%s</hostname>
-                    <bw>%s</bw>
-                </NodeSpec>""" % (node.tag, node.hostname, format_tc_rate(node.bps))
+                    <kbps>%s</kbps>
+                </NodeSpec>""" % (node.tag, node.hostname, int(node.bps/1000))
             xml += """
             </SiteSpec>"""
             
@@ -588,8 +588,8 @@ class Topology:
             <SiteLinkSpec>
                 <endpoint>%s</endpoint>
                 <endpoint>%s</endpoint> 
-                <bw>%s</bw>
-            </SiteLinkSpec>""" % (link.end1.name, link.end2.name, format_tc_rate(link.bps))
+                <kbps>%s</kbps>
+            </SiteLinkSpec>""" % (link.end1.name, link.end2.name, int(link.bps/1000))
             
         
         if hrn:
@@ -608,8 +608,8 @@ class Topology:
             <LinkSpec>
                 <endpoint>%s</endpoint>
                 <endpoint>%s</endpoint> 
-                <bw>%s</bw>
-            </LinkSpec>""" % (link.end1.tag, link.end2.tag, format_tc_rate(link.bps))
+                <kbps>%s</kbps>
+            </LinkSpec>""" % (link.end1.tag, link.end2.tag, int(link.bps/1000))
         else:
             xml += default_topo_xml
             
diff --git a/sfa/rspecs/aggregates/vini/vini.xml b/sfa/rspecs/aggregates/vini/vini.xml
index 0513fdf0..b8f3b04f 100644
--- a/sfa/rspecs/aggregates/vini/vini.xml
+++ b/sfa/rspecs/aggregates/vini/vini.xml
@@ -4,329 +4,329 @@
       <SiteSpec name="I2Atlanta">
 	<NodeSpec name="i2atla1">
           <hostname>node1.atla.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="i2atla2">
           <hostname>node2.atla.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="I2Chicago">
 	<NodeSpec name="i2chic1">
           <hostname>node1.chic.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="i2chic2">
           <hostname>node2.chic.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="I2Houston">
 	<NodeSpec name="i2hous1">
           <hostname>node1.hous.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="i2hous2">
           <hostname>node2.hous.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="I2KansasCity">
 	<NodeSpec name="i2kans1">
           <hostname>node1.kans.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="i2kans2">
           <hostname>node2.kans.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="I2LosAngeles">
 	<NodeSpec name="i2losa1">
           <hostname>node1.losa.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="i2losa2">
           <hostname>node2.losa.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="I2NewYorkCity">
 	<NodeSpec name="i2newy1">
           <hostname>node1.newy.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="i2newy2">
           <hostname>node2.newy.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="I2SaltLakeCity">
 	<NodeSpec name="i2salt1">
           <hostname>node1.salt.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="i2salt2">
           <hostname>node2.salt.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="I2Seattle">
 	<NodeSpec name="i2seat1">
           <hostname>node1.seat.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="i2seat2">
           <hostname>node2.seat.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="I2WashingtonDC">
 	<NodeSpec name="i2wash1">
           <hostname>node1.wash.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="i2wash2">
           <hostname>node2.wash.internet2.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="NLRAtlanta">
 	<NodeSpec name="nlratla1">
           <hostname>node1.atla.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="nlratla2">
           <hostname>node2.atla.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="NLRChicago">
 	<NodeSpec name="nlrchic1">
           <hostname>node1.chic.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="nlrchic2">
           <hostname>node2.chic.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="NLRHouston">
 	<NodeSpec name="nlrhous1">
           <hostname>node1.hous.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="nlrhous2">
           <hostname>node2.hous.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="NLRLosAngeles">
 	<NodeSpec name="nlrlosa1">
           <hostname>node1.losa.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="nlrlosa2">
           <hostname>node2.losa.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="NLRNewYorkCity">
 	<NodeSpec name="nlrnewy1">
           <hostname>node1.newy.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="nlrnewy2">
           <hostname>node2.newy.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="NLRSeattle">
 	<NodeSpec name="nlrseat1">
           <hostname>node1.seat.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="nlrseat2">
           <hostname>node2.seat.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="NLRWashingtonDC">
 	<NodeSpec name="nlrwash1">
           <hostname>node1.wash.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="nlrwash2">
           <hostname>node2.wash.nlr.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="CESNET">
 	<NodeSpec name="cesnet1">
           <hostname>node1.cesnet.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="cesnet2">
           <hostname>node2.cesnet.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="Princeton">
 	<NodeSpec name="prin1">
           <hostname>node1.princeton.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="GeorgiaTech">
 	<NodeSpec name="gt1">
           <hostname>node1.gatech.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteSpec name="UMKC">
 	<NodeSpec name="umkc1">
           <hostname>node1.umkc.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
 	<NodeSpec name="umkc2">
           <hostname>node2.umkc.vini-veritas.net</hostname>
-	  <bw>1000Mbit</bw>
+	  <kbps>1000000</kbps>
 	</NodeSpec>
       </SiteSpec>
       <SiteLinkSpec>
 	<endpoint>I2Atlanta</endpoint>
 	<endpoint>I2Chicago</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2Atlanta</endpoint>
 	<endpoint>I2Houston</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2Atlanta</endpoint>
 	<endpoint>I2WashingtonDC</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2Chicago</endpoint>
 	<endpoint>I2KansasCity</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2Chicago</endpoint>
 	<endpoint>I2WashingtonDC</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2Houston</endpoint>
 	<endpoint>I2KansasCity</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2Houston</endpoint>
 	<endpoint>I2LosAngeles</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2KansasCity</endpoint>
 	<endpoint>I2SaltLakeCity</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2LosAngeles</endpoint>
 	<endpoint>I2SaltLakeCity</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2LosAngeles</endpoint>
 	<endpoint>I2Seattle</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2NewYorkCity</endpoint>
 	<endpoint>I2WashingtonDC</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>I2SaltLakeCity</endpoint>
 	<endpoint>I2Seattle</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>NLRAtlanta</endpoint>
 	<endpoint>NLRChicago</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>NLRAtlanta</endpoint>
 	<endpoint>NLRHouston</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>NLRAtlanta</endpoint>
 	<endpoint>NLRWashingtonDC</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>NLRChicago</endpoint>
 	<endpoint>NLRHouston</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>NLRChicago</endpoint>
 	<endpoint>NLRNewYorkCity</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>NLRChicago</endpoint>
 	<endpoint>NLRSeattle</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>NLRChicago</endpoint>
 	<endpoint>NLRWashingtonDC</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>NLRHouston</endpoint>
 	<endpoint>NLRLosAngeles</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>NLRLosAngeles</endpoint>
 	<endpoint>NLRSeattle</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>NLRNewYorkCity</endpoint>
 	<endpoint>NLRWashingtonDC</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>Princeton</endpoint>
 	<endpoint>I2NewYorkCity</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>GeorgiaTech</endpoint>
 	<endpoint>I2Atlanta</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>GeorgiaTech</endpoint>
 	<endpoint>NLRAtlanta</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>UMKC</endpoint>
 	<endpoint>I2KansasCity</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
       <SiteLinkSpec>
 	<endpoint>CESNET</endpoint>
 	<endpoint>I2Chicago</endpoint>
-	<bw>1000Mbit</bw>
+	<kbps>1000000</kbps>
       </SiteLinkSpec>
     </NetSpec>
   </Capacity>
@@ -335,62 +335,62 @@
       <LinkSpec>
 	<endpoint>i2atla1</endpoint>
 	<endpoint>i2chic1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2atla1</endpoint>
 	<endpoint>i2hous1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2atla1</endpoint>
 	<endpoint>i2wash1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2chic1</endpoint>
 	<endpoint>i2kans1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2chic1</endpoint>
 	<endpoint>i2wash1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2hous1</endpoint>
 	<endpoint>i2kans1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2hous1</endpoint>
 	<endpoint>i2losa1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2kans1</endpoint>
 	<endpoint>i2salt1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2losa1</endpoint>
 	<endpoint>i2salt1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2losa1</endpoint>
 	<endpoint>i2seat1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2newy1</endpoint>
 	<endpoint>i2wash1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
       <LinkSpec>
 	<endpoint>i2salt1</endpoint>
 	<endpoint>i2seat1</endpoint>
-	<bw>1Mbit</bw>
+	<kbps>1000</kbps>
       </LinkSpec>
     </NetSpec>
   </Request>