Merge lp:~ralsina/tanuki-agent/ssh-helper into lp:tanuki-agent

[Roberto Alsina]

A new ssh-helper script to isolate paramiko usage

A new ssh-helper script to isolate paramiko usage

Unmerged revisions

113. By Roberto Alsina on 2015-10-16

added paramiko

112. By Roberto Alsina on 2015-10-16

New ssh-helper to isolate paramiko usage

=== modified file 'Makefile'
--- Makefile	2015-10-16 19:33:14 +0000
+++ Makefile	2015-10-16 20:19:59 +0000
@@ -22,7 +22,7 @@
 	env/bin/flake8 *.py scripts/*.py --max-line-length=99
 
 cold-install:
-	rm -rf /tmp/pip-cache 
+	rm -rf /tmp/pip-cache
 	bzr branch lp:~tanuki/tanuki-agent/pip-cache /tmp/pip-cache
 	env/bin/pip install --no-index --find-links=/tmp/pip-cache -r requirements.txt
 	env/bin/pip install --no-index --find-links=/tmp/pip-cache -r test_requirements.txt
@@ -37,11 +37,13 @@
 	env/bin/nuitka scripts/e2e-snap-rev.py  --standalone --show-progress --remove-output
 	env/bin/nuitka scripts/e2e-noauth.py  --standalone --show-progress --remove-output
 	env/bin/nuitka scripts/api_example.py --standalone --show-progress --remove-output
+	env/bin/nuitka scripts/ssh-helper.py --standalone --show-progress --remove-output
 	rm -rf tanuki-agent-binaries
 	mkdir tanuki-agent-binaries
-	cp -n agent.dist/* api_example.dist/* e2e-image.dist/* e2e-snap-rev.dist/* e2e-noauth.dist/* tanuki-agent-binaries/
+	cp -n agent.dist/* ssh-helper.dist/* api_example.dist/* e2e-image.dist/* e2e-snap-rev.dist/* e2e-noauth.dist/* tanuki-agent-binaries/
 	mv tanuki-agent-binaries/agent.exe tanuki-agent-binaries/agent.py
 	mv tanuki-agent-binaries/api_example.exe tanuki-agent-binaries/api_example.py
+	mv tanuki-agent-binaries/ssh-helper.exe tanuki-agent-binaries/ssh-helper.py
 	cp README.rst tanuki-agent-binaries
 	mkdir tanuki-agent-binaries/requests
 	cp env/lib/python3.4/site-packages/requests/cacert.pem tanuki-agent-binaries/requests/cacert.pem

=== modified file 'rpi2-sample-provkit/provision'
--- rpi2-sample-provkit/provision	2015-10-16 19:30:35 +0000
+++ rpi2-sample-provkit/provision	2015-10-16 20:19:59 +0000
@@ -8,10 +8,6 @@
 import os
 import time
 
-import paramiko
-
-MAX_RETRIES = 5
-
 
 STEPS = """
 1. Download the image {image_name} from {image_reference}
@@ -28,33 +24,8 @@
 3. Insert the card into the Raspberry Pi 2, and reboot it.
 """
 
-
-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())
-    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")
-            return
-
-    # we never reached the raspi in all attempts
-    print("    device never answered, quitting!")
-    print("\nPlease be sure that the Raspberry Pi 2 is in a functional state and retry.")
-    exit(1)
+def wait_device(ip, port):
+    subprocess.check_call(['ssh-helper.py', ip, port])
 
 
 def main(args):

=== added file 'scripts/ssh-helper.py'
--- scripts/ssh-helper.py	1970-01-01 00:00:00 +0000
+++ scripts/ssh-helper.py	2015-10-16 20:19:59 +0000
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+
+import sys
+
+import paramiko
+
+MAX_RETRIES = 5
+
+def main(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())
+    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")
+            return
+
+    # we never reached the raspi in all attempts
+    print("    device never answered, quitting!")
+    print("\nPlease be sure that the Raspberry Pi 2 is in a functional state and retry.")
+    exit(1)
+
+
+if __name__ == "__main__":
+    main(sys.argv[1], sys.argv[2])

=== modified file 'test_requirements.txt'
--- test_requirements.txt	2015-10-16 19:19:22 +0000
+++ test_requirements.txt	2015-10-16 20:19:59 +0000
@@ -2,3 +2,4 @@
 pytest==2.7.2
 pytest-capturelog==0.7
 Markdown==2.6.2
+paramiko==1.15.3