X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.py;h=d7a846b2d24173e0c8a4bdefc038688398e71d7a;hb=5822f1e740aadefd45b31bf04da02a437c458480;hp=cb56ff490ccf9cd4e1412beab20156dc976dfbce;hpb=34a4c8387ad2e397f46a03d9476096f1cd5abfc6;p=monitor.git

diff --git a/plc.py b/plc.py
index cb56ff4..d7a846b 100644
--- a/plc.py
+++ b/plc.py
@@ -5,7 +5,7 @@
 # 
 # Faiyaz Ahmed <faiyaza@cs.princeton.edu
 #
-# $Id: plc.py,v 1.14 2007/04/06 16:16:54 faiyaza Exp $
+# $Id: plc.py,v 1.18 2007/08/29 17:26:50 soltesz Exp $
 #
 
 from emailTxt import *
@@ -13,13 +13,13 @@ import xml, xmlrpclib
 import logging
 import auth
 import time
-from config import config
-
-config = 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
@@ -71,30 +71,35 @@ def getpcu(nodename):
 		logger.info("%s doesn't have PCU" % nodename)
 		return False
 
+def GetPCUs(filter=None, fields=None):
+	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	pcu_list = api.GetPCUs(auth.auth, filter, fields)
+	return pcu_list 
+
 '''
 Returns all site nodes for site id (loginbase).
 '''
-def getSiteNodes(loginbase):
+def getSiteNodes(loginbase, fields=None):
 	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
 	nodelist = []
 	anon = {'AuthMethod': "anonymous"}
 	try:
-		nodeids = api.GetSites(anon, {"login_base": loginbase})[0]['node_ids']
-		for node in api.GetNodes(anon, {"node_id": nodeids}):
+		nodeids = api.GetSites(anon, {"login_base": loginbase}, fields)[0]['node_ids']
+		for node in api.GetNodes(anon, {"node_id": nodeids}, ['hostname']):
 			nodelist.append(node['hostname'])
 	except Exception, exc:
 		logger.info("getSiteNodes:  %s" % exc)
 	return nodelist
 
-def getSites(filter=None):
+def getSites(filter=None, fields=None):
 	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
 	sites = []
 	anon = {'AuthMethod': "anonymous"}
 	try:
-		sites = api.GetSites(anon, filter, None)
+		sites = api.GetSites(anon, filter, fields)
 	except Exception, exc:
-		print "getSiteNodes2:  %s" % exc
-		logger.info("getSiteNodes2:  %s" % exc)
+		print "getSites:  %s" % exc
+		logger.info("getSites:  %s" % exc)
 	return sites
 
 def getSiteNodes2(loginbase):
@@ -113,11 +118,11 @@ def getNodeNetworks(filter=None):
 	nodenetworks = api.GetNodeNetworks(auth.auth, filter, None)
 	return nodenetworks
 
-def getNodes(filter=None):
+def getNodes(filter=None, fields=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' ])
+	nodes = api.GetNodes(auth.auth, filter, fields) #['boot_state', 'hostname', 
+			#'site_id', 'date_created', 'node_id', 'version', 'nodenetwork_ids',
+			#'last_updated', 'peer_node_id', 'ssh_rsa_key' ])
 	return nodes
 
 '''
@@ -155,6 +160,24 @@ def suspendSlices(nodename):
 		except Exception, exc:
 			logger.info("suspendSlices:  %s" % exc)
 
+def enableSlices(nodename):
+	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	for slice in slices(siteId(nodename)):
+		logger.info("Enabling slices %s" % slice)
+		try:
+			if not config.debug:
+				slice_list = api.GetSlices(auth.auth, {'name': slice}, None)
+				if len(slice_list) == 0:
+					return
+				slice_id = slice_list[0]['slice_id']
+				l_attr = api.GetSliceAttributes(auth.auth, {'slice_id': slice_id}, None)
+				for attr in l_attr:
+					if "enabled" == attr['name'] and attr['value'] == "0":
+						logger.info("Deleted enable=0 attribute from slice %s" % slice)
+						api.DeleteSliceAttribute(auth.auth, attr['slice_attribute_id'])
+		except Exception, exc:
+			logger.info("enableSlices: %s" % exc)
+			print "exception: %s" % exc
 
 #I'm commenting this because this really should be a manual process.  
 #'''
@@ -166,6 +189,17 @@ def suspendSlices(nodename):
 #		logger.info("Suspending slice %s" % slice)
 #		api.SliceAttributeAdd(auth.auth, slice, "plc_slice_state", {"state" : "suspended"})
 #
+def enableSliceCreation(nodename):
+	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	try:
+		loginbase = siteId(nodename)
+		logger.info("Enabling slice creation for site %s" % loginbase)
+		if not config.debug:
+			logger.info("\tcalling UpdateSite(%s, enabled=True)" % loginbase)
+			api.UpdateSite(auth.auth, loginbase, {'enabled': True})
+	except Exception, exc:
+		print "ERROR: enableSliceCreation:  %s" % exc
+		logger.info("ERROR: enableSliceCreation:  %s" % exc)
 
 '''
 Removes ability to create slices. Returns previous max_slices
@@ -186,19 +220,19 @@ def removeSliceCreation(nodename):
 '''
 QED
 '''
-def enableSliceCreation(nodename, maxslices):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
-	anon = {'AuthMethod': "anonymous"}
-	siteid = api.AnonAdmQuerySite (anon, {"node_hostname": nodename})
-	if len(siteid) == 1:
-		logger.info("Enabling slice creation for site %s" % siteId(nodename))
-		try:
-			if not config.debug:
-				api.AdmUpdateSite(auth.auth, siteid[0], {"max_slices" : maxslices})
-		except Exception, exc:
-			logger.info("API:  %s" % exc)
-	else:
-		logger.debug("Cant find site for %s.  Cannot enable creation." % nodename)
+#def enableSliceCreation(nodename, maxslices):
+#	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+#	anon = {'AuthMethod': "anonymous"}
+#	siteid = api.AnonAdmQuerySite (anon, {"node_hostname": nodename})
+#	if len(siteid) == 1:
+#		logger.info("Enabling slice creation for site %s" % siteId(nodename))
+#		try:
+#			if not config.debug:
+#				api.AdmUpdateSite(auth.auth, siteid[0], {"max_slices" : maxslices})
+#		except Exception, exc:
+#			logger.info("API:  %s" % exc)
+#	else:
+#		logger.debug("Cant find site for %s.  Cannot enable creation." % nodename)
 
 def main():
 	logger.setLevel(logging.DEBUG)