aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/virl
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2017-02-20 19:25:30 +0100
committerJan Gelety <jgelety@cisco.com>2017-02-21 16:18:24 +0100
commit8ef4983395b46a834e3ffe712197ec2e2f2b50d1 (patch)
treeba2891762e92e09271d92c02509aa5057f66f1c9 /resources/tools/virl
parentd92228369549613e2547c35f11e4bc2ab009d5ca (diff)
Fix of centos bootstrap and dut_setup.sh
Change-Id: I9fc3a74bf6356bdccee16c977df86567e91b4acf Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'resources/tools/virl')
-rwxr-xr-xresources/tools/virl/bin/start-testcase29
1 files changed, 21 insertions, 8 deletions
diff --git a/resources/tools/virl/bin/start-testcase b/resources/tools/virl/bin/start-testcase
index 99a4b0bd8e..151fce83ea 100755
--- a/resources/tools/virl/bin/start-testcase
+++ b/resources/tools/virl/bin/start-testcase
@@ -54,9 +54,9 @@ def main():
#
parser = argparse.ArgumentParser()
parser.add_argument("topology", help="the base topology to be started")
- parser.add_argument("packages", help="Path to the VPP .deb(s) that " +
- "is/are to be installed", nargs='+')
- parser.add_argument("-c", "--copy", help="Copy the .deb packages, " +
+ parser.add_argument("packages", help="Path to the VPP .deb(s) or .rpm(s) " +
+ "that is/are to be installed", nargs='+')
+ parser.add_argument("-c", "--copy", help="Copy the VPP packages, " +
"leaving the originals in place. Default is to " +
"move them.", action='store_true')
parser.add_argument("-k", "--keep", help="Keep (do not delete) the " +
@@ -91,8 +91,8 @@ def main():
parser.add_argument("-spu", "--ssh-pubkey", help="SSH public keyfile",
default="/home/jenkins-in/.ssh/id_rsa_virl.pub")
parser.add_argument("-r", "--release", help="VM disk image/release " +
- "(ex. \"csit-ubuntu-14.04.4_2016-05-25_1.0\")",
- default="csit-ubuntu-14.04.4_2016-05-25_1.0")
+ "(ex. \"csit-ubuntu-16.04.1_2016-12-19_1.6\")",
+ default="csit-ubuntu-16.04.1_2016-12-19_1.6")
parser.add_argument("--topology-directory", help="Topology directory",
default="/home/jenkins-in/testcase-infra/topologies")
@@ -140,9 +140,9 @@ def main():
open(topology_virl_filename, 'r') as old_file:
for line in old_file:
line = line.replace(" - VIRL-USER-SSH-PUBLIC-KEY", " - "+pub_key)
- line = line.replace("$$NFS_SERVER_SCRATCH$$", \
+ line = line.replace("$$NFS_SERVER_SCRATCH$$",
args.nfs_server_ip+":"+args.nfs_scratch_directory)
- line = line.replace("$$NFS_SERVER_COMMON$$", \
+ line = line.replace("$$NFS_SERVER_COMMON$$",
args.nfs_server_ip+":"+args.nfs_common_directory)
line = line.replace("$$VM_IMAGE$$", "server-"+args.release)
new_file.write(line)
@@ -343,8 +343,21 @@ def main():
client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
client.connect(ipaddr, username=args.ssh_user,
key_filename=args.ssh_privkey)
+ if 'centos' in args.topology:
+ if args.verbosity >= 1:
+ print "DEBUG: Installing RPM packages"
+ vpp_install_command = 'sudo rpm -ivh /scratch/vpp/*.rpm'
+ elif 'trusty' in args.topology or 'xenial' in args.topology:
+ if args.verbosity >= 1:
+ print "DEBUG: Installing DEB packages"
+ vpp_install_command = 'sudo dpkg -i --force-all ' \
+ '/scratch/vpp/*.deb'
+ else:
+ print "ERROR: Unsupported OS requested: {}"\
+ .format(args.topology)
+ vpp_install_command = ''
stdin, stdout, stderr = \
- client.exec_command('sudo dpkg -i --force-all /scratch/vpp/*deb')
+ client.exec_command(vpp_install_command)
c_stdout = stdout.read()
c_stderr = stderr.read()
if args.verbosity >= 2: