Thanks.

diff --git a/sfa/rspecs/aggregates/vini_andy_please_use_this_version_instead.xml b/sfa/rspecs/aggregates/vini_andy_please_use_this_version_instead.xml
deleted file mode 100644 (file)
index c147174..0000000
--- a/sfa/rspecs/aggregates/vini_andy_please_use_this_version_instead.xml
+++ /dev/null
@@ -1,397 +0,0 @@
-<Rspec name="vini" xmlns="http://www.planet-lab.org/sfa/rspec/">
-  <Capacity>
-    <NetSpec name="physical_topology">
-      <SiteSpec name="I2Atlanta">
-       <NodeSpec name="i2atla1">
-          <hostname>node1.atla.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="i2atla2">
-          <hostname>node2.atla.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="I2Chicago">
-       <NodeSpec name="i2chic1">
-          <hostname>node1.chic.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="i2chic2">
-          <hostname>node2.chic.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="I2Houston">
-       <NodeSpec name="i2hous1">
-          <hostname>node1.hous.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="i2hous2">
-          <hostname>node2.hous.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="I2KansasCity">
-       <NodeSpec name="i2kans1">
-          <hostname>node1.kans.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="i2kans2">
-          <hostname>node2.kans.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="I2LosAngeles">
-       <NodeSpec name="i2losa1">
-          <hostname>node1.losa.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="i2losa2">
-          <hostname>node2.losa.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="I2NewYorkCity">
-       <NodeSpec name="i2newy1">
-          <hostname>node1.newy.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="i2newy2">
-          <hostname>node2.newy.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="I2SaltLakeCity">
-       <NodeSpec name="i2salt1">
-          <hostname>node1.salt.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="i2salt2">
-          <hostname>node2.salt.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="I2Seattle">
-       <NodeSpec name="i2seat1">
-          <hostname>node1.seat.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="i2seat2">
-          <hostname>node2.seat.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="I2WashingtonDC">
-       <NodeSpec name="i2wash1">
-          <hostname>node1.wash.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="i2wash2">
-          <hostname>node2.wash.internet2.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="NLRAtlanta">
-       <NodeSpec name="nlratla1">
-          <hostname>node1.atla.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="nlratla2">
-          <hostname>node2.atla.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="NLRChicago">
-       <NodeSpec name="nlrchic1">
-          <hostname>node1.chic.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="nlrchic2">
-          <hostname>node2.chic.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="NLRHouston">
-       <NodeSpec name="nlrhous1">
-          <hostname>node1.hous.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="nlrhous2">
-          <hostname>node2.hous.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="NLRLosAngeles">
-       <NodeSpec name="nlrlosa1">
-          <hostname>node1.losa.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="nlrlosa2">
-          <hostname>node2.losa.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="NLRNewYorkCity">
-       <NodeSpec name="nlrnewy1">
-          <hostname>node1.newy.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="nlrnewy2">
-          <hostname>node2.newy.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="NLRSeattle">
-       <NodeSpec name="nlrseat1">
-          <hostname>node1.seat.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="nlrseat2">
-          <hostname>node2.seat.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="NLRWashingtonDC">
-       <NodeSpec name="nlrwash1">
-          <hostname>node1.wash.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="nlrwash2">
-          <hostname>node2.wash.nlr.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="CESNET">
-       <NodeSpec name="cesnet1">
-          <hostname>node1.cesnet.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="cesnet2">
-          <hostname>node2.cesnet.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="Princeton">
-       <NodeSpec name="prin1">
-          <hostname>node1.princeton.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="GeorgiaTech">
-       <NodeSpec name="gt1">
-          <hostname>node1.gatech.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteSpec name="UMKC">
-       <NodeSpec name="umkc1">
-          <hostname>node1.umkc.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-       <NodeSpec name="umkc2">
-          <hostname>node2.umkc.vini-veritas.net</hostname>
-         <bw>1000Mbit</bw>
-       </NodeSpec>
-      </SiteSpec>
-      <SiteLinkSpec>
-       <endpoint>I2Atlanta</endpoint>
-       <endpoint>I2Chicago</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2Atlanta</endpoint>
-       <endpoint>I2Houston</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2Atlanta</endpoint>
-       <endpoint>I2WashingtonDC</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2Chicago</endpoint>
-       <endpoint>I2KansasCity</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2Chicago</endpoint>
-       <endpoint>I2WashingtonDC</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2Houston</endpoint>
-       <endpoint>I2KansasCity</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2Houston</endpoint>
-       <endpoint>I2LosAngeles</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2KansasCity</endpoint>
-       <endpoint>I2SaltLakeCity</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2LosAngeles</endpoint>
-       <endpoint>I2SaltLakeCity</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2LosAngeles</endpoint>
-       <endpoint>I2Seattle</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2NewYorkCity</endpoint>
-       <endpoint>I2WashingtonDC</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>I2SaltLakeCity</endpoint>
-       <endpoint>I2Seattle</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>NLRAtlanta</endpoint>
-       <endpoint>NLRChicago</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>NLRAtlanta</endpoint>
-       <endpoint>NLRHouston</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>NLRAtlanta</endpoint>
-       <endpoint>NLRWashingtonDC</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>NLRChicago</endpoint>
-       <endpoint>NLRHouston</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>NLRChicago</endpoint>
-       <endpoint>NLRNewYorkCity</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>NLRChicago</endpoint>
-       <endpoint>NLRSeattle</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>NLRChicago</endpoint>
-       <endpoint>NLRWashingtonDC</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>NLRHouston</endpoint>
-       <endpoint>NLRLosAngeles</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>NLRLosAngeles</endpoint>
-       <endpoint>NLRSeattle</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>NLRNewYorkCity</endpoint>
-       <endpoint>NLRWashingtonDC</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>Princeton</endpoint>
-       <endpoint>I2NewYorkCity</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>GeorgiaTech</endpoint>
-       <endpoint>I2Atlanta</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>GeorgiaTech</endpoint>
-       <endpoint>NLRAtlanta</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>UMKC</endpoint>
-       <endpoint>I2KansasCity</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-      <SiteLinkSpec>
-       <endpoint>CESNET</endpoint>
-       <endpoint>I2Chicago</endpoint>
-       <bw>1000Mbit</bw>
-      </SiteLinkSpec>
-    </NetSpec>
-  </Capacity>
-  <Request>
-    <NetSpec name="default_topology">
-      <LinkSpec>
-       <endpoint>i2atla1</endpoint>
-       <endpoint>i2chic1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2atla1</endpoint>
-       <endpoint>i2hous1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2atla1</endpoint>
-       <endpoint>i2wash1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2chic1</endpoint>
-       <endpoint>i2kans1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2chic1</endpoint>
-       <endpoint>i2wash1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2hous1</endpoint>
-       <endpoint>i2kans1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2hous1</endpoint>
-       <endpoint>i2losa1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2kans1</endpoint>
-       <endpoint>i2salt1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2losa1</endpoint>
-       <endpoint>i2salt1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2losa1</endpoint>
-       <endpoint>i2seat1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2newy1</endpoint>
-       <endpoint>i2wash1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-      <LinkSpec>
-       <endpoint>i2salt1</endpoint>
-       <endpoint>i2seat1</endpoint>
-       <bw>1Mbit</bw>
-      </LinkSpec>
-    </NetSpec>
-  </Request>
-</Rspec>