Modifying iotlab node hostname sin rspec files.

diff --git a/testbeds/iotlab/tests/tests_rspecs/firexp_avakian_slice_iotlab.rspec b/testbeds/iotlab/tests/tests_rspecs/firexp_avakian_slice_iotlab.rspec
index 51539f8..109d72c 100644 (file)
--- a/testbeds/iotlab/tests/tests_rspecs/firexp_avakian_slice_iotlab.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/firexp_avakian_slice_iotlab.rspec
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <RSpec type="SFA" expires="2013-02-27T15:14:10Z" generated="2013-02-27T14:14:10Z">
   <network name="iotlab">
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node5.devlille.senslab.info" boot_state="Alive" component_name="node5.devlille.iotlab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
-      <hostname>node5.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info" boot_state="Alive" component_name="node5.devlille.iotlab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
+      <hostname>wsn430-12.devlille.iot-lab.info.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
       <sliver/>
     </node>
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node2.devlille.senslab.info" boot_state="Alive" component_name="node2.devlille.senslab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
-      <hostname>node2.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info" boot_state="Alive" component_name="a8-11.devgrenoble.iot-lab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
+      <hostname>a8-11.devgrenoble.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
@@ -17,7 +17,7 @@
     </node>
   </network>
  <lease slice_id="urn:publicid:IDN+firexp:flab+slice+avakian_slice" start_time="1386765700" duration="10">
-       <node component_id="urn:publicid:IDN+iotlab+node+node2.devlille.senslab.info"/>
-       <node component_id="urn:publicid:IDN+iotlab+node+node5.devlille.senslab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info"/>
  </lease>
 </RSpec>

diff --git a/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_all.rspec b/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_all.rspec
index aa1d3b5..a830276 100644 (file)
--- a/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_all.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_all.rspec
@@ -14,23 +14,23 @@
     </lease>
   </network>
   <network name="iotlab">
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node5.devlille.senslab.info" boot_state="Alive" component_name="node5.devlille.iotlab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
-      <hostname>node5.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info" boot_state="Alive" component_name="node5.devlille.iotlab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
+      <hostname>wsn430-12.devlille.iot-lab.info.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
       <sliver/>
     </node>
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node2.devlille.senslab.info" boot_state="Alive" component_name="node2.devlille.senslab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
-      <hostname>node2.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info" boot_state="Alive" component_name="a8-11.devgrenoble.iot-lab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
+      <hostname>a8-11.devgrenoble.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
       <sliver/>
     </node>
     <lease slice_id="urn:publicid:IDN+firexp:flab+slice+iotlab_slice" start_time="1412938800" duration="60">
-       <node component_id="urn:publicid:IDN+iotlab+node+node2.devlille.senslab.info"/>
-       <node component_id="urn:publicid:IDN+iotlab+node+node5.devlille.senslab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info"/>
     </lease>
   </network>
 </RSpec>

diff --git a/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_iotlab.rspec b/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_iotlab.rspec
index 93719f6..344865c 100644 (file)
--- a/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_iotlab.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_iotlab.rspec
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <RSpec type="SFA" expires="2013-02-27T15:14:10Z" generated="2013-02-27T14:14:10Z">
   <network name="iotlab">
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node5.devlille.senslab.info" boot_state="Alive" component_name="node5.devlille.iotlab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
-      <hostname>node5.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info" boot_state="Alive" component_name="node5.devlille.iotlab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
+      <hostname>wsn430-12.devlille.iot-lab.info.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="1"/>
       <sliver/>
     </node>
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node2.devlille.senslab.info" boot_state="Alive" component_name="node2.devlille.senslab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
-      <hostname>node2.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info" boot_state="Alive" component_name="a8-11.devgrenoble.iot-lab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
+      <hostname>a8-11.devgrenoble.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="1"/>
@@ -17,7 +17,7 @@
     </node>
   </network>
  <lease slice_id="urn:publicid:IDN+firexp:flab+slice+iotlab_slice" start_time="1405078900" duration="600">
-       <node component_id="urn:publicid:IDN+iotlab+node+node2.devlille.senslab.info"/>
-       <node component_id="urn:publicid:IDN+iotlab+node+node5.devlille.senslab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info"/>
  </lease>
 </RSpec>

diff --git a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_all.rspec b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_all.rspec
index bc0f78b..41d3b34 100644 (file)
--- a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_all.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_all.rspec
@@ -14,23 +14,23 @@
     </lease>
   </network>
   <network name="iotlab">
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node5.devlille.senslab.info" boot_state="Alive" component_name="node5.devlille.iotlab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
-      <hostname>node5.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info" boot_state="Alive" component_name="node5.devlille.iotlab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
+      <hostname>wsn430-12.devlille.iot-lab.info.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
       <sliver/>
     </node>
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node2.devlille.senslab.info" boot_state="Alive" component_name="node2.devlille.senslab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
-      <hostname>node2.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info" boot_state="Alive" component_name="a8-11.devgrenoble.iot-lab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
+      <hostname>a8-11.devgrenoble.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
       <sliver/>
     </node>
     <lease slice_id="urn:publicid:IDN+iotlab+slice+avakian_slice" start_time="1410346800" duration="60">
-       <node component_id="urn:publicid:IDN+iotlab+node+node2.devlille.senslab.info"/>
-       <node component_id="urn:publicid:IDN+iotlab+node+node5.devlille.senslab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info"/>
     </lease>
   </network>
 </RSpec>

diff --git a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec
index 20e50b5..b3094cb 100644 (file)
--- a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <RSpec type="SFA" expires="2013-02-27T15:14:10Z" generated="2013-02-27T14:14:10Z">
   <network name="iotlab">
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node5.devlille.senslab.info" boot_state="Alive" component_name="node5.devlille.senslab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
-      <hostname>node5.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info" boot_state="Alive" component_name="wsn430-12.devlille.iot-lab.info.info" site_id="urn:publicid:IDN+senslab+authority+sa">
+      <hostname>wsn430-12.devlille.iot-lab.info.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
       <sliver/>
     </node>
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node2.devlille.senslab.info" boot_state="Alive" component_name="node2.devlille.senslab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
-      <hostname>node2.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info" boot_state="Alive" component_name="a8-11.devgrenoble.iot-lab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
+      <hostname>a8-11.devgrenoble.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
@@ -17,7 +17,7 @@
     </node>
   </network>
  <lease slice_id="urn:publicid:IDN+iotlab+slice+sandrine_slice" start_time="1405078836" duration="20">
-       <node component_id="urn:publicid:IDN+iotlab+node+node2.devlille.senslab.info"/>
-       <node component_id="urn:publicid:IDN+iotlab+node+node5.devlille.senslab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info"/>
  </lease>
 </RSpec>

diff --git a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab2.rspec b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab2.rspec
index c885111..1186d45 100644 (file)
--- a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab2.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab2.rspec
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <RSpec type="SFA" expires="2013-02-27T15:14:10Z" generated="2013-02-27T14:14:10Z">
   <network name="iotlab">
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node11.devlille.senslab.info" boot_state="Alive" component_name="node5.devlille.senslab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
-      <hostname>node11.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-8.devlille.iot-lab.info" boot_state="Alive" component_name="wsn430-12.devlille.iot-lab.info.info" site_id="urn:publicid:IDN+senslab+authority+sa">
+      <hostname>wsn430-8.devlille.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="600"/>
       <sliver/>
     </node>
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node12.devlille.senslab.info" boot_state="Alive" component_name="node2.devlille.senslab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
-      <hostname>node12.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-5.devlille.iot-lab.info" boot_state="Alive" component_name="a8-11.devgrenoble.iot-lab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
+      <hostname>wsn430-5.devlille.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="600"/>
@@ -28,8 +28,8 @@
       <sliver/>
     </node>
      <lease slice_id="urn:publicid:IDN+iotlab+slice+avakian_slice" start_time="1405078900" duration="10">
-       <node component_id="urn:publicid:IDN+iotlab+node+node12.devlille.senslab.info"/>
-       <node component_id="urn:publicid:IDN+iotlab+node+node11.devlille.senslab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+wsn430-5.devlille.iot-lab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+wsn430-8.devlille.iot-lab.info"/>
     </lease>
  </network>
 </RSpec>

diff --git a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_plab.rspec b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_plab.rspec
index 3bf9373..6bdccf7 100644 (file)
--- a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_plab.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_plab.rspec
@@ -7,7 +7,7 @@
       <granularity grain="3600"/>
       <interface component_id="urn:publicid:IDN+plab+interface+node2:eth0" ipv4="138.96.116.135"/>
       <hrn>planetlab.test.plab.effet</hrn>
-      <sliver/>        
+      <sliver/>
     </node>
   </network>
  <lease slice_id="urn:publicid:IDN+iotlab+slice+avakian_slice" start_time="1405080000" duration="2">

diff --git a/testbeds/iotlab/tests/tests_rspecs/iotlab_user_slice_iotlab.rspec b/testbeds/iotlab/tests/tests_rspecs/iotlab_user_slice_iotlab.rspec
index 75b1fdb..f09811a 100644 (file)
--- a/testbeds/iotlab/tests/tests_rspecs/iotlab_user_slice_iotlab.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/iotlab_user_slice_iotlab.rspec
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <RSpec type="SFA" expires="2013-02-27T15:14:10Z" generated="2013-02-27T14:14:10Z">
   <network name="iotlab">
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node11.devlille.senslab.info" boot_state="Alive" component_name="node5.devlille.senslab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
-      <hostname>node11.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-8.devlille.iot-lab.info" boot_state="Alive" component_name="wsn430-12.devlille.iot-lab.info.info" site_id="urn:publicid:IDN+senslab+authority+sa">
+      <hostname>wsn430-8.devlille.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="600"/>
       <sliver/>
     </node>
-    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+node12.devlille.senslab.info" boot_state="Alive" component_name="node2.devlille.senslab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
-      <hostname>node12.devlille.senslab.info</hostname>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-5.devlille.iot-lab.info" boot_state="Alive" component_name="a8-11.devgrenoble.iot-lab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
+      <hostname>wsn430-5.devlille.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="600"/>
@@ -17,8 +17,8 @@
     </node>
   </network>
  <lease slice_id="urn:publicid:IDN+iotlab+slice+user_slice" start_time="1405078900" duration="601">
-       <node component_id="urn:publicid:IDN+iotlab+node+node12.devlille.senslab.info"/>
-       <node component_id="urn:publicid:IDN+iotlab+node+node11.devlille.senslab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+wsn430-5.devlille.iot-lab.info"/>
+       <node component_id="urn:publicid:IDN+iotlab+node+wsn430-8.devlille.iot-lab.info"/>
  </lease>