diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-07 11:48:48 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 16:54:52 +0100 |
| commit | 9b3316ed2773b276cb9537c4ccde2dd3431b655d (patch) | |
| tree | 87ac6018f5a5746d951b24023f981d4247292fae /testing/stop-testing | |
| parent | f9df3d06b5b4e5e5f00d294f555a373afd6bf99e (diff) | |
| download | strongswan-9b3316ed2773b276cb9537c4ccde2dd3431b655d.tar.bz2 strongswan-9b3316ed2773b276cb9537c4ccde2dd3431b655d.tar.xz | |
Use qemu/KVM virtualization instead of UML
Guest and network configuration is setup using the libvirt
virtualization API. The [start|stop]_testing scripts have been updated
accordingly.
qemu/KVM does not currently support a hostfs, so the shared build tree
mount has been dropped for now.
Diffstat (limited to 'testing/stop-testing')
| -rwxr-xr-x | testing/stop-testing | 52 |
1 files changed, 16 insertions, 36 deletions
diff --git a/testing/stop-testing b/testing/stop-testing index e6ee884d1..302053128 100755 --- a/testing/stop-testing +++ b/testing/stop-testing @@ -1,46 +1,26 @@ #!/bin/bash -# Stop all UML instances and UML switches -# -# Copyright (C) 2004 Eric Marchionni, Patrik Rayo -# Zuercher Hochschule Winterthur -# -# 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. See <http://www.fsf.org/copyleft/gpl.txt>. -# -# 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. -DIR=`dirname $0` +. $PWD/scripts/function.sh -source $DIR/scripts/function.sh +echo "Stopping test environment" -[ -f $DIR/testing.conf ] || die "No configuration file testing.conf found." +NETWORKS="vnet1 vnet2 vnet3" +KNLTARGET=/var/run/kvm-swan-kernel -source $DIR/testing.conf +[ `id -u` -eq 0 ] || die "You must be root to run $0" -if [ "$#" -eq 0 ] -then - HOSTS=$STRONGSWANHOSTS -else - HOSTS=$* -fi +for net in $NETWORKS +do + log_action "Network $net" + execute "virsh net-destroy $net" +done -##################################################### -# Shutting down the uml instances -# -cecho-n " * Halting all UML instances.." -for host in $HOSTS +for host in $STRONGSWANHOSTS do - uml_mconsole $host halt &> /dev/null + log_action "Guest $host" + execute "virsh destroy $host" + rm -f $VIRTIMGSTORE/$host.img done -cgecho "done" -##################################################### -# Shutting down the uml bridhges -# -cecho "Stop the uml bridges (scripts/stop-bridges)" -$DIR/scripts/stop-bridges +log_action "Removing kernel $KERNEL" +execute "rm $KNLTARGET" |