X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.py;h=ff5efd3d4717d92de590f86d5f40498fbf6d2498;hb=a461de324d98156c26d22c498fad751d7dd4aeea;hp=76eef6412f8543fe4931d3294413c8808475418d;hpb=51cdfe7db89c8808e665bf2b71a710035e10515c;p=monitor.git

diff --git a/plc.py b/plc.py
index 76eef64..ff5efd3 100644
--- a/plc.py
+++ b/plc.py
@@ -5,7 +5,7 @@
 # 
 # Faiyaz Ahmed <faiyaza@cs.princeton.edu
 #
-# $Id: plc.py,v 1.13 2007/04/02 20:57:57 faiyaza Exp $
+# $Id: plc.py,v 1.15 2007/06/29 12:42:22 soltesz Exp $
 #
 
 from emailTxt import *
@@ -13,11 +13,13 @@ import xml, xmlrpclib
 import logging
 import auth
 import time
-import config
+from config import config,XMLRPC_SERVER
 
 logger = logging.getLogger("monitor")
 
-XMLRPC_SERVER = 'https://www.planet-lab.org/PLCAPI/'
+#XMLRPC_SERVER = config.XMLRPC_SERVER
+
+config = config()
 
 '''
 Returns list of nodes in dbg as reported by PLC
@@ -84,6 +86,39 @@ def getSiteNodes(loginbase):
 		logger.info("getSiteNodes:  %s" % exc)
 	return nodelist
 
+def getSites(filter=None):
+	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	sites = []
+	anon = {'AuthMethod': "anonymous"}
+	try:
+		sites = api.GetSites(anon, filter, None)
+	except Exception, exc:
+		print "getSiteNodes2:  %s" % exc
+		logger.info("getSiteNodes2:  %s" % exc)
+	return sites
+
+def getSiteNodes2(loginbase):
+	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	nodelist = []
+	anon = {'AuthMethod': "anonymous"}
+	try:
+		nodeids = api.GetSites(anon, {"login_base": loginbase})[0]['node_ids']
+		nodelist += getNodes({'node_id':nodeids})
+	except Exception, exc:
+		logger.info("getSiteNodes2:  %s" % exc)
+	return nodelist
+
+def getNodeNetworks(filter=None):
+	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	nodenetworks = api.GetNodeNetworks(auth.auth, filter, None)
+	return nodenetworks
+
+def getNodes(filter=None):
+	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	nodes = api.GetNodes(auth.auth, filter, ['boot_state', 'hostname', 
+			'site_id', 'date_created', 'node_id', 'version', 'nodenetwork_ids',
+			'last_updated', 'peer_node_id', 'ssh_rsa_key' ])
+	return nodes
 
 '''
 Sets boot state of a node.
@@ -139,11 +174,12 @@ def removeSliceCreation(nodename):
 	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
 	try:
 		loginbase = siteId(nodename)
-		numslices = api.GetSites(auth.auth, {"login_base": loginbase}, 
-				["max_slices"])[0]['max_slices']
+		#numslices = api.GetSites(auth.auth, {"login_base": loginbase}, 
+		#		["max_slices"])[0]['max_slices']
 		logger.info("Removing slice creation for site %s" % loginbase)
 		if not config.debug:
-			api.UpdateSite(auth.auth, loginbase, {'max_slices': 0})
+			#api.UpdateSite(auth.auth, loginbase, {'max_slices': 0})
+			api.UpdateSite(auth.auth, loginbase, {'enabled': False})
 	except Exception, exc:
 		logger.info("removeSliceCreation:  %s" % exc)