Merge lp:~thomir-deactivatedaccount/core-image-tester/trunk-local-ssh-setup into lp:core-image-tester

[Thomi Richards]

Make uci-nova inline.

This branch copies uci-nova from revno 6 of the uci-nova branch. I'll follow this with another branch that removes some of the options that aren't applicable to the core-image-tester.

[Francis Ginther (fginther)]

Approve

review: Approve

=== modified file 'README.rst'
--- README.rst	2015-04-01 00:32:13 +0000
+++ README.rst	2015-04-27 21:05:47 +0000
@@ -28,17 +28,10 @@
   $ sudo apt-get update
   $ sudo apt-get install autopkgtest
 
-.. note::
-  Thomi: At the time of writing (16/3/2015), the autopkgtest from the PPA is not
-  enough to make this work. You also need to manually branch 
-  lp:~canonical-ci-engineering/adt-cloud-worker/uci-nova and follow the instructions
-  there.
-
 ...and install bzr, which is needed to get the test branch::
 
   $ sudo apt-get install  bzr
 
-
 Install the service itself::
 
   $ python setup.py install
@@ -49,6 +42,22 @@
 
   $ python setup.py develop
 
+uci-nova
+++++++++
+
+This service includes a custom adt-run ssh setup script called 'uci-nova'. This
+is a shell script that exists in the root of the branch, and is called by the
+core-image-tester service.
+
+You can run adt-run manually yourself, in order to replicate what the service
+does. For example::
+
+  $ adt-run --built-tree <test_dir> \
+        --output-dir  <result_dir> \
+        ---  ssh -s ./uci-nova -- \
+          --flavor <nova_flavour> \
+          --image <nova_image>
+        
 Run the tests!
 ==============
 
 
=== modified file 'core_image_tester/worker.py'
--- core_image_tester/worker.py	2015-04-17 16:02:30 +0000
+++ core_image_tester/worker.py	2015-04-27 21:05:47 +0000
@@ -18,6 +18,7 @@
 """ADT Cloud worker functional code."""
 import logging
 import os
+import os.path
 import shutil
 import subprocess
 import tarfile
@@ -204,7 +205,7 @@
         '--built-tree', test_dir,
         '--output-dir', result_dir,
         # Specify the ssh backend, and the uci-nova setup script:
-        '---', 'ssh', '-s', 'uci-nova', '--',
+        '---', 'ssh', '-s', get_uci_nova_path(), '--',
         '--flavor', config['adt']['image_flavor'],
         '--image', nova_image,
         '--console', os.path.join(result_dir, 'nova-console.log'),
@@ -219,6 +220,17 @@
     return 0
 
 
+def get_uci_nova_path():
+    return os.path.abspath(
+        os.path.join(
+            __file__,
+            '..',
+            '..',
+            'uci-nova'
+        )
+    )
+
+
 def sanitize_results(results_dir, config):
     """Filter out any secrets exposed in select log files.
 
 
=== added file 'uci-nova'
--- uci-nova	1970-01-01 00:00:00 +0000
+++ uci-nova	2015-04-27 21:05:47 +0000
@@ -0,0 +1,376 @@
+#!/bin/sh
+#
+# This script is part of autopkgtest
+# autopkgtest is a tool for testing Debian binary packages
+#
+# This script sets up a nova instance to use as an autopkgtest testbed. It
+# assumes that the host system is already prepared to run nova commands.
+# WARNING: This is mostly a proof of concept and not very robust.
+
+# Options:
+#
+# -f flavor | --flavor=flavor
+#        Name or ID of flavor (see 'nova flavor-list'), mandatory
+# -i image | --image=image
+#        Name or ID of image (see 'nova image-list'), mandatory
+# -N net-id | --net-id=net-id
+#        UUID of the network that should be used for the instance
+# -n name | --name=name
+#        Name for the new server. A name will be generated if not specified.
+# -c console-log | --console=file-name
+#        Save the nova console-log of the server to the specified file.
+#
+#
+# Authors:
+# Celso Providelo <[e-mail]>
+#
+#
+# autopkgtest is Copyright (C) 2006-2015 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# See the file CREDITS for a full list of credits information (often
+# installed as /usr/share/doc/autopkgtest/CREDITS).
+set -eu
+
+CAPABILITIES='isolation-machine,reboot,revert,revert-full-system'
+
+SUDO_PASSWORD=''
+SSH_USER=ubuntu
+
+FLAVOR=""
+IMAGE=""
+
+SRVNAME=""
+NET_ID=""
+CONSOLE=""
+DEBUG=""
+
+
+debug() {
+    [ -z "$DEBUG" ] && return
+    echo "$@">&2
+}
+
+warning() {
+    echo "$@">&2
+}
+
+error() {
+    echo "$@">&2
+}
+
+parse_args() {
+    # Parse command line argument and populate environment
+
+    SHORTOPTS="f:,i:,N:,n:,c:,d"
+    LONGOPTS="flavor:,image:,net-id:,name:,console:,debug"
+
+    TEMP=$(getopt -o $SHORTOPTS --long $LONGOPTS -- "$@")
+    eval set -- "$TEMP"
+
+    while true; do
+        case "$1" in
+            -f|--flavor)
+                FLAVOR=$2
+                shift 2;;
+            -i|--image)
+                IMAGE=$2
+                shift 2;;
+            -N|--net-id)
+                NET_ID="$2"
+                shift 2;;
+            -n|--name)
+                SRVNAME=$2
+                shift 2;;
+            -c|--console)
+                CONSOLE=$2
+                shift 2;;
+            -d|--debug)
+                DEBUG=1; shift;;
+            --)
+                shift;
+                break;;
+            *)
+                error "E: $(basename $0): Unsupported option $1"
+                exit 1;;
+        esac
+    done
+
+    if [ -z "$FLAVOR" ]; then
+        error "Argument 'flavor' is mandatory. Run 'nova flavor-list' to "\
+            "print a list of available flavors."
+        exit 1
+    fi
+    if [ -z "$IMAGE" ]; then
+        error "Argument 'image' is mandatory. Run 'nova image-list' to "\
+            "print a list of available images to boot from."
+        exit 1
+    fi
+}
+
+security_setup_nova() {
+    debug "Creating specific nova security-group: $SRVNAME"
+    nova secgroup-create $SRVNAME "$SRVNAME testbed"
+
+    debug "Allowing ingress SSH ..."
+    nova secgroup-add-rule $SRVNAME tcp 22 22 0.0.0.0/0
+
+    debug "Egress traffic will respect external Firewall rules ..."
+}
+
+security_setup_neutron() {
+    debug "Creating specific neutron security-group: $SRVNAME"
+    neutron security-group-create $SRVNAME \
+	--description "$SRVNAME testbed"
+
+    debug "Cleaning up default egress rules ..."
+    DEFAULT_RULES=$(neutron security-group-rule-list \
+	--format csv -c id -c security_group --quote none \
+	| grep $SRVNAME | cut -d',' -f1)
+    for rule_id in $DEFAULT_RULES; do
+	neutron security-group-rule-delete $rule_id
+    done
+
+    debug "Allowing ingress SSH ..."
+    neutron security-group-rule-create \
+	--direction ingress \
+	--ethertype ipv4 \
+	--protocol tcp \
+	--port-range-min 22 \
+	--port-range-max 22 \
+	--remote-ip-prefix 0.0.0.0/0 \
+	$SRVNAME
+
+    debug "Allowing DNS egress traffic ..."
+    neutron security-group-rule-create \
+    	--direction egress \
+    	--remote-ip-prefix 8.8.8.8 \
+    	$SRVNAME
+
+    debug "Allowing APT and NTP egress traffic ..."
+    neutron security-group-rule-create \
+    	--direction egress \
+    	--remote-ip-prefix 91.189.88.0/21 \
+    	$SRVNAME
+}
+
+# create a testbed (if necessary), configure ssh, copy ssh key into it,
+# configure sudo, etc.; print a list of "key=value" parameters to stdout on
+# success
+open() {
+    # Boot a nova instance and returns its connection parameters
+    [ -n "$SRVNAME" ] || SRVNAME=`mktemp -u adt-nova-XXXXXX`
+
+    mkdir /tmp/$SRVNAME
+
+    debug "Creating new SSH key on /tmp/$SRVNAME"
+    SSH_IDENTITY=/tmp/$SRVNAME/id_rsa
+    ssh-keygen -f $SSH_IDENTITY -q -N ""
+
+    debug "Creating specific nova keypair: $SRVNAME"
+    nova keypair-add --pub-key $SSH_IDENTITY.pub $SRVNAME
+
+    # Setup testbed security with nova or neutron according to their
+    # availability in the target cloud.
+    if ! neutron security-group-list; then
+	security_setup_nova
+    else
+        security_setup_neutron
+    fi
+        
+    # generate cloud-init user data; mostly for manage_etc_hosts, but also get
+    # rid of some unnecessary stuff in the VM
+    local userdata=`mktemp`
+    cat <<EOF > $userdata
+#cloud-config
+manage_etc_hosts: true
+apt_update: true
+apt_upgrade: false
+snappy:
+    ssh_enabled: True
+
+runcmd:
+ - echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/90nolanguages
+ - echo 'force-unsafe-io' > /etc/dpkg/dpkg.cfg.d/autopkgtest
+EOF
+
+    EXTRA_OPTS=''
+    if [ -n "$NET_ID" ]; then
+        EXTRA_OPTS="$EXTRA_OPTS --nic net-id=$NET_ID"
+    fi
+
+    # Boot the instance
+    debug "Creating nova instance $SRVNAME ..."
+    OUT=$(nova boot --config-drive=1 \
+	  --flavor $FLAVOR --image $IMAGE --user-data $userdata \
+          --key_name $SRVNAME --security-groups $SRVNAME \
+	  $EXTRA_OPTS $SRVNAME 2>&1) || {
+        error "nova boot failed:"
+        error "$OUT"
+        exit 1
+    }
+    debug "Nova boot succeeded"
+    rm $userdata
+
+    # Find IP address
+    ipaddr=""
+    retry=60
+    while [ -z "$ipaddr" ]; do
+        OUT=$(nova show --minimal $SRVNAME)
+        ipaddr=$(echo "$OUT" | awk 'BEGIN {FS="|"} /network/ {n=split($3,i,/,\s*/); gsub(" ", "", i[n]); print i[n]}')
+        retry=$(( retry - 1 ))
+        if [ $retry -le 0 ]; then
+            error "Failed to acquire an IP address. Aborting!"
+            error "$OUT"
+            cleanup
+            exit 1
+        fi
+        sleep 3
+    done
+    debug "Finding IP address succeeded: $ipaddr"
+
+    # purge the device host key so that SSH doesn't print a scary warning
+    ssh-keygen -f ~/.ssh/known_hosts -R $ipaddr >/dev/null 2>&1 || true
+
+    ADT_EXTRA_OPTS="-n $SRVNAME"
+    if [ -n "$CONSOLE" ]; then
+        ADT_EXTRA_OPTS="$ADT_EXTRA_OPTS -c $CONSOLE"
+    fi
+
+    # Return access information to adt-virt-ssh.
+    cat<<EOF
+identity=$SSH_IDENTITY
+login=$SSH_USER
+hostname=$ipaddr
+capabilities=$CAPABILITIES
+extraopts=$ADT_EXTRA_OPTS
+EOF
+    if [ -n "$SUDO_PASSWORD" ]; then
+        echo "password=$SUDO_PASSWORD"
+    fi
+
+    # wait until ssh is available and cloud-config is done
+    debug "Waiting until ssh becomes available"
+    SSH="ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /tmp/$SRVNAME/id_rsa -l $SSH_USER $ipaddr"
+    retry=60
+    while ! $SSH true; do
+        retry=$(( retry - 1 ))
+        if [ $retry -le 0 ]; then
+            error "Timed out waiting for ssh. Aborting!"
+            cleanup
+            exit 1
+        fi
+        sleep 5
+    done
+
+    debug "Waiting for cloud-init to finish"
+    if ! timeout 30m $SSH 'while [ ! -e /var/lib/cloud/instance/boot-finished ]; do sleep 1; done'; then
+        error "Timed out waiting for cloud-init to finish. Aborting!"
+        cleanup
+        exit 1
+    fi
+
+}
+
+cleanup() {
+    if [ -z "$SRVNAME" ]; then
+        error "Cannot determine server name. Instance won't be deleted!"
+        exit 0
+    fi
+
+    if [ -n "$CONSOLE" ]; then
+        debug "Saving console-log for $SRVNAME"
+        nova console-log $SRVNAME > $CONSOLE
+    fi
+
+    debug "Deleting $SRVNAME instance"
+    nova delete $SRVNAME || true
+
+    debug "Deleting $SRVNAME keypair"
+    nova keypair-delete $SRVNAME || true
+
+    debug "Deleting /tmp/$SRVNAME SSH keys"
+    rm -rf /tmp/$SRVNAME || true
+
+    DELETE_CMD="neutron security-group-delete $SRVNAME"
+    if ! neutron security-group-list; then
+	DELETE_CMD="nova secgroup-delete $SRVNAME"
+    fi
+
+    debug "Deleting $SRVNAME security-group"
+    retry=3
+    while ! eval "$DELETE_CMD"; do
+        retry=$(( retry - 1 ))
+        if [ $retry -le 0 ]; then
+            error "Timed out deleting secgroup. Aborting!"
+            cleanup
+            exit 1
+        fi
+        sleep 5
+    done
+
+    SRVNAME=""
+}
+
+revert() {
+    if [ -z "$SRVNAME" ]; then
+        echo "Needs to be called with -n <server name>" >&2
+        exit 1
+    fi
+    cleanup
+    open
+}
+
+reboot() {
+    if [ -z "$SRVNAME" ]; then
+        error "Cannot determine server name. Instance won't be rebooted!"
+        exit 1
+    fi
+
+    nova reboot --poll $SRVNAME >/dev/null 2>&1||true
+}
+
+# ########################################
+# Main procedure
+#
+if [ $# -eq 0 ]; then
+    error "Invalid number of arguments, command is missing"
+    exit 1
+fi
+cmd=$(echo $1|tr [[:upper:]] [[:lower:]])
+shift
+parse_args "$@"
+
+# Don't leave stuff behind ...
+trap "cleanup" 1 2 6 15
+
+case $cmd in
+    open)
+        open;;
+    cleanup)
+        cleanup;;
+    revert)
+        revert;;
+    reboot)
+        reboot;;
+    '')
+        echo "Needs to be called with command as first argument" >&2
+        exit 1
+        ;;
+    *)
+        echo "invalid command $cmd" >&2
+        exit 1
+esac