git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
44e12bf
)
Correction node names.
author
Sandrine Avakian
<sandrine.avakian@inria.fr>
Tue, 15 Oct 2013 10:04:55 +0000
(12:04 +0200)
committer
Sandrine Avakian
<sandrine.avakian@inria.fr>
Tue, 15 Oct 2013 10:04:55 +0000
(12:04 +0200)
testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_all.rspec
patch
|
blob
|
history
testbeds/iotlab/tests/tests_rspecs/firexp_iotlab_slice_iotlab.rspec
patch
|
blob
|
history
testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_all.rspec
patch
|
blob
|
history
testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec
patch
|
blob
|
history
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
7118d7f
..
c2e2558
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,8
+14,8
@@
</lease>
</network>
<network name="iotlab">
</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"/>
<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>
<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>
</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
344865c
..
8bb3aee
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,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">
<?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"/>
<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"/>
</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>
</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
d8adab6
..
2feb7bc
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,8
+14,8
@@
</lease>
</network>
<network name="iotlab">
</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"/>
<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>
<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>
</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
b3094cb
..
dd58205
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,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">
<?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"/>
<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"/>
</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>
</lease>
</RSpec>