Commit 1dde716c authored by Aurélien Delrieu's avatar Aurélien Delrieu

Merge branch 'dev' in order to release v5.1.0

 - Improve interconnection between access GW and Physical GW
 - Refactor the Physical layer block
 - Replace service id by platform name
 - Various other bugfixes and improvements
parents beedb6d9 38b66e62
2018-12-05 opensand-5.1.0
* Release 5.1.0
* Improve interconnection between access GW and Physical GW
* Refactor the Physical layer block
* Replace service id by platform name
* Various other bugfixes and improvements
2018-02-12 opensand-5.0.0
* Release 5.0.0
......
......@@ -10,7 +10,7 @@ After=systemd-journald-dev-log.socket
Type=forking
ExecStart=/bin/bash -c " SAND_COLLECTOR_TYPE=`echo 'get opensand-collector/service/type' | debconf-communicate | awk '{print $2}'` && \
SAND_COLLECTOR_IFACE=`echo 'get opensand-collector/service/interface' | debconf-communicate | awk '{print $2}'` && \
/usr/bin/sand-collector -i $SAND_COLLECTOR_IFACE -t $SAND_COLLECTOR_TYPE & "
/usr/bin/sand-collector -i $SAND_COLLECTOR_IFACE -t \"$SAND_COLLECTOR_TYPE\" & "
ExecStartPre=/bin/bash -c "mkdir -p /var/run/sand-collector && chown opensand /var/run/sand-collector"
[Install]
......
......@@ -7,7 +7,7 @@
# satellite telecommunication system for research and engineering activities.
#
#
# Copyright © 2017 TAS
# Copyright © 2018 TAS
#
#
# This file is part of the OpenSAND testbed.
......@@ -29,6 +29,7 @@
#
# Author: Vincent Duvert / Viveris Technologies <vduvert@toulouse.viveris.com>
# Author: Joaquin MUGUERZA <jmuguerza@toulouse.viveris.com>
"""
......@@ -50,6 +51,7 @@ import sys
LOGGER = logging.getLogger('sand-collector')
DEFAULT_SERVICE_TYPE = '_opensand._tcp'
def fail(message, *args):
......@@ -99,9 +101,9 @@ class OpenSandCollector(object):
"""
parser = OptionParser()
parser.set_defaults(debug=False, background=False, kill=False)
parser.add_option("-t", "--service_type", dest="service_type",
default='_opensand._tcp', action="store",
help="OpenSAND service type (default: _opensand._tcp)")
parser.add_option("-t", "--platform-id", dest="platform_id",
default='', action="store",
help="OpenSAND platform name")
parser.add_option("-i", "--iface", dest="iface",
default='', action="store",
help="Interface for service publishing (default: all)")
......@@ -123,10 +125,16 @@ class OpenSandCollector(object):
help="Kill a background collector instance")
(options, _args) = parser.parse_args()
service_type = options.service_type
platform_id = options.platform_id
iface = options.iface
pid_path = options.pid
# Service type
service_type = (
'_%s%s' % (platform_id, DEFAULT_SERVICE_TYPE) if platform_id
else DEFAULT_SERVICE_TYPE
)
# Logging configuration
if options.background or options.quiet:
log_handler = SysLogHandler('sand-collector', syslog.LOG_PID,
......
......@@ -7,7 +7,7 @@
# satellite telecommunication system for research and engineering activities.
#
#
# Copyright © 2017 TAS
# Copyright © 2018 TAS
#
#
# This file is part of the OpenSAND testbed.
......
......@@ -7,7 +7,7 @@
# satellite telecommunication system for research and engineering activities.
#
#
# Copyright © 2017 TAS
# Copyright © 2018 TAS
#
#
# This file is part of the OpenSAND testbed.
......
......@@ -7,7 +7,7 @@
# satellite telecommunication system for research and engineering activities.
#
#
# Copyright © 2017 TAS
# Copyright © 2018 TAS
#
#
# This file is part of the OpenSAND testbed.
......
......@@ -7,7 +7,7 @@
# satellite telecommunication system for research and engineering activities.
#
#
# Copyright © 2017 TAS
# Copyright © 2018 TAS
#
#
# This file is part of the OpenSAND testbed.
......
......@@ -7,7 +7,7 @@
# satellite telecommunication system for research and engineering activities.
#
#
# Copyright © 2017 TAS
# Copyright © 2018 TAS
#
#
# This file is part of the OpenSAND testbed.
......
......@@ -7,7 +7,7 @@
# satellite telecommunication system for research and engineering activities.
#
#
# Copyright © 2017 TAS
# Copyright © 2018 TAS
#
#
# This file is part of the OpenSAND testbed.
......
......@@ -7,7 +7,7 @@
# satellite telecommunication system for research and engineering activities.
#
#
# Copyright © 2017 TAS
# Copyright © 2018 TAS
#
#
# This file is part of the OpenSAND testbed.
......
......@@ -9,7 +9,7 @@ from setuptools import setup, find_packages
setup(
name="opensand-collector",
version="5.0.0",
version="5.1.0",
author="Vincent Duvert",
author_email="vduvert@toulouse.viveris.com",
description=("Statistics and events collector for OpenSAND platform"),
......
#!/bin/bash
# Process this file with autoconf to produce a configure script.
AC_INIT(opensand-conf, 5.0.0, [http://opensand.org])
AC_INIT(opensand-conf, 5.1.0, [http://opensand.org])
AC_CONFIG_SRCDIR([src])
AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE
......@@ -40,7 +40,7 @@ AC_SUBST(AM_CPPFLAGS, "$LIBXMLXX_CFLAGS")
PKG_PROG_PKG_CONFIG
# check for opensand-output library
PKG_CHECK_MODULES([OPENSAND_OUTPUT], [opensand_output = 5.0.0])
PKG_CHECK_MODULES([OPENSAND_OUTPUT], [opensand_output = 5.1.0])
LIBS="$OPENSAND_OUTPUT_LIBS $LIBS"
AC_SUBST(AM_CPPFLAGS, "$OPENSAND_OUTPUT_CFLAGS $AM_CPPFLAGS")
......
......@@ -4,7 +4,7 @@
* satellite telecommunication system for research and engineering activities.
*
*
* Copyright © 2017 TAS
* Copyright © 2018 TAS
*
*
* This file is part of the OpenSAND testbed.
......
......@@ -4,7 +4,7 @@
* satellite telecommunication system for research and engineering activities.
*
*
* Copyright © 2017 TAS
* Copyright © 2018 TAS
*
*
* This file is part of the OpenSAND testbed.
......
......@@ -4,7 +4,7 @@
* satellite telecommunication system for research and engineering activities.
*
*
* Copyright © 2017 TAS
* Copyright © 2018 TAS
*
*
* This file is part of the OpenSAND testbed.
......
......@@ -4,7 +4,7 @@
* satellite telecommunication system for research and engineering activities.
*
*
* Copyright © 2017 TAS
* Copyright © 2018 TAS
*
*
* This file is part of the OpenSAND testbed.
......
......@@ -4,7 +4,7 @@
* satellite telecommunication system for research and engineering activities.
*
*
* Copyright © 2017 TAS
* Copyright © 2018 TAS
*
*
* This file is part of the OpenSAND testbed.
......
......@@ -4,7 +4,7 @@
* satellite telecommunication system for research and engineering activities.
*
*
* Copyright © 2017 TAS
* Copyright © 2018 TAS
*
*
* This file is part of the OpenSAND testbed.
......
......@@ -4,7 +4,7 @@
* satellite telecommunication system for research and engineering activities.
*
*
* Copyright © 2017 TAS
* Copyright © 2018 TAS
*
*
* This file is part of the OpenSAND testbed.
......@@ -243,23 +243,16 @@
#define DOWNLINK_PHYSICAL_LAYER_SECTION "downlink_physical_layer"
#define PHYSICAL_LAYER_SECTION "physical_layer"
#define SAT_PHYSICAL_LAYER_SECTION "sat_physical_layer"
#define ENABLE "enable"
#define MODEL_LIST "models"
#define ATTENUATION_MODEL_TYPE "attenuation_model_type"
#define MINIMAL_CONDITION_TYPE "minimal_condition_type"
#define ERROR_INSERTION_TYPE "error_insertion_type"
#define CLEAR_SKY_CONDITION "clear_sky_condition"
#define MODCOD_DEF_S2 "modcod_def_s2"
#define FORWARD_DOWN_MODCOD_TIME_SERIES "forward_down_modcod_time_series"
#define MODCOD_DEF_RCS "modcod_def_rcs"
#define MODCOD_DEF_RCS2 "modcod_def_rcs2"
#define RETURN_UP_MODCOD_TIME_SERIES "return_up_modcod_time_series"
#define LOOP_ON_FILE "loop_on_file"
#define RETURN_UP_ACM_LOOP_MARGIN "return_up_acm_loop_margin"
#define FORWARD_DOWN_ACM_LOOP_MARGIN "forward_down_acm_loop_margin"
#define GENERATE_TIME_SERIES_PATH "generate_time_series_path"
#define ACM_PERIOD_REFRESH "acm_period_refresh"
......@@ -323,9 +316,23 @@
#define ADV_SECTION "advanced"
#define DELAY_BUFFER "delay_buffer"
#define DELAY_TIMER "delay_timer"
#define UDP_RMEM "udp_rmem"
#define UDP_WMEM "udp_wmem"
#define UDP_STACK "udp_stack"
#define SATCARRIER_UDP_RMEM "satcarrier_udp_rmem"
#define SATCARRIER_UDP_WMEM "satcarrier_udp_wmem"
#define SATCARRIER_UDP_STACK "satcarrier_udp_stack"
//////////////////////////
// interconnect //
//////////////////////////
#define INTERCONNECT_SECTION "interconnect"
#define INTERCONNECT_UPWARD_DATA_PORT "upward_data_port"
#define INTERCONNECT_UPWARD_SIG_PORT "upward_sig_port"
#define INTERCONNECT_DOWNWARD_DATA_PORT "downward_data_port"
#define INTERCONNECT_DOWNWARD_SIG_PORT "downward_sig_port"
#define INTERCONNECT_UDP_RMEM "interconnect_udp_rmem"
#define INTERCONNECT_UDP_WMEM "interconnect_udp_wmem"
#define INTERCONNECT_UDP_STACK "interconnect_udp_stack"
#define INTERCONNECT_UPPER_IP "upper_ip_address"
#define INTERCONNECT_LOWER_IP "lower_ip_address"
/////////////////
// Debug //
......@@ -345,4 +352,8 @@
// OTHERS //
/////////////
#define ENCODE_CNI_EXT "encodeCniExt"
#define UP "Up"
#define DOWN "Down"
#define UP_LOWER_CASE "up"
#define DOWN_LOWER_CASE "down"
#endif
......@@ -4,7 +4,7 @@
* satellite telecommunication system for research and engineering activities.
*
*
* Copyright © 2017 TAS
* Copyright © 2018 TAS
*
*
* This file is part of the OpenSAND testbed.
......
......@@ -8,7 +8,7 @@
# satellite telecommunication system for research and engineering activities.
#
#
# Copyright © 2017 TAS
# Copyright © 2018 TAS
#
#
# This file is part of the OpenSAND testbed.
......
......@@ -128,15 +128,6 @@
</slotted_aloha>
<!-- The physical layer configuration -->
<physical_layer>
<!-- enable the physical Layer (true/false) -->
<enable>false</enable>
<!-- the path where the emulated modcod are stored in time series files
when physical layer is enabled, in order to replay the scenario or
none to disable it. the filename will be
forward_down_time_series_spotid_gwid.txt
and return_up_time_series_spotid_gwid.txt
(ignored when physical layer is disabled) -->
<generate_time_series_path>none</generate_time_series_path>
<!-- how often do we refresh the adaptive physical layer scenario (ms) -->
<acm_period_refresh>1000</acm_period_refresh>
<!-- the ACM loop margin for foward/down link -->
......@@ -149,22 +140,14 @@
<modcod_def_rcs>/etc/opensand/modcod/rcs/modcod.txt</modcod_def_rcs>
<!-- The DVB-RCS2 MODCOD definition file -->
<modcod_def_rcs2>/etc/opensand/modcod/rcs2/modcod.txt</modcod_def_rcs2>
<spot id="1" gw="0">
<!-- The forward/down MODCOD time series file -->
<forward_down_modcod_time_series>/etc/opensand/modcod/forward_down_time_series.txt</forward_down_modcod_time_series>
<!-- The return/up link MODCOD simulation file -->
<return_up_modcod_time_series>/etc/opensand/modcod/return_up_time_series.txt</return_up_modcod_time_series>
<!-- loop on file -->
<loop_on_file>true</loop_on_file>
</spot>
</physical_layer>
<advanced>
<!-- TODO we may need a size per spot and even a size per fifo (in/out data) -->
<delay_buffer>10000</delay_buffer>
<delay_timer>1</delay_timer>
<udp_rmem>1048580</udp_rmem>
<udp_wmem>1048580</udp_wmem>
<udp_stack>5</udp_stack>
<satcarrier_udp_rmem>1048580</satcarrier_udp_rmem>
<satcarrier_udp_wmem>1048580</satcarrier_udp_wmem>
<satcarrier_udp_stack>5</satcarrier_udp_stack>
</advanced>
</configuration>
......@@ -66,7 +66,7 @@
<!-- The physical layer parameters, for downlink -->
<downlink_physical_layer>
<attenuation_model_type>Ideal</attenuation_model_type>
<minimal_condition_type>Constant</minimal_condition_type>
<minimal_condition_type>ACM-Loop</minimal_condition_type>
<error_insertion_type>Gate</error_insertion_type>
<clear_sky_condition>20</clear_sky_condition>
</downlink_physical_layer>
......@@ -75,6 +75,18 @@
<delay_type>ConstantDelay</delay_type>
<refresh_period>1000</refresh_period>
</delay>
<!-- The interconnect parameters -->
<interconnect>
<upward_data_port>54996</upward_data_port>
<upward_sig_port>54997</upward_sig_port>
<downward_data_port>54998</downward_data_port>
<downward_sig_port>54999</downward_sig_port>
<upper_ip_address>192.168.17.2</upper_ip_address>
<lower_ip_address>192.168.17.1</lower_ip_address>
<interconnect_udp_rmem>1048580</interconnect_udp_rmem>
<interconnect_udp_wmem>1048580</interconnect_udp_wmem>
<interconnect_udp_stack>5</interconnect_udp_stack>
</interconnect>
<!-- The debug parameters -->
<debug>
<init>warning</init>
......
......@@ -3,7 +3,7 @@
<!-- L2 (encap) switching table for satellite -->
<!-- The physical layer parameters, for uplink in regenerative case -->
<sat_physical_layer>
<minimal_condition_type>Constant</minimal_condition_type>
<minimal_condition_type>ACM-Loop</minimal_condition_type>
<error_insertion_type>Gate</error_insertion_type>
</sat_physical_layer>
<!-- The debug parameters -->
......
......@@ -77,7 +77,7 @@
<!-- The physical layer parameters, for downlink -->
<downlink_physical_layer>
<attenuation_model_type>Ideal</attenuation_model_type>
<minimal_condition_type>Constant</minimal_condition_type>
<minimal_condition_type>ACM-Loop</minimal_condition_type>
<error_insertion_type>Gate</error_insertion_type>
<clear_sky_condition>20</clear_sky_condition>
</downlink_physical_layer>
......
......@@ -130,15 +130,6 @@
</slotted_aloha>
<!-- The physical layer configuration -->
<physical_layer>
<!-- enable the physical Layer (true/false) -->
<enable>false</enable>
<!-- the path where the emulated modcod are stored in time series files
when physical layer is enabled, in order to replay the scenario or
none to disable it. the filename will be
forward_down_time_series_spotid_gwid.txt
and return_up_time_series_spotid_gwid.txt
(ignored when physical layer is disabled) -->
<generate_time_series_path>none</generate_time_series_path>
<!-- how often do we refresh the adaptive physical layer scenario (ms) -->
<acm_period_refresh>1000</acm_period_refresh>
<!-- the ACM loop margin for foward/down link -->
......@@ -151,21 +142,13 @@
<modcod_def_rcs>/etc/opensand/modcod/rcs/modcod.txt</modcod_def_rcs>
<!-- The return/up link MODCOD definition file -->
<modcod_def_rcs2>/etc/opensand/modcod/rcs2/modcod.txt</modcod_def_rcs2>
<spot id="1" gw="0">
<!-- The forward/down MODCOD time series file -->
<forward_down_modcod_time_series>/etc/opensand/modcod/forward_down_time_series.txt</forward_down_modcod_time_series>
<!-- The return/up link MODCOD simulation file -->
<return_up_modcod_time_series>/etc/opensand/modcod/return_up_time_series.txt</return_up_modcod_time_series>
<!-- loop on file -->
<loop_on_file>false</loop_on_file>
</spot>
</physical_layer>
<advanced>
<!-- TODO we may need a size per spot and even a size per fifo (in/out data) -->
<delay_buffer>10000</delay_buffer>
<delay_timer>1</delay_timer>
<udp_rmem>1048580</udp_rmem>
<udp_wmem>1048580</udp_wmem>
<udp_stack>5</udp_stack>
<satcarrier_udp_rmem>1048580</satcarrier_udp_rmem>
<satcarrier_udp_wmem>1048580</satcarrier_udp_wmem>
<satcarrier_udp_stack>5</satcarrier_udp_stack>
</advanced>
</configuration>
......@@ -66,7 +66,7 @@
<!-- The physical layer parameters, for downlink -->