diff --git a/tests/17-tun-rpl-br/07-native-border-router-cooja.csc b/tests/17-tun-rpl-br/07-native-border-router-cooja.csc
new file mode 100644
index 000000000..7c214070f
--- /dev/null
+++ b/tests/17-tun-rpl-br/07-native-border-router-cooja.csc
@@ -0,0 +1,255 @@
+
+
+ [APPS_DIR]/mrm
+ [APPS_DIR]/mspsim
+ [APPS_DIR]/avrora
+ [APPS_DIR]/serial_socket
+ [APPS_DIR]/collect-view
+ [APPS_DIR]/powertracker
+
+ My simulation
+ 1.0
+ 123456
+ 1000000
+
+ org.contikios.cooja.radiomediums.UDGM
+ 50.0
+ 100.0
+ 1.0
+ 1.0
+
+
+ 40000
+
+
+ org.contikios.cooja.contikimote.ContikiMoteType
+ mtype295
+ Cooja Mote Type #1
+
+ make TARGET=cooja clean
+make -j slip-radio.cooja TARGET=cooja
+ org.contikios.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Battery
+ org.contikios.cooja.contikimote.interfaces.ContikiVib
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiRS232
+ org.contikios.cooja.contikimote.interfaces.ContikiBeeper
+ org.contikios.cooja.interfaces.RimeAddress
+ org.contikios.cooja.contikimote.interfaces.ContikiIPAddress
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiButton
+ org.contikios.cooja.contikimote.interfaces.ContikiPIR
+ org.contikios.cooja.contikimote.interfaces.ContikiClock
+ org.contikios.cooja.contikimote.interfaces.ContikiLED
+ org.contikios.cooja.contikimote.interfaces.ContikiCFS
+ org.contikios.cooja.contikimote.interfaces.ContikiEEPROM
+ org.contikios.cooja.interfaces.Mote2MoteRelations
+ org.contikios.cooja.interfaces.MoteAttributes
+ false
+
+
+ org.contikios.cooja.contikimote.ContikiMoteType
+ mtype686
+ Cooja Mote Type #2
+
+ make TARGET=cooja clean
+make -j hello-world.cooja TARGET=cooja
+ org.contikios.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Battery
+ org.contikios.cooja.contikimote.interfaces.ContikiVib
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiRS232
+ org.contikios.cooja.contikimote.interfaces.ContikiBeeper
+ org.contikios.cooja.interfaces.RimeAddress
+ org.contikios.cooja.contikimote.interfaces.ContikiIPAddress
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiButton
+ org.contikios.cooja.contikimote.interfaces.ContikiPIR
+ org.contikios.cooja.contikimote.interfaces.ContikiClock
+ org.contikios.cooja.contikimote.interfaces.ContikiLED
+ org.contikios.cooja.contikimote.interfaces.ContikiCFS
+ org.contikios.cooja.contikimote.interfaces.ContikiEEPROM
+ org.contikios.cooja.interfaces.Mote2MoteRelations
+ org.contikios.cooja.interfaces.MoteAttributes
+ false
+
+
+
+ org.contikios.cooja.interfaces.Position
+ 54.36775767371176
+ 24.409055040864118
+ 0.0
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+ 1
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
+ 250.0
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiEEPROM
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+
+ mtype295
+
+
+
+ org.contikios.cooja.interfaces.Position
+ 83.54989222799365
+ 52.63050856506214
+ 0.0
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+ 2
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
+ 250.0
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiEEPROM
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+
+ mtype686
+
+
+
+ org.contikios.cooja.interfaces.Position
+ 108.91767775240822
+ 78.59778809170032
+ 0.0
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+ 3
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
+ 250.0
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiEEPROM
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+
+ mtype686
+
+
+
+ org.contikios.cooja.interfaces.Position
+ 139.91021061864723
+ 98.34190023350419
+ 0.0
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+ 4
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
+ 250.0
+
+
+ org.contikios.cooja.contikimote.interfaces.ContikiEEPROM
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+
+ mtype686
+
+
+
+ org.contikios.cooja.plugins.SimControl
+ 280
+ 1
+ 160
+ 400
+ 0
+
+
+ org.contikios.cooja.plugins.Visualizer
+
+ true
+ org.contikios.cooja.plugins.skins.UDGMVisualizerSkin
+ org.contikios.cooja.plugins.skins.IDVisualizerSkin
+ 1.9798610460263038 0.0 0.0 1.9798610460263038 -61.112037797038525 -1.2848438586294648
+
+ 400
+ 4
+ 400
+ 1
+ 1
+
+
+ org.contikios.cooja.plugins.LogListener
+
+ ID:4
+
+
+
+ 1404
+ 2
+ 240
+ 400
+ 160
+
+
+ org.contikios.cooja.plugins.TimeLine
+
+ 0
+ 1
+ 2
+ 3
+
+
+
+ 500.0
+
+ 1804
+ 6
+ 166
+ 0
+ 753
+
+
+ org.contikios.cooja.plugins.Notes
+
+ Enter notes here
+ true
+
+ 1124
+ 5
+ 160
+ 680
+ 0
+
+
+ org.contikios.cooja.serialsocket.SerialSocketServer
+ 0
+
+ 60001
+ true
+
+ 362
+ 3
+ 116
+ 13
+ 414
+
+
+ org.contikios.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 0
+ 700
+ 1037
+ 40
+
+
diff --git a/tests/17-tun-rpl-br/07-native-border-router-cooja.sh b/tests/17-tun-rpl-br/07-native-border-router-cooja.sh
new file mode 100755
index 000000000..d5d2642fe
--- /dev/null
+++ b/tests/17-tun-rpl-br/07-native-border-router-cooja.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Contiki directory
+CONTIKI=$1
+
+# Simulation file
+BASENAME=07-native-border-router-cooja
+
+bash test-nbr.sh $CONTIKI $BASENAME fd00::204:4:4:4
diff --git a/tests/17-tun-rpl-br/07-native-border-router-sky.csc b/tests/17-tun-rpl-br/07-native-border-router-sky.csc
deleted file mode 100644
index 22e1fbf9d..000000000
--- a/tests/17-tun-rpl-br/07-native-border-router-sky.csc
+++ /dev/null
@@ -1,235 +0,0 @@
-
-
- [APPS_DIR]/mrm
- [APPS_DIR]/mspsim
- [APPS_DIR]/avrora
- [APPS_DIR]/serial_socket
- [APPS_DIR]/collect-view
- [APPS_DIR]/powertracker
-
- My simulation
- 1.0
- 123456
- 1000000
-
- org.contikios.cooja.radiomediums.UDGM
- 50.0
- 100.0
- 1.0
- 1.0
-
-
- 40000
-
-
- org.contikios.cooja.mspmote.SkyMoteType
- sky1
- Sky Mote Type #sky1
-
- make clean TARGET=sky
-make -j slip-radio.sky TARGET=sky
- [CONTIKI_DIR]/examples/slip-radio/slip-radio.sky
- org.contikios.cooja.interfaces.Position
- org.contikios.cooja.interfaces.RimeAddress
- org.contikios.cooja.interfaces.IPAddress
- org.contikios.cooja.interfaces.Mote2MoteRelations
- org.contikios.cooja.interfaces.MoteAttributes
- org.contikios.cooja.mspmote.interfaces.MspClock
- org.contikios.cooja.mspmote.interfaces.MspMoteID
- org.contikios.cooja.mspmote.interfaces.SkyButton
- org.contikios.cooja.mspmote.interfaces.SkyFlash
- org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.Msp802154Radio
- org.contikios.cooja.mspmote.interfaces.MspSerial
- org.contikios.cooja.mspmote.interfaces.SkyLED
- org.contikios.cooja.mspmote.interfaces.MspDebugOutput
- org.contikios.cooja.mspmote.interfaces.SkyTemperature
-
-
- org.contikios.cooja.mspmote.SkyMoteType
- sky2
- Sky Mote Type #sky2
-
- make clean TARGET=sky
-make -j hello-world.sky TARGET=sky
- [CONTIKI_DIR]/examples/hello-world/hello-world.sky
- org.contikios.cooja.interfaces.Position
- org.contikios.cooja.interfaces.RimeAddress
- org.contikios.cooja.interfaces.IPAddress
- org.contikios.cooja.interfaces.Mote2MoteRelations
- org.contikios.cooja.interfaces.MoteAttributes
- org.contikios.cooja.mspmote.interfaces.MspClock
- org.contikios.cooja.mspmote.interfaces.MspMoteID
- org.contikios.cooja.mspmote.interfaces.SkyButton
- org.contikios.cooja.mspmote.interfaces.SkyFlash
- org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.Msp802154Radio
- org.contikios.cooja.mspmote.interfaces.MspSerial
- org.contikios.cooja.mspmote.interfaces.SkyLED
- org.contikios.cooja.mspmote.interfaces.MspDebugOutput
- org.contikios.cooja.mspmote.interfaces.SkyTemperature
-
-
-
-
- org.contikios.cooja.interfaces.Position
- -24.750327773354453
- 17.688901393447438
- 0.0
-
-
- org.contikios.cooja.mspmote.interfaces.MspClock
- 1.0
-
-
- org.contikios.cooja.mspmote.interfaces.MspMoteID
- 1
-
- sky1
-
-
-
-
- org.contikios.cooja.interfaces.Position
- 1.091493067677618
- 40.943504236660225
- 0.0
-
-
- org.contikios.cooja.mspmote.interfaces.MspClock
- 1.0
-
-
- org.contikios.cooja.mspmote.interfaces.MspMoteID
- 2
-
- sky2
-
-
-
-
- org.contikios.cooja.interfaces.Position
- 22.647678967805337
- 61.6365018442491
- 0.0
-
-
- org.contikios.cooja.mspmote.interfaces.MspClock
- 1.0
-
-
- org.contikios.cooja.mspmote.interfaces.MspMoteID
- 3
-
- sky2
-
-
-
-
- org.contikios.cooja.interfaces.Position
- 44.02005813888037
- 93.02398317771755
- 0.0
-
-
- org.contikios.cooja.mspmote.interfaces.MspClock
- 1.0
-
-
- org.contikios.cooja.mspmote.interfaces.MspMoteID
- 4
-
- sky2
-
-
-
- org.contikios.cooja.plugins.SimControl
- 280
- 1
- 160
- 400
- 0
-
-
- org.contikios.cooja.plugins.Visualizer
-
- true
- org.contikios.cooja.plugins.skins.IDVisualizerSkin
- org.contikios.cooja.plugins.skins.UDGMVisualizerSkin
- 2.3610941331949244 0.0 0.0 2.3610941331949244 119.38219749746548 -4.52452305190821
-
- 400
- 3
- 400
- 1
- 1
-
-
- org.contikios.cooja.plugins.LogListener
-
-
-
-
-
- 1404
- 6
- 240
- 400
- 160
-
-
- org.contikios.cooja.plugins.TimeLine
-
- 0
- 1
- 2
- 3
-
-
-
- 500.0
-
- 1804
- 5
- 166
- 0
- 742
-
-
- org.contikios.cooja.plugins.Notes
-
- Enter notes here
- true
-
- 1124
- 4
- 160
- 680
- 0
-
-
- org.contikios.cooja.serialsocket.SerialSocketServer
- 0
-
- 60001
- true
-
- 362
- 2
- 116
- 30
- 403
-
-
- org.contikios.cooja.plugins.ScriptRunner
-
-
- true
-
- 600
- 0
- 700
- 850
- 13
-
-
diff --git a/tests/17-tun-rpl-br/07-native-border-router-sky.sh b/tests/17-tun-rpl-br/07-native-border-router-sky.sh
deleted file mode 100755
index b986b3fce..000000000
--- a/tests/17-tun-rpl-br/07-native-border-router-sky.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Contiki directory
-CONTIKI=$1
-
-# Simulation file
-BASENAME=07-native-border-router-sky
-
-bash test-nbr.sh $CONTIKI $BASENAME fd02::0212:7202:0002:0202
diff --git a/tests/17-tun-rpl-br/test-nbr.sh b/tests/17-tun-rpl-br/test-nbr.sh
index fdb4b191c..63862a656 100644
--- a/tests/17-tun-rpl-br/test-nbr.sh
+++ b/tests/17-tun-rpl-br/test-nbr.sh
@@ -9,6 +9,9 @@ BASENAME=$2
# Destination IPv6
IPADDR=$3
+# ICMP request-reply count
+COUNT=5
+
# Start simulation
echo "Starting Cooja simulation $BASENAME.csc"
java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -contiki=$CONTIKI > $BASENAME.coojalog &
@@ -20,17 +23,17 @@ sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
# Connect to the simlation
echo "Starting native border-router"
-make -C $CONTIKI/examples/rpl-border-router/
-sudo $CONTIKI/examples/rpl-border-router/border-router.native -B 115200 -a localhost fd02::1/64 >> $BASENAME.nbr.log 2>&1 &
+nohup make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=native >> $BASENAME.nbr.log 2>&1 &
MPID=$!
echo "Waiting for network formation"
-sleep 50
+sleep 60 # runs in real time so we need to wait a bit
# Do ping
echo "Pinging"
-ping6 $IPADDR -s 10 -c 5 | tee $BASENAME.scriptlog
+ping6 $IPADDR -c $COUNT | tee $BASENAME.scriptlog
# Fetch ping6 status code (not $? because this is piped)
STATUS=${PIPESTATUS[0]}
+REPLIES=`grep -c 'icmp_seq=' $BASENAME.scriptlog`
echo "Closing simulation and nbr"
sleep 1
@@ -40,7 +43,7 @@ sleep 1
rm COOJA.testlog
rm COOJA.log
-if [ $STATUS -eq 0 ] ; then
+if [ $STATUS -eq 0 ] && [ $REPLIES -eq $COUNT ] ; then
printf "%-32s TEST OK\n" "$BASENAME" | tee $BASENAME.testlog;
else
echo "==== $BASENAME.coojalog ====" ; cat $BASENAME.coojalog;