From d551ff8e28e3d55302256a0c962829d1addd4dee Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Mon, 30 Mar 2009 15:36:13 +0000 Subject: [PATCH] updated traceroutes to install tcptraceroute if it doesn't exist --- qaapi/qa/tests/slice/nmapitest.py | 17 +++++++++-------- qaapi/qa/tests/slice/traceroutes.pl | 6 +++++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/qaapi/qa/tests/slice/nmapitest.py b/qaapi/qa/tests/slice/nmapitest.py index 3c5df41..023629b 100755 --- a/qaapi/qa/tests/slice/nmapitest.py +++ b/qaapi/qa/tests/slice/nmapitest.py @@ -5,14 +5,15 @@ # Author: acb@cs.princeton.edu/sapanb@cs.princeton.edu import sys +import os from xmlrpclib import ServerProxy -if (len(sys.argv)!=2): - print "[FAILED] Please pass the name of the slice this script runs in as the first argument.\n"; -else: - nodemanager = ServerProxy('http://127.0.0.1:812/') - try: - nodemanager.SetLoans(sys.argv[1], []) - except: - print "[FAILED] SetLoans didn't work, probably because the packets of this connection are not getting tagged.\n"; +homedir=os.environ['HOME'] +slice_name = homedir.rsplit('/')[0] + +nodemanager = ServerProxy('http://127.0.0.1:812/') +try: + nodemanager.SetLoans(slice_name, []) +except: + print "[FAILED] SetLoans didn't work, probably because the packets of this connection are not getting tagged.\n"; diff --git a/qaapi/qa/tests/slice/traceroutes.pl b/qaapi/qa/tests/slice/traceroutes.pl index 95e7a70..fdb0406 100755 --- a/qaapi/qa/tests/slice/traceroutes.pl +++ b/qaapi/qa/tests/slice/traceroutes.pl @@ -35,7 +35,11 @@ if ($traceroute !~ /^\//) { if (!-e "$ttraceroute") { print $ttraceroute."\n"; - die("[FAILED] Please install tcptraceroute in the slice before running this test\n"); + print "[OOPS] TCPtraceroute not found. Installing... \n"; + system("yum -y tcptraceroute"); + if (!-e "$ttraceroute") { + print "[FAILED] TCPtraceroute could not be installed. Test failed.\n"; + } } else { print "Found tcptraceroute. Good.\n"; -- 2.47.0