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

Jump to bottom

Rsn port agent #2238

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rsn port agent #2238

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
014ad4e
Added support for RSN Connection.
tapanagupta Jul 29, 2014
63e2a2f
Merge remote-tracking branch 'upstream/master' into rsn_port_agent
tapanagupta Aug 12, 2014
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
20 changes: 18 additions & 2 deletions ion/agents/port/port_agent_process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"""

__author__ = 'Bill French'

__license__ = 'Apache 2.0'

import os
import time
Expand Down Expand Up @@ -71,6 +71,7 @@ class PortAgentType(BaseEnum):
What type of port agent are we running? ethernet, serial, digi etc...
"""
ETHERNET = 'ethernet'
RSN = 'rsn'
SERIAL = 'serial'
BOTPT = "botpt"

Expand Down Expand Up @@ -243,7 +244,7 @@ def __init__(self, config, timeout = DEFAULT_TIMEOUT, test_mode = False):
if not self._device_port:
raise PortAgentMissingConfig("missing config: device_port")

if not self._type == PortAgentType.ETHERNET:
if self._type not in [PortAgentType.ETHERNET, PortAgentType.RSN]:
raise PortAgentLaunchException("unknown port agent type: %s" % self._type)

def launch(self):
Expand Down Expand Up @@ -371,6 +372,10 @@ def __init__(self, config, timeout = DEFAULT_TIMEOUT, test_mode = False):
if self._type == PortAgentType.ETHERNET:
self._device_addr = config.get("device_addr")
self._device_port = config.get("device_port")
elif self._type == PortAgentType.RSN:
self._device_addr = config.get("device_addr")
self._device_port = config.get("device_port")
self._instrument_command_port = config.get("instrument_command_port")
elif self._type == PortAgentType.SERIAL:
self._device_os_port = config.get("device_os_port", None)
self._device_baud = config.get("device_baud", None)
Expand All @@ -395,6 +400,13 @@ def __init__(self, config, timeout = DEFAULT_TIMEOUT, test_mode = False):
raise PortAgentMissingConfig("missing config: device_addr")
if not self._device_port:
raise PortAgentMissingConfig("missing config: device_port (ETHERNET)")
elif PortAgentType.RSN == self._type:
if not self._device_addr:
raise PortAgentMissingConfig("missing config: device_addr")
if not self._device_port:
raise PortAgentMissingConfig("missing config: device_port (RSN)")
if not self._instrument_command_port:
raise PortAgentMissingConfig("missing config: instrument_command_port (RSN)")
elif PortAgentType.SERIAL == self._type:
if self._device_os_port == None:
raise PortAgentMissingConfig("missing config: device_os_port")
Expand Down Expand Up @@ -451,6 +463,10 @@ def get_config(self):
temp.write("parity %s\n" % (self._device_parity) )
temp.write("stopbits %d\n" % (self._device_stop_bits) )
temp.write("flow %s\n" % (self._device_flow_control) )
elif PortAgentType.RSN == self._type:
temp.write("instrument_type rsn\n")
temp.write("instrument_data_port %d\n" % (self._device_port) )
temp.write("instrument_command_port %d\n" % (self._instrument_command_port) )
else:
temp.write("instrument_type tcp\n")
temp.write("instrument_data_port %d\n" % (self._device_port) )
Expand Down