Merge pull request #771 from tompreston/tpreston/ssh-named-resource

client: Add named resource arg to SSH subparser

Author: Emantor

CHANGES.rst

@@ -6,6 +6,8 @@ New Features in 0.5.0
 - Support for Eaton ePDU added, and can be used as a NetworkPowerPort.
 - Consider a combination of multiple "lg_feature" markers instead of
   considering only the closest marker.
+- The labgrid client SSH command is now able to instantiate the SSHDriver when
+  there are multiple NetworkService resources available.
 
 Bug fixes in 0.5.0
 ~~~~~~~~~~~~~~~~~~

labgrid/remote/client.py

@@ -1069,18 +1069,19 @@ def _get_ssh(self):
 
         from ..resource import NetworkService
         try:
-            target.get_resource(NetworkService)
+            resource = target.get_resource(NetworkService, name=self.args.name)
         except NoResourceFoundError:
             ip = self._get_ip(place)
             if not ip:
                 return
-            NetworkService(target, address=str(ip), username='root')
+            resource = NetworkService(target, address=str(ip), username='root')
 
         from ..driver.sshdriver import SSHDriver
         try:
             drv = target.get_driver(SSHDriver)
         except NoDriverFoundError:
-            drv = SSHDriver(target, name=None)
+            target.set_binding_map({"networkservice": resource.name})
+            drv = SSHDriver(target, name=resource.name)
         target.activate(drv)
         return drv
 
@@ -1690,6 +1691,7 @@ def main():
 
     subparser = subparsers.add_parser('ssh',
                                       help="connect via ssh (with optional arguments)")
+    subparser.add_argument('--name', '-n', help="optional resource name")
     subparser.set_defaults(func=ClientSession.ssh)
 
     subparser = subparsers.add_parser('scp',