Merge pull request #1149 from nlabriet/remote_client_ssh

remote/client: ssh command: first look for SSHDriver
labgrid-project · Apr 26, 2023 · 52dd973 · 52dd973
2 parents 06ea5db + 438211f
commit 52dd973
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/labgrid/remote/client.py b/labgrid/remote/client.py
@@ -1024,17 +1024,21 @@ def _get_ssh(self):
         place = self.get_acquired_place()
         target = self._get_target(place)
 
-        from ..resource import NetworkService
         try:
-            resource = target.get_resource(NetworkService, name=self.args.name)
-        except NoResourceFoundError:
-            ip = self._get_ip(place)
-            if not ip:
-                return
-            resource = NetworkService(target, address=str(ip), username='root')
-
-        drv = self._get_driver_or_new(target, "SSHDriver", name=resource.name)
-        return drv
+            drv = target.get_driver("SSHDriver", name=self.args.name)
+            return drv
+        except NoDriverFoundError:
+            from ..resource import NetworkService
+            try:
+                resource = target.get_resource(NetworkService, name=self.args.name)
+            except NoResourceFoundError:
+                ip = self._get_ip(place)
+                if not ip:
+                    return
+                resource = NetworkService(target, address=str(ip), username='root')
+
+            drv = self._get_driver_or_new(target, "SSHDriver", name=resource.name)
+            return drv
 
     def ssh(self):
         drv = self._get_ssh()