exporter/driver: allow to select tcp/udp protocol for NetworkLauterbachDebugger

Devices support always UDP, the most recent devices e.g. PowerDebug X50 have an
 option to use TCP which enables LG_PROXY support.

Author: Alexander Merkle

doc/configuration.rst

@@ -818,6 +818,7 @@ PowerDebug debugger device connected via Ethernet.
 
 Arguments:
   - node : Lauterbach NODENAME e.g. IP/NODENAME (factory default: serial number)
+  - protocol : optional, allows to select TCP instead of UDP, required for LG_PROXY support
 
 Used by:
   - `LauterbachDriver`_

labgrid/driver/lauterbachdriver.py

@@ -6,6 +6,7 @@
 
 import attr
 
+from .exception import ExecutionError
 from ..factory import target_factory
 from ..protocol import DebuggerProtocol
 from ..resource.lauterbach import NetworkLauterbachDebugger, NetworkUSBLauterbachDebugger
@@ -34,7 +35,8 @@ class LauterbachDriver(Driver, DebuggerProtocol):
     t32_bin = attr.ib(default="t32marm", validator=attr.validators.instance_of(str))
     t32_sys = attr.ib(
         default=None,
-        validator=attr.validators.optional(attr.validators.instance_of(str)))
+        validator=attr.validators.optional(attr.validators.instance_of(str))
+        )
 
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
@@ -56,7 +58,14 @@ def on_activate(self):
         if isinstance(self.interface, USBLauterbachDebugger):
             self.connection = self._pystart.USBConnection(f"{self.interface.busnum:03d}:{self.interface.devnum:03d}")
         elif isinstance(self.interface, NetworkLauterbachDebugger):
-            self.connection = self._pystart.UDPConnection(self.interface.node)
+            if self.interface.protocol.lower() == "udp":
+                host, port = proxymanager.get_host_and_port(self.interface, default_port=9187)
+                if host != self.interface.host:
+                    raise ExecutionError("Proxy support not available for legacy Lauterbach devices")
+                self.connection = self._pystart.UDPConnection(self.interface.host)
+            else:
+                host, port = proxymanager.get_host_and_port(self.interface, default_port=9187)
+                self.connection = self._pystart.TCPConnection(host, port)
         elif isinstance(self.interface, NetworkUSBLauterbachDebugger):
 
             path = os.path.join(self.t32sys, self.pathmap.get(self.interface.architecture), "t32tcpusb")

labgrid/resource/lauterbach.py

@@ -4,6 +4,9 @@
 from .common import Resource
 from .remote import RemoteUSBResource
 
+def validate_protocol(instance, attribute, value):
+    if not value.lower() in ("udp", "tcp"):
+        raise ValueError("Invalid protocol value - allowed values are 'udp/tcp'")
 
 @target_factory.reg_resource
 @attr.s(eq=False)
@@ -12,8 +15,14 @@ class NetworkLauterbachDebugger(Resource):
 
     Args:
         node (str): Lauterbach NODENAME e.g. IP/NODENAME (factory default: serial number)
+        protocol (str): Protocol to use, choice of 'udp/tcp' (default: udp)
     """
     node = attr.ib(validator=attr.validators.instance_of(str))
+    protocol = attr.ib(default="udp", validator=attr.validators.in_(("udp", "UDP", "tcp", "TCP")))
+
+    def __attrs_post_init__(self):
+        self.host = self.node
+        super().__attrs_post_init__()
 
 
 @target_factory.reg_resource