From d37bdc276423d596800b5565ae55e173cd17b23c Mon Sep 17 00:00:00 2001 From: konsonance Date: Sun, 25 Aug 2019 09:02:48 -0700 Subject: [PATCH 1/2] Issue #77 - Update SLE config parameters --- config/config.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index ba7b8ba..f6f1cf4 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -30,17 +30,20 @@ default: dsn: sle: - initiator_id: uname + initiator_id: LSE + # password only matters if we're doing auth and can stay as 'pw' password: pw - responder_id: uname + responder_id: SSE + # peer password only matters if we're doing auth and can stay as 'pw' peer_password: pw version: 5 downlink_frame_type: TMTransFrame - heartbeat: heartbeat - deadfactor: deadfactor - buffer_size: buffer_size - responder_port: responder_port - auth_level: auth_level + heartbeat: 25 + deadfactor: 5 + buffer_size: 256000 + responder_port: 'default' + auth_level: 'none' + cfdp: mib: path: ./mib From 7a607870321a18f0be40e7607739f056243377dc Mon Sep 17 00:00:00 2001 From: konsonance Date: Sun, 25 Aug 2019 17:45:59 -0700 Subject: [PATCH 2/2] Issue #76 - add option to pull hostname / port from config --- ait/dsn/sle/common.py | 6 ++++-- config/config.yaml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ait/dsn/sle/common.py b/ait/dsn/sle/common.py index b155b9f..a9981fd 100644 --- a/ait/dsn/sle/common.py +++ b/ait/dsn/sle/common.py @@ -99,8 +99,10 @@ def __init__(self, *args, **kwargs): '''''' self._downlink_frame_type = ait.config.get('dsn.sle.downlink_frame_type', kwargs.get('downlink_frame_type', 'TMTransFrame')) - self._hostname = kwargs.get('hostname', None) - self._port = kwargs.get('port', None) + self._hostname = ait.config.get('dsn.sle.hostname', + kwargs.get('hostname', None)) + self._port = ait.config.get('dsn.sle.port', + kwargs.get('port', None)) self._heartbeat = ait.config.get('dsn.sle.heartbeat', kwargs.get('heartbeat', 25)) self._deadfactor = ait.config.get('dsn.sle.deadfactor', diff --git a/config/config.yaml b/config/config.yaml index f6f1cf4..8b40481 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -43,6 +43,8 @@ default: buffer_size: 256000 responder_port: 'default' auth_level: 'none' + hostname: None + port: None cfdp: mib: