X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=qaapi%2Fqash;h=1253d1ccddfdaf72c1c576501b1004bddd6fe07c;hb=827e02837563b292d94609ff5c6ea0c6e2c30e90;hp=3eae64f1060151d5b27eb63f19683ad8fab2bd49;hpb=3f5f1632d6d78878e4a30cfc6ea012c9bad0f674;p=tests.git

diff --git a/qaapi/qash b/qaapi/qash
index 3eae64f..1253d1c 100755
--- a/qaapi/qash
+++ b/qaapi/qash
@@ -7,9 +7,7 @@
 import os, sys
 from optparse import OptionParser
 from traceback import print_exc
-
-import utils
-import System
+from qa import utils
 from qa.QAAPI import QAAPI
 
 sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
@@ -17,19 +15,21 @@ sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
 parser = OptionParser(add_help_option = False)
 parser.add_option("-f", "--config", help = "configuration file")
 parser.add_option("-l", "--log", help="enable logging")
+parser.add_option("-v", "--verbose", help="be verbose")
 parser.add_option("--help", action = "help", help = "show this help message and exit")
 (options, args) = parser.parse_args()
 
 # XX Load callable tests
 try:
-   qaapi import QAAPI(globals(), 
-		      options.config, 
-		      options.log)
-
+    qaapi = QAAPI(globals(), 
+	 config = options.config, 
+	 logging = options.log,
+	 verbose = options.verbose)
+    config = qaapi.config
+    plcapi = config.api
+    auth = config.auth
 except Exception, err:
-    print "Error: ", err
-    parser.print_help()
-    sys.exit(1)
+    raise
 
 # If called by a script
 if len(sys.argv) > 1 and os.path.exists(sys.argv[1]):