From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 15 Oct 2013 10:05:10 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: geni-v2-broken-and-discontinued~37
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0e92aab63fd6e2ab1d9106332b1cf5db1c39eea1;hp=be92c7e4f06c2dc155284e875fdb869812ff97e0;p=sfa.git

Merge branch 'master' of ssh://git.onelab.eu/git/sfa
---

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 7118d7f8..c2e25589 100644
--- a/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_all.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_all.rspec
@@ -14,8 +14,8 @@
     </lease>
   </network>
   <network name="iotlab">
-    <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+iotlab+authority+sa">
-      <hostname>wsn430-12.devlille.iot-lab.info.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" boot_state="Alive" component_name="wsn430-12.devlille.iot-lab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
+      <hostname>wsn430-12.devlille.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
@@ -30,7 +30,7 @@
     </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+a8-11.devgrenoble.iot-lab.info"/>
-	<node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info"/>
+	<node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.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 344865c3..8bb3aee6 100644
--- a/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_iotlab.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_iotlab.rspec
@@ -1,8 +1,8 @@
 <?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+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>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.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</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="1"/>
@@ -18,6 +18,6 @@
   </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+a8-11.devgrenoble.iot-lab.info"/>
-	<node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info.info"/>
+	<node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.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 d8adab6f..2feb7bc0 100644
--- a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_all.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_all.rspec
@@ -14,8 +14,8 @@
     </lease>
   </network>
   <network name="iotlab">
-    <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+iotlab+authority+sa">
-      <hostname>wsn430-12.devlille.iot-lab.info.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" boot_state="Alive" component_name="wsn430-12.devlille.iot-lab.info" site_id="urn:publicid:IDN+iotlab+authority+sa">
+      <hostname>wsn430-12.devlille.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
@@ -30,7 +30,7 @@
     </node>
     <lease slice_id="urn:publicid:IDN+iotlab+slice+avakian_slice" start_time="1410346800" duration="60">
 	<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"/>
+	<node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.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 b3094cbb..dd582056 100644
--- a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec
@@ -1,8 +1,8 @@
 <?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+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>
+    <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info" boot_state="Alive" component_name="wsn430-12.devlille.iot-lab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
+      <hostname>wsn430-12.devlille.iot-lab.info</hostname>
       <location country="France"/>
       <exclusive>TRUE</exclusive>
       <granularity grain="60"/>
@@ -18,6 +18,6 @@
   </network>
  <lease slice_id="urn:publicid:IDN+iotlab+slice+sandrine_slice" start_time="1405078836" duration="20">
 	<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"/>
+	<node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info"/>
  </lease>
 </RSpec>