X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=siteinfo.py;h=4b4daf77fabe54721bc05b0a6f5c72ea9c791380;hb=refs%2Fheads%2F2.0;hp=041bf1c6780f13c7f7d785604d5f359ae6ebc594;hpb=90b2e8e7cb145cb1f6b3780867617084441b6ca9;p=monitor.git

diff --git a/siteinfo.py b/siteinfo.py
index 041bf1c..4b4daf7 100755
--- a/siteinfo.py
+++ b/siteinfo.py
@@ -4,15 +4,13 @@ from monitor.wrapper import plc
 api = plc.getAuthAPI()
 
 from monitor import database
-from monitor.pcu import reboot
 
 import time
-from model import *
-from nodecommon import *
+from monitor.common import *
 
 from monitor import util
 from monitor import parser as parsermodule
-from unified_model import *
+from monitor.model import *
 
 
 parser = parsermodule.getParser()
@@ -64,7 +62,7 @@ def plc_print_siteinfo(plcsite):
 			 diff_time(plcsite['last_updated']))
 
 	print ""
-	nodes = api.GetNodes(plcsite['node_ids'])
+	nodes = plccache.GetNodesByIds(plcsite['node_ids'])
 	print "   Checked: %s" % time.ctime()
 	print "\t                               host     | state | obs   |   created   |   updated   | last_contact "
 	for plcnode in nodes:
@@ -81,7 +79,7 @@ act_all = database.dbLoad("act_all")
 for site in config.args:
 	config.site = site
 
-	plc_siteinfo = api.GetSites({'login_base': config.site})[0]
+	plc_siteinfo = plccache.GetSitesByName([config.site])
 	url = "https://www.planet-lab.org/db/sites/index.php?site_pattern="
 	plc_siteinfo['url'] = url + plc_siteinfo['login_base']
 
@@ -89,7 +87,7 @@ for site in config.args:
 		# rerun findbad with the nodes in the given nodes.
 		import os
 		file = "findbad.txt"
-		nodes = api.GetNodes(plc_siteinfo['node_ids'], ['hostname'])
+		nodes = plccache.GetNodesByIds(plc_siteinfo['node_ids'])
 		nodes = [ n['hostname'] for n in nodes ]
 		util.file.setFileFromList(file, nodes)
 		os.system("./findbad.py --cachenodes --debug=0 --dbname=findbad --increment --nodelist %s" % file)