From 3bba0c58952519ce5051198d569c40eb6b03e3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= <gaetan.harter@fu-berlin.de>
Date: Tue, 24 Apr 2018 17:02:31 +0200
Subject: [PATCH] makefile.iotlab.single: add IoT-LAB testbed support for one
node
Add support to do flash/reset/term on an IoT-LAB node.
It also allow running test using 'testrunner'.
Configuration variables are:
* `IOTLAB_NODE` which should be set to your node url
* The full url including site to use from your computer `m3-1.grenoble.iot-lab.info`
* The short url when used on the IoT-LAB frontend `m3-1`
* `IOTLAB_EXP_ID` for your experiment id for flash and reset.
By default it tries to use your currently running experiment if you have only one
* `IOTLAB_USER`: is read from `${HOME}/.iotlabrc` as saved by `iotlab-auth`
* It is expected to have run `iotlab-auth` beforehand.
---
Makefile.include | 4 +
.../makefile.iotlab.single.inc.mk | 134 ++++++++++++++++++
dist/testbed-support/requirements.txt | 2 +
3 files changed, 140 insertions(+)
create mode 100644 dist/testbed-support/makefile.iotlab.single.inc.mk
create mode 100644 dist/testbed-support/requirements.txt
diff --git a/Makefile.include b/Makefile.include
index 7736b8dde5..5f7abb1fc0 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -595,6 +595,10 @@ ifneq (,$(filter iotlab-m3 wsn430-v1_3b wsn430-v1_4,$(BOARD)))
include $(RIOTBASE)/dist/testbed-support/Makefile.iotlab
endif
endif
+ifneq (,$(IOTLAB_NODE))
+ # iot-lab serial and flasher
+ include $(RIOTBASE)/dist/testbed-support/makefile.iotlab.single.inc.mk
+endif
# Include desvirt Makefile
include $(RIOTTOOLS)/desvirt/Makefile.desvirt
diff --git a/dist/testbed-support/makefile.iotlab.single.inc.mk b/dist/testbed-support/makefile.iotlab.single.inc.mk
new file mode 100644
index 0000000000..135e263eb4
--- /dev/null
+++ b/dist/testbed-support/makefile.iotlab.single.inc.mk
@@ -0,0 +1,134 @@
+# Use a single iot-lab node with RIOT
+# ===================================
+#
+# Supported:
+# * flash
+# * reset
+# * term
+#
+# Tested on m3/a8-m3/wsn430/samr21/arduino-zero nodes
+#
+# It can be run:
+# * From your computer by setting IOTLAB_NODE to the full url like
+# m3-380.grenoble.iot-lab.info or a8-1.grenoble.iot-lab.info
+# * From IoT-LAB frontend by setting IOTLAB_NODE to the short url like
+# m3-380 or a8-1
+#
+# # Usage
+#
+# make BOARD=iotlab-m3 IOTLAB_NODE=m3-380.grenoble.iot-lab.info flash term
+#
+# It is the user responsibility to start an experiment beforehand
+#
+# If the user has multiple running experiments, the one to use must be
+# configured with the `IOTLAB_EXP_ID` setting
+#
+# Prerequisites
+# -------------
+#
+# * Install iotlab-cli-tools: https://github.com/iot-lab/cli-tools
+# * Configure your account with 'iotlab-auth'
+# * Register your computer public key in your ssh keys list on your profile:
+# https://www.iot-lab.info/tutorials/configure-your-ssh-access/
+# * If using an A8 node from a frontend:
+# * Register the frontend public key in your ssh keys list on your profile.
+# https://www.iot-lab.info/tutorials/ssh-cli-client/
+#
+# Additional for A8 nodes
+#
+# * Install iotlab-ssh-cli-tools https://github.com/iot-lab/ssh-cli-tools
+
+ifeq (,$(IOTLAB_NODE))
+ $(warning IOTLAB_NODE undefined, it should be defined to:)
+ $(warning * <type>-<number>.<site>.iot-lab.info when run from your computer)
+ $(warning Example: m3-380.grenoble.iot-lab.info or a8-1.grenoble.iot-lab.info)
+ $(warning * <type>-<number> when run from iot-lab frontend)
+ $(warning Example: m3-380 or a8-1)
+ $(error)
+endif
+
+IOTLAB_AUTH ?= $(HOME)/.iotlabrc
+IOTLAB_USER ?= $(shell cut -f1 -d: $(IOTLAB_AUTH))
+
+# Optional Experiment id. Required when having multiple experiments
+IOTLAB_EXP_ID ?=
+
+# File to use for flashing
+IOTLAB_FLASHFILE ?= $(ELFFILE)
+
+# Specify experiment-id option if provided
+_IOTLAB_EXP_ID := $(if $(IOTLAB_EXP_ID),--id $(IOTLAB_EXP_ID))
+
+
+# If the IOTLAB_NODE format is:
+# * 'type-num.iot.lab.info' assume it is run from your computer
+# * 'type-num' assume it is run from iot-lab frontend
+ifneq (,$(filter %.iot-lab.info, $(IOTLAB_NODE)))
+ _IOTLAB_ON_FRONTEND =
+else
+ _IOTLAB_ON_FRONTEND = 1
+endif
+# Work with node url without 'node-'
+override IOTLAB_NODE := $(patsubst node-%,%,$(IOTLAB_NODE))
+
+
+# Create node list and optionally frontend url
+ifeq (,$(_IOTLAB_ON_FRONTEND))
+ # m3-380.grenoble.iot-lab.info -> grenoble,m3,380
+ # a8-1.grenoble.iot-lab.info -> grenoble,a8,1
+ _NODELIST_SED := 's/\([^.]*\)-\([^.]*\).\([^.]*\).*/\3,\1,\2/'
+ _IOTLAB_NODELIST := --list $(shell echo '$(IOTLAB_NODE)' | sed $(_NODELIST_SED))
+
+ # Remove the node type-number part
+ _IOTLAB_SERVER := $(shell echo '$(IOTLAB_NODE)' | sed 's/[^.]*.//')
+ _IOTLAB_AUTHORITY = $(IOTLAB_USER)@$(_IOTLAB_SERVER)
+else
+ # m3-380 -> $(hostname),m3,380
+ # a8-1 -> $(hostname),a8,1
+ _NODELIST_SED := 's/\([^.]*\)-\([^.]*\)/$(shell hostname),\1,\2/'
+ _IOTLAB_NODELIST := --list $(shell echo '$(IOTLAB_NODE)' | sed $(_NODELIST_SED))
+endif
+
+
+# Configure FLASHER, RESET, TERMPROG depending on BOARD and if on frontend
+ifneq (iotlab-a8-m3,$(BOARD))
+
+ # M3 and wsn430 nodes
+ FLASHER = iotlab-node
+ RESET = iotlab-node
+ FFLAGS = $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) --update $(IOTLAB_FLASHFILE)
+ RESET_FLAGS = $(_IOTLAB_EXP_ID) $(_IOTLAB_NODELIST) --reset
+
+ ifeq (,$(_IOTLAB_ON_FRONTEND))
+ TERMPROG = ssh
+ TERMFLAGS = -t $(_IOTLAB_AUTHORITY) 'socat - tcp:$(IOTLAB_NODE):20000'
+ else
+ TERMPROG = socat
+ TERMFLAGS = - tcp:$(IOTLAB_NODE):20000
+ endif
+
+else
+
+ # A8-M3 node
+ FLASHER = iotlab-ssh
+ RESET = iotlab-ssh
+ FFLAGS = $(_IOTLAB_EXP_ID) flash-m3 $(_IOTLAB_NODELIST) $(IOTLAB_FLASHFILE)
+ RESET_FLAGS = $(_IOTLAB_EXP_ID) reset-m3 $(_IOTLAB_NODELIST)
+
+ TERMPROG = ssh
+ ifeq (,$(_IOTLAB_ON_FRONTEND))
+ # Proxy ssh through the iot-lab frontend
+ TERMFLAGS = -oProxyCommand='ssh $(_IOTLAB_AUTHORITY) -W %h:%p'
+ else
+ # Empty existing RIOT TERMFLAGS
+ TERMFLAGS =
+ endif
+ TERMFLAGS += -oStrictHostKeyChecking=no -t root@node-$(IOTLAB_NODE) 'socat - open:/dev/ttyA8_M3,b$(BAUD),echo=0,raw'
+
+endif
+
+# Debugger not supported
+DEBUGGER =
+DEBUGGER_FLAGS =
+DEBUGSERVER =
+DEBUGSERVER_FLAGS =
diff --git a/dist/testbed-support/requirements.txt b/dist/testbed-support/requirements.txt
new file mode 100644
index 0000000000..74f90a6834
--- /dev/null
+++ b/dist/testbed-support/requirements.txt
@@ -0,0 +1,2 @@
+iotlabcli>=2.5.4
+iotlabsshcli>=0.2.3
--
GitLab