Changeset 1647 for trunk

Timestamp:

01/10/13 14:56:38 (12 years ago)

Author:

lnevers@bbn.com

Message:

updated to capture the new required disk image, and the new check for single node rspec not allowing interfaces

Location:

trunk/RSpecExamples

Files:

• exogeni-1baremetal-at-rci.rspec (modified) (1 diff)
• exogeni-1vm-1baremetal-at-bbn.rspec (modified) (2 diffs)
• exogeni-1vm-1baremetal-at-renci.rspec (modified) (2 diffs)
• exogeni-1vm-at-bbn-1vm-at-rci.rspec (modified) (2 diffs)
• exogeni-1vm-at-bbn.rspec (modified) (1 diff)
• exogeni-1vm-at-renci.rspec (modified) (1 diff)
• exogeni-1vm-vlan1750-at-bbn.rspec (modified) (1 diff)
• exogeni-1vm-vlan1750-at-rci.rspec (modified) (1 diff)
• exogeni-2vm-vlan1750-at-bbn.rspec (modified) (2 diffs)
• exogeni-4vm-at-renci.rspec (modified) (4 diffs)
• exogeni-openflow-at-bbn.rspec (modified) (1 diff)

trunk/RSpecExamples/exogeni-1baremetal-at-rci.rspec

@@ -16 +16 @@
 <node client_id="BT2" component_manager_id="urn:publicid:IDN+rcivmsite+authority+cm" >
     <sliver_type name="exogeni-m4">
+    <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />
     </sliver_type>
-    <interface client_id="BT2:if0">
-   <ip address="172.16.1.2" netmask="255.255.255.0" />
-    </interface>
   </node>
 </rspec>

trunk/RSpecExamples/exogeni-1vm-1baremetal-at-bbn.rspec

@@ -16 +16 @@
 <node client_id="BT" component_manager_id="urn:publicid:IDN+bbnvmsite+authority+cm" >
     <sliver_type name="exogeni-m4">
+    <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />
     </sliver_type>
     <interface client_id="BT:if0">
@@ -24 +25 @@
  <node client_id="geni2" component_manager_id="urn:publicid:IDN+bbnvmsite+authority+cm" >
     <sliver_type name="m1.small">
-   <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.v0.2.xml" version="397c431cb9249e1f361484b08674bc3381455bb9" />
+    <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />
     </sliver_type>
     <interface client_id="geni2:if0">

trunk/RSpecExamples/exogeni-1vm-1baremetal-at-renci.rspec

@@ -18 +18 @@
 <node client_id="BM-1" component_manager_id="urn:publicid:IDN+rcivmsite+authority+cm" >
     <sliver_type name="exogeni-m4">
+    <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />
     </sliver_type>
     <interface client_id="BM-1:if0">
@@ -26 +27 @@
  <node client_id="VM-1" component_manager_id="urn:publicid:IDN+rcivmsite+authority+cm" >
     <sliver_type name="m1.small">
-   <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.xml" version="6a8a8466aef43774bf2e309af47ce876ba793f36" />
+    <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />
     </sliver_type>
     <interface client_id="VM-1:if0">

trunk/RSpecExamples/exogeni-1vm-at-bbn-1vm-at-rci.rspec

@@ -15 +15 @@
 <node client_id="geni1" component_manager_id="urn:publicid:IDN+bbnvmsite+authority+cm">
  <sliver_type name="m1.small">
-   <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.v0.2.xml" version="397c431cb9249e1f361484b08674bc3381455bb9" />
+    <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />
  </sliver_type>
  <interface client_id="geni1:0">
@@ -24 +24 @@
 <node client_id="geni2" component_manager_id="urn:publicid:IDN+rcivmsite+authority+cm">
  <sliver_type name="m1.large">
-   <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.v0.2.xml" version="397c431cb9249e1f361484b08674bc3381455bb9" />
+    <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />
  </sliver_type>
  <interface client_id="geni2:0" >

trunk/RSpecExamples/exogeni-1vm-at-bbn.rspec

@@ -16 +16 @@
 <node client_id="geni1" component_manager_id="urn:publicid:IDN+bbnvmsite+authority+cm">
  <sliver_type name="m1.small">
-   <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.v0.2.xml" version="397c431cb9249e1f361484b08674bc3381455bb9" />
+   <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />
  </sliver_type>
- <interface client_id="geni1:0">
-    <ip address="172.16.1.1" netmask="255.255.255.0" />
- </interface>
 </node>
 </rspec>

trunk/RSpecExamples/exogeni-1vm-at-renci.rspec

@@ -14 +14 @@
 <node client_id="geni1" component_manager_id="urn:publicid:IDN+rcivmsite+authority+cm">
  <sliver_type name="m1.small">
-   <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.v0.2.xml" version="397c431cb9249e1f361484b08674bc3381455bb9" />
+      <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " /> 
  </sliver_type>
- <interface client_id="geni1:0">
-    <ip address="172.16.1.1" netmask="255.255.255.0" />
- </interface>
 </node>
 </rspec>

trunk/RSpecExamples/exogeni-1vm-vlan1750-at-bbn.rspec

@@ -14 +14 @@
   <node client_id="host1" component_manager_id="urn:publicid:IDN+bbnvmsite+authority+cm" >
     <sliver_type name="m1.small">
-   <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.v0.2.xml" version="397c431cb9249e1f361484b08674bc3381455bb9" />
+  <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />  
     </sliver_type>
     <interface client_id="host1:if0">

trunk/RSpecExamples/exogeni-1vm-vlan1750-at-rci.rspec

@@ -15 +15 @@
   <node client_id="VM" component_manager_id="urn:publicid:IDN+rcivmsite+authority+cm" >
     <sliver_type name="m1.small">
-   <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.v0.2.xml" version="397c431cb9249e1f361484b08674bc3381455bb9" />
+  <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />  
     </sliver_type>
     <interface client_id="VM:if0">

trunk/RSpecExamples/exogeni-2vm-vlan1750-at-bbn.rspec

@@ -14 +14 @@
   <node client_id="VM-1" component_manager_id="urn:publicid:IDN+bbnvmsite+authority+cm" >
     <sliver_type name="m1.small">
-   <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.xml" version="0866827ee71324fbbe273c9e8f4f1c142a548e11" />
+  <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />  
     </sliver_type>
     <interface client_id="VM-1:if0">
@@ -23 +23 @@
   <node client_id="VM-2" component_manager_id="urn:publicid:IDN+bbnvmsite+authority+cm" >
     <sliver_type name="m1.small">
-   <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.xml" version="0866827ee71324fbbe273c9e8f4f1c142a548e11" />
+  <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " />  
     </sliver_type>
     <interface client_id="VM-2:if0">

trunk/RSpecExamples/exogeni-4vm-at-renci.rspec

@@ -14 +14 @@
   <node client_id="VM-1" component_manager_id="urn:publicid:IDN+rcivmsite+authority+cm">
     <sliver_type name="m1.small">
-    <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-2g.zfilesystem.sparse.xml" version="6a8a8466aef43774bf2e309af47ce876ba793f36" />
+   <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " /> 
  </sliver_type>
    <interface client_id="VM-1:if0">
@@ -22 +22 @@
   <node client_id="VM-2" component_manager_id="urn:publicid:IDN+rcivmsite+authority+cm">
     <sliver_type name="m1.large">
-    <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-5g.zfilesystem.sparse.xml" version="d74dfdb68836fca8240fb634de8c4bc2e40f592e" />
+   <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " /> 
  </sliver_type>
     <interface client_id="VM-2:if0">
@@ -30 +30 @@
   <node client_id="VM-3" component_manager_id="urn:publicid:IDN+rcivmsite+authority+cm">
     <sliver_type name="m1.large">
-    <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-10g.zfilesystem.sparse.xml" version="4164446d4ae96087b49ba81e9a3d6b2bc305d004" />
+   <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " /> 
  </sliver_type>
     <interface client_id="VM-3:if0">
@@ -38 +38 @@
   <node client_id="VM-4" component_manager_id="urn:publicid:IDN+rcivmsite+authority+cm">
     <sliver_type name="m1.large">
-    <disk_image name="http://geni-images.renci.org/images/standard/debian/debian-squeeze-amd64-neuca-20g.zfilesystem.sparse.xml" version="ec57dafbbf998e8ae5bb8feff95d5c19d466cc40" />
+   <disk_image name="http://geni-images.renci.org/images/standard/debian/deb6-neuca-v1.0.5.xml" version="104ea3d824906f0e13cebb89b14df232290553b1 " /> 
  </sliver_type>
     <interface client_id="VM-4:if0">

trunk/RSpecExamples/exogeni-openflow-at-bbn.rspec

@@ -23 +23 @@
       <openflow:datapath component_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+datapath+06:d6:00:12:e2:b8:a5:d0"
                          component_manager_id="urn:publicid:IDN+openflow:foam:foam.gpolab.bbn.com+authority+am">
-        <openflow:port num="5"/>
-        <openflow:port num="15"/>
+        <openflow:port num="5"/>   <!-- to NLR 3716 -->
+        <openflow:port num="15"/>  <!-- to BBN ExoGENI rack -->
       </openflow:datapath>
     </openflow:group>