Merge pull request #1680 from sgross-emlix/client-io-fix-resource-matching

Client io fix resource matching

Author: Bastian-Krause

labgrid/remote/client.py

@@ -917,6 +917,8 @@ def digital_io(self):
             drv = target.get_driver("DigitalOutputProtocol", name=name)
         except NoDriverFoundError:
             for resource in target.resources:
+                if name and resource.name != name:
+                    continue
                 if isinstance(resource, WaveshareModbusTCPCoil):
                     drv = self._get_driver_or_new(target, "WaveShareModbusCoilDriver", name=name)
                 elif isinstance(resource, ModbusTCPCoil):
@@ -1105,6 +1107,8 @@ def bootstrap(self):
             drv = target.get_driver("BootstrapProtocol", name=name)
         except NoDriverFoundError:
             for resource in target.resources:
+                if name and resource.name != name:
+                    continue
                 if isinstance(resource, NetworkIMXUSBLoader):
                     drv = self._get_driver_or_new(target, "IMXUSBDriver", activate=False, name=name)
                     drv.loader.timeout = self.args.wait
@@ -1138,6 +1142,8 @@ def sd_mux(self):
 
         drv = None
         for resource in target.resources:
+            if name and resource.name != name:
+                continue
             if isinstance(resource, NetworkUSBSDMuxDevice):
                 drv = self._get_driver_or_new(target, "USBSDMuxDriver", name=name)
             elif isinstance(resource, NetworkUSBSDWireDevice):
@@ -1170,6 +1176,8 @@ def usb_mux(self):
 
         drv = None
         for resource in target.resources:
+            if name and resource.name != name:
+                continue
             if isinstance(resource, NetworkLXAUSBMux):
                 drv = self._get_driver_or_new(target, "LXAUSBMuxDriver", name=name)
                 break
@@ -1302,6 +1310,8 @@ def video(self):
             drv = target.get_driver("VideoProtocol", name=name)
         except NoDriverFoundError:
             for resource in target.resources:
+                if name and resource.name != name:
+                    continue
                 if isinstance(resource, (USBVideo, NetworkUSBVideo)):
                     drv = self._get_driver_or_new(target, "USBVideoDriver", name=name)
                 elif isinstance(resource, HTTPVideoStream):