Commit c15cbfc3 authored by Federico Sismondi's avatar Federico Sismondi
Browse files

Merge branch 'enhacements' into 'develop'

Enhacements

See merge request !103
parents 74e0c85a 5e60b531
Pipeline #3115 failed with stage
in 0 seconds
......@@ -699,7 +699,7 @@ if(env.JOB_NAME =~ 'ioppytest-coap-implementation-continuous-testing-4/'){
}
}
stage("CONT_INTEROP_TESTS_3: Build docker images."){
stage("CONT_INTEROP_TESTS_4: Build docker images."){
gitlabCommitStatus("BUILD CoAP docker images") {
sh '''
sudo -E docker build --quiet -t automated_iut-coap_server-californium -f automation/coap_server_californium/Dockerfile .
......
......@@ -39,51 +39,52 @@ All interactions between components take place using the AMQP event bus
(AMQP pub/sub mechanism)
```
+----------------------------+ +----------------------------+ +----------------------------+
| | | | | |
| ioppytest Test Tool | | User Interface | | User Interface |
|(CoAP, 6LoWPAN, OneM2M, etc)| | (user 1) | | (user 2) |
| | | | | |
| | | | | |
+----------------------------+ +----------------------------+ +----------------------------+
^ + ^ + ^ +
| | | | | |
| | | | | |
| | | | | |
fromAgent.agent_x.tun.packet | | toAgent.agent_y.tun.packet | | ui.user1.step_verify.reply | |
| | | | | |
fromAgent.agent_y.tun.packet | | toAgent.agent_x.tun.packet | | | |
| | | | | |
| | ui.user1.step_verify.request | | | |
+ v + v + v
+------------------------------------------------------------------------------------------------------------------------------------------------>
AMQP Event Bus
<-------------------------------------------------------------------------------------------------------------------------------------------------+
+ ^ + ^
| | toAgent.agent_x.tun.packetet | | fromAgent.agent_y.tun.packet
data.tun.toAgent.agent_x | | | |
| | toAgent.agent_y.tun.packet| |
v | v |
PC +------------+-----+-------------+ +-----------+-----+--------------+
user 1 | | | |
| Agent (agent_x) | | Agent (agent_y) |
| (tun mode) | | (tun mode) |
| | | |
| | | |
| +-----+tun interface+-------+ | | +-----+tun interface+-------+ |
| | | |
| +----------------------------+ | | +----------------------------+ |
| | IPv6+based | | | | IPv6+based | |
| | communicating | | | | communicating | |
| | piece of software | | | | piece of software | |
| | (e.g. coap client) | | | | (e.g. coap server) | |
| | | | | | | |
| +----------------------------+ | | +----------------------------+ |
| | | |
+--------------------------------+ +--------------------------------+
+----------------------------+
| |
| ioppytest Test Tool |
|(CoAP, 6LoWPAN, OneM2M, etc)|
| |
| |
+----------------------------+
^ +
| |
| |
| |
packet.fromAgent.agent_x| | packet.toAgent_agent_y
| |
packet.fromAgent.agent_x| | packet.toAgent_agent_y
| |
ui.user_1.reply | | ui.user_1.request
+ v
+------------------------------------------------------------------------------------------------------------------------------------------------>
AMQP Event Bus
<-------------------------------------------------------------------------------------------------------------------------------------------------+
| ^ ^ | | ^ ^ |
| | packet.fromAgent.agent_x | | packet.toAgent_agent_x | | packet.fromAgent.agent_y | | packet.toAgent_agent_y
ui.user_1| | | | | | | |
.request| | ui.user_1.reply | | ui.user_2.request| | ui.user_2.reply | |
| | | | | | | |
| | | v | | | v
+-------v-------------+ +--------------------------------+ +-------v-------------+ +--------------------------------+
| | | +---------------------------+ | | | | +---------------------------+ |
| User Interface | | | Agent (agent_x) | | | User Interface | | | Agent (agent_y) | |
| (user 1) | | | (tun mode) | | | (user 2) | | | (tun mode) | |
| | | +---------------------------+ | | | | +---------------------------+ |
+---------------------+ | | +---------------------+ | |
| +-----+tun interface+-------+ | | +-----+tun interface+-------+ |
| | | |
| +----------------------------+ | | +----------------------------+ |
| | Implementation under test | | | | Implementation under test | |
| | using IP | | | | using IP | |
| | (e.g. coapoclient) | | | | (e.g. coaposerver) | |
| +----------------------------+ | | +----------------------------+ |
+--------------------------------+ +--------------------------------+
```
Event Bus API:
......
......@@ -28,7 +28,9 @@ command = ioppytest-agent connect
user=root
stopsignal=INT
stopasgroup=true
autorestart=false
autorestart=true
startretries=3
startsecs=5
loglevel=debug
; for sending logs to docker
stdout_logfile=/dev/stdout
......
......@@ -28,7 +28,9 @@ command = ioppytest-agent connect
user=root
stopsignal=INT
stopasgroup=true
autorestart=false
autorestart=true
startretries=3
startsecs=5
loglevel=debug
; for sending logs to docker
stdout_logfile=/dev/stdout
......
......@@ -28,7 +28,9 @@ command = ioppytest-agent connect
user=root
stopsignal=INT
stopasgroup=true
autorestart=false
autorestart=true
startretries=3
startsecs=5
loglevel=debug
; for sending logs to docker
stdout_logfile=/dev/stdout
......
......@@ -28,7 +28,9 @@ command = ioppytest-agent connect
user=root
stopsignal=INT
stopasgroup=true
autorestart=false
autorestart=true
startretries=3
startsecs=5
loglevel=debug
; for sending logs to docker
stdout_logfile=/dev/stdout
......
......@@ -28,7 +28,9 @@ command = ioppytest-agent connect
user=root
stopsignal=INT
stopasgroup=true
autorestart=false
autorestart=true
startretries=3
startsecs=5
loglevel=debug
; for sending logs to docker
stdout_logfile=/dev/stdout
......
......@@ -28,7 +28,9 @@ command = ioppytest-agent connect
user=root
stopsignal=INT
stopasgroup=true
autorestart=false
autorestart=true
startretries=3
startsecs=5
loglevel=debug
; for sending logs to docker
stdout_logfile=/dev/stdout
......
......@@ -28,7 +28,9 @@ command = ioppytest-agent connect
user=root
stopsignal=INT
stopasgroup=true
autorestart=false
autorestart=true
startretries=3
startsecs=5
loglevel=debug
; for sending logs to docker
stdout_logfile=/dev/stdout
......
......@@ -28,7 +28,9 @@ command = ioppytest-agent connect
user=root
stopsignal=INT
stopasgroup=true
autorestart=false
autorestart=true
startretries=3
startsecs=5
loglevel=debug
; for sending logs to docker
stdout_logfile=/dev/stdout
......
......@@ -28,7 +28,9 @@ command = ioppytest-agent connect
user=root
stopsignal=INT
stopasgroup=true
autorestart=false
autorestart=true
startretries=3
startsecs=5
loglevel=debug
; for sending logs to docker
stdout_logfile=/dev/stdout
......
......@@ -28,7 +28,9 @@ command = ioppytest-agent connect
user=root
stopsignal=INT
stopasgroup=true
autorestart=false
autorestart=true
startretries=3
startsecs=5
loglevel=debug
; for sending logs to docker
stdout_logfile=/dev/stdout
......
......@@ -61,7 +61,9 @@ stderr_logfile_maxbytes=0
;user=root
;stopsignal=INT
;stopasgroup=true
;autorestart=false
;autorestart=true
;startretries=3
;startsecs=5
;loglevel=debug
;redirect_stderr=true
;stdout_logfile = /var/log/agent-stdout.log
......
......@@ -58,7 +58,9 @@ stdout_logfile_backups = 5
;user=root
;stopsignal=INT
;stopasgroup=true
;autorestart=false
;autorestart=true
;startretries=3
;startsecs=5
;loglevel=debug
;redirect_stderr=true
;stdout_logfile = /var/log/agent-stdout.log
......
......@@ -349,8 +349,15 @@ class Coordinator(CoordinatorAmqpInterface):
else:
error_msg += 'Response from Test Analyzer NOK: %s' % repr(tat_response)
logger.warning(error_msg)
gen_verdict = 'error'
gen_description = error_msg
# generate verdict and verdict description
try:
gen_description = tat_response.error_code
gen_verdict = 'inconclusive'
except AttributeError:
gen_description = error_msg
gen_verdict = 'error'
report = []
else:
error_msg += 'Error encountered with packet sniffer: %s' % repr(sniffer_response)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment