NetworkSerialPort: add conargs to specify extra connector arguments

Author: sessl3r

doc/configuration.rst

@@ -65,6 +65,7 @@ Arguments:
   - speed (int, default=115200): baud rate of the serial port
   - protocol (str, default="rfc2217"): protocol used for connection: raw or
     rfc2217
+  - conargs (str): extra connector arguments, eg. nobreak
 
 Used by:
   - `SerialDriver`_

labgrid/remote/exporter.py

@@ -242,27 +242,33 @@ def _start(self, start_params):
             raise ExporterError(f"ser2net {version} returned a nonzero code during version check.")
 
         if version >= (4, 2, 0):
+            conargs = f'{start_params["path"]},{self.local.speed}n81,local'
+            if self.local.conargs:
+                conargs += f",{self.local.conargs}"
             cmd = [
                 self.ser2net_bin,
                 "-d",
                 "-n",
                 "-Y",
-                f"connection: &con01#  accepter: telnet(rfc2217,mode=server),tcp,{self.port}",
+                f"connection: &con01#  accepter: telnet({self.local.protocol},mode=server),tcp,{self.port}",
                 "-Y",
-                f'  connector: serialdev(nouucplock=true),{start_params["path"]},{self.local.speed}n81,local',  # pylint: disable=line-too-long
+                f'  connector: serialdev(nouucplock=true),{conargs}',
                 "-Y",
                 "  options:",
                 "-Y",
                 "    max-connections: 10",
             ]
         else:
+            conargs = f'{start_params["path"]}:{self.local.speed} NONE 8DATABITS 1STOPBIT LOCAL'
+            if self.local.conargs:
+                conargs += f" {self.local.conargs}"
             cmd = [
                 self.ser2net_bin,
                 "-d",
                 "-n",
                 "-u",
                 "-C",
-                f'{self.port}:telnet:0:{start_params["path"]}:{self.local.speed} NONE 8DATABITS 1STOPBIT LOCAL',  # pylint: disable=line-too-long
+                f'{self.port}:telnet:0:{conargs}',  # pylint: disable=line-too-long
             ]
         self.logger.info("Starting ser2net with: %s", " ".join(cmd))
         self.child = subprocess.Popen(cmd)

labgrid/resource/serialport.py

@@ -25,7 +25,9 @@ class NetworkSerialPort(NetworkResource):
         port (str): socket port to connect to
         speed (int): speed of the port e.g. 9800
         protocol (str): connection protocol: "raw" or "rfc2217"
+        conargs (str): extra connector arguments, eg. nobreak
     """
     port = attr.ib(validator=attr.validators.optional(attr.validators.instance_of(int)))
     speed = attr.ib(default=115200, validator=attr.validators.instance_of(int))
     protocol = attr.ib(default="rfc2217", validator=attr.validators.instance_of(str))
+    conargs = attr.ib(default="", validator=attr.validators.instance_of(str))