svn merge -r 12308:13112 https://svn.planet-lab.org/svn/Monitor/branches/2.0/

[monitor.git] / testapi.py

diff --git a/testapi.py b/testapi.py
index 5e7daa8..d60effb 100755 (executable)
--- a/testapi.py
+++ b/testapi.py
@@ -1,19 +1,20 @@
 #!/usr/bin/python
 
-import plc
 import sys
 import traceback
 
+from monitor.wrapper import plc
+
 api = plc.getAuthAPI()
-loginbase = sys.argv[1] # "princeton"
 
 try:
-       site = api.GetSites(loginbase)[0]
+       # Just try the first site returned by the call
+       site = api.GetSites()[0]
        site_nodes = api.GetNodes(site['node_ids'])
        site_people = api.GetPersons(site['person_ids'])
        for node in site_nodes:
                network = api.GetNodeNetworks(node['nodenetwork_ids'])
        print "ok"
 except:
-       sys.stderr.write(traceback.print_exc())
+       sys.stderr.write(traceback.format_exc())
        print "fail"