Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 76 - add option to pull hostname / port from config #83

Merged
merged 2 commits into from
Aug 26, 2019
Merged

Issue 76 - add option to pull hostname / port from config #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d37bdc2
Issue #77 - Update SLE config parameters
Futabay Aug 25, 2019
7a60787
Issue #76 - add option to pull hostname / port from config
Futabay Aug 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ait/dsn/sle/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
19 changes: 12 additions & 7 deletions config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,22 @@ 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'
hostname: None
port: None

cfdp:
mib:
path: ./mib
Expand Down