Merge lp:~pedronis/tanuki-agent/rpi2-provkit-drive-ssh-like-a-robotot-w-pty into lp:tanuki-agent

[Samuele Pedroni]

use a wrapper for ssh using pty to be able to pass passwords programmatically, avoid requiring paramiko

use a wrapper for ssh using pty to be able to pass passwords programmatically, avoid requiring paramiko

[Celso Providelo (cprov)]

Works like a charm! thanks Samuele.

review: Approve

[Celso Providelo (cprov)]

Result reference:

{{{
$ ./api_example.py config.ini https://spi.canonical.com/orgs/$ORGANIZATION/results?image_unique_id=117c9b49-31d1-4c4b-baf0-2c886449afff
}}}

=== modified file 'rpi2-sample-provkit/provision'
--- rpi2-sample-provkit/provision	2015-10-16 20:17:20 +0000
+++ rpi2-sample-provkit/provision	2015-10-22 20:37:04 +0000
@@ -6,10 +6,9 @@
 import codecs
 import json
 import os
+import subprocess
 import time
 
-import paramiko
-
 MAX_RETRIES = 5
 
 
@@ -29,27 +28,48 @@
 """
 
 
+def run_sshrobot(device_address, port, cmd, password='ubuntu'):
+    """Run a command using sshrobot helper."""
+    sshrobot = os.path.join(os.path.dirname(__file__), 'sshrobot')
+    invoke = [sshrobot, '-l', 'ubuntu', '-p', str(port), device_address, cmd]
+    p = subprocess.Popen(invoke, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+    buf = ""
+    while True:
+        r = p.poll()
+        if r is not None:
+            out = (buf + p.stdout.read().decode("utf8")).strip()
+            if out:
+                print(out)
+            return r
+        ch = p.stdout.read(1).decode("utf8")
+        buf += ch
+        if buf.endswith(" password: "):
+            break
+    p.stdin.write(password + "\n")
+    p.stdin.flush()
+    r = p.wait()
+    out = p.stdout.read().decode("utf8").strip()
+    if out:
+        print(out)
+    return r
+
+
 def wait_device(device_address, port):
     """Wait for device to answer SSH."""
     ssh_identity = os.getenv('SSH_IDENTITY', '~/.ssh/id_rsa.pub')
-    client = paramiko.SSHClient()
-    client.set_missing_host_key_policy(paramiko.client.MissingHostKeyPolicy())
+    pubpath = os.path.expanduser(ssh_identity)
+    with open(pubpath, "rb") as fh:
+        pubcontent = fh.read()
+    cmd = "echo '" + pubcontent + b"' >> ~/.ssh/authorized_keys"
     for attempt_number in range(1, MAX_RETRIES + 1):
-        try:
-            client.connect(device_address, port=port, username="ubuntu", password="ubuntu",
-                           look_for_keys=False, allow_agent=False)
-        except:
-            if attempt_number == MAX_RETRIES:
-                break
-            print("    device still not answering, waiting and retrying #{}...".format(
-                attempt_number))
-            time.sleep(10)
-        else:
-            pubpath = os.path.expanduser(ssh_identity)
-            with open(pubpath, "rb") as fh:
-                pubcontent = fh.read()
-            client.exec_command(b"echo '" + pubcontent + b"' >> ~/.ssh/authorized_keys")
+        res = run_sshrobot(device_address, port, cmd)
+        if res == 0:
             return
+        if attempt_number == MAX_RETRIES:
+            break
+        print("    device still not answering, waiting and retrying #{}...".format(
+              attempt_number))
+        time.sleep(10)
 
     # we never reached the raspi in all attempts
     print("    device never answered, quitting!")
 
=== added file 'rpi2-sample-provkit/sshrobot'
--- rpi2-sample-provkit/sshrobot	1970-01-01 00:00:00 +0000
+++ rpi2-sample-provkit/sshrobot	2015-10-22 20:37:04 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/python2
+import os
+import pty
+import sys
+
+argv = sys.argv[:]
+argv[0] = '/usr/bin/ssh'
+pty.spawn(argv)
+_, r = os.wait()
+if os.WIFEXITED(r):
+    r = os.WEXITSTATUS(r)
+else:
+    r = 255
+sys.exit(r)