X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.py;h=783efbc744634df1b9b2a1286861f98fa8bd9546;hb=29c312880142debcc8c36117401b8877a7944dee;hp=5bc5349e90b9b72082e08c49f65c875c87e46212;hpb=b28a7b27ef4f9beb0017314f6fde0a622f10f626;p=monitor.git

diff --git a/plc.py b/plc.py
index 5bc5349..783efbc 100644
--- a/plc.py
+++ b/plc.py
@@ -10,33 +10,40 @@
 
 import xml, xmlrpclib
 import logging
-try:
-    import auth
-except:
-	class Anon:
-		def __init__(self):
-			self.auth = {'AuthMethod': "anonymous"}
-	auth = Anon()
-
 import time
+import traceback
 try:
-	from config import config
+	import config
 	debug = config.debug
 except:
 	debug = False
-	
-XMLRPC_SERVER="https://boot.planet-lab.org/PLCAPI/"
-
 logger = logging.getLogger("monitor")
+	
+class Auth:
+	def __init__(self):
+		self.auth = {'AuthMethod': "anonymous"}
 
-#XMLRPC_SERVER = config.XMLRPC_SERVER
+# NOTE: this host is used by default when there are no auth files.
+XMLRPC_SERVER="https://boot.planet-lab.org/PLCAPI/"
 
-config = config()
-api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+# NOTE: by default, use anonymous access, but if auth files are 
+#       configured, use them, with their auth definitions.
+auth = Auth()
+try:
+	from monitor import config
+	auth.auth = {'Username' : config.API_AUTH_USER,
+	             'AuthMethod' : 'password',
+				 'AuthString' : config.API_AUTH_PASSWORD}
+	auth.server = config.API_SERVER
+except:
+	try:
+		import auth
+		auth.server = auth.plc
+	except:
+		auth = Auth()
+		auth.server = XMLRPC_SERVER
 
-def getAPI(url):
-	api = xmlrpclib.Server(url, verbose=False, allow_none=True)
-	return api
+api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 
 class PLC:
 	def __init__(self, auth, url):
@@ -54,12 +61,18 @@ class PLC:
 	def __repr__(self):
 		return self.api.__repr__()
 
+def getAPI(url):
+	return xmlrpclib.Server(url, verbose=False, allow_none=True)
+
+def getAuthAPI():
+	return PLC(auth.auth, auth.server)
+
 '''
 Returns list of nodes in dbg as reported by PLC
 '''
 def nodesDbg():
 	dbgNodes = []
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	anon = {'AuthMethod': "anonymous"}
 	for node in api.GetNodes(anon, {"boot_state":"dbg"},["hostname"]):
 		dbgNodes.append(node['hostname'])
@@ -71,7 +84,7 @@ def nodesDbg():
 Returns loginbase for given nodename
 '''
 def siteId(nodename):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	anon = {'AuthMethod': "anonymous"}
 	site_id = api.GetNodes (anon, {"hostname": nodename}, ['site_id'])
 	if len(site_id) == 1:
@@ -83,7 +96,7 @@ Returns list of slices for a site.
 '''
 def slices(loginbase):
 	siteslices = []
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	sliceids = api.GetSites (auth.auth, {"login_base" : loginbase}, ["slice_ids"])[0]['slice_ids']
 	for slice in api.GetSlices(auth.auth, {"slice_id" : sliceids}, ["name"]):
 		siteslices.append(slice['name'])
@@ -93,7 +106,7 @@ def slices(loginbase):
 Returns dict of PCU info of a given node.
 '''
 def getpcu(nodename):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	anon = {'AuthMethod': "anonymous"}
 	nodeinfo = api.GetNodes(auth.auth, {"hostname": nodename}, ["pcu_ids", "ports"])[0]
 	if nodeinfo['pcu_ids']:
@@ -105,7 +118,7 @@ def getpcu(nodename):
 		return False
 
 def GetPCUs(filter=None, fields=None):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	pcu_list = api.GetPCUs(auth.auth, filter, fields)
 	return pcu_list 
 
@@ -113,7 +126,7 @@ def GetPCUs(filter=None, fields=None):
 Returns all site nodes for site id (loginbase).
 '''
 def getSiteNodes(loginbase, fields=None):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	nodelist = []
 	anon = {'AuthMethod': "anonymous"}
 	try:
@@ -126,7 +139,7 @@ def getSiteNodes(loginbase, fields=None):
 	return nodelist
 
 def getPersons(filter=None, fields=None):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	persons = []
 	try:
 		persons = api.GetPersons(auth.auth, filter, fields)
@@ -136,18 +149,20 @@ def getPersons(filter=None, fields=None):
 	return persons
 
 def getSites(filter=None, fields=None):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	sites = []
 	anon = {'AuthMethod': "anonymous"}
 	try:
-		sites = api.GetSites(anon, filter, fields)
+		#sites = api.GetSites(anon, filter, fields)
+		sites = api.GetSites(auth.auth, filter, fields)
 	except Exception, exc:
+		traceback.print_exc()
 		print "getSites:  %s" % exc
 		logger.info("getSites:  %s" % exc)
 	return sites
 
 def getSiteNodes2(loginbase):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	nodelist = []
 	anon = {'AuthMethod': "anonymous"}
 	try:
@@ -158,12 +173,12 @@ def getSiteNodes2(loginbase):
 	return nodelist
 
 def getNodeNetworks(filter=None):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	nodenetworks = api.GetNodeNetworks(auth.auth, filter, None)
 	return nodenetworks
 
 def getNodes(filter=None, fields=None):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	nodes = api.GetNodes(auth.auth, filter, fields) 
 			#['boot_state', 'hostname', 
 			#'site_id', 'date_created', 'node_id', 'version', 'nodenetwork_ids',
@@ -174,14 +189,14 @@ def getNodes(filter=None, fields=None):
 Sets boot state of a node.
 '''
 def nodeBootState(nodename, state):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	try:
 		return api.UpdateNode(auth.auth, nodename, {'boot_state': state})
 	except Exception, exc:
 		logger.info("nodeBootState:  %s" % exc)
 
 def updateNodeKey(nodename, key):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	try:
 		return api.UpdateNode(auth.auth, nodename, {'key': key})
 	except Exception, exc:
@@ -191,7 +206,7 @@ def updateNodeKey(nodename, key):
 Sends Ping Of Death to node.
 '''
 def nodePOD(nodename):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	logger.info("Sending POD to %s" % nodename)
 	try:
 		if not debug:
@@ -203,7 +218,7 @@ def nodePOD(nodename):
 Freeze all site slices.
 '''
 def suspendSlices(nodename):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	for slice in slices(siteId(nodename)):
 		logger.info("Suspending slice %s" % slice)
 		try:
@@ -213,7 +228,7 @@ def suspendSlices(nodename):
 			logger.info("suspendSlices:  %s" % exc)
 
 def enableSlices(nodename):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	for slice in slices(siteId(nodename)):
 		logger.info("Enabling slices %s" % slice)
 		try:
@@ -236,13 +251,13 @@ def enableSlices(nodename):
 #Enable suspended site slices.
 #'''
 #def enableSlices(nodename, slicelist):
-#	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+#	api = xmlrpclib.Server(auth.server, verbose=False)
 #	for slice in  slices(siteId(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)
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	try:
 		loginbase = siteId(nodename)
 		logger.info("Enabling slice creation for site %s" % loginbase)
@@ -257,7 +272,8 @@ def enableSliceCreation(nodename):
 Removes ability to create slices. Returns previous max_slices
 '''
 def removeSliceCreation(nodename):
-	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+	print "removeSliceCreation(%s)" % nodename
+	api = xmlrpclib.Server(auth.server, verbose=False)
 	try:
 		loginbase = siteId(nodename)
 		#numslices = api.GetSites(auth.auth, {"login_base": loginbase}, 
@@ -273,13 +289,13 @@ def removeSliceCreation(nodename):
 QED
 '''
 #def enableSliceCreation(nodename, maxslices):
-#	api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
+#	api = xmlrpclib.Server(auth.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:
+#			if not debug:
 #				api.AdmUpdateSite(auth.auth, siteid[0], {"max_slices" : maxslices})
 #		except Exception, exc:
 #			logger.info("API:  %s" % exc)
@@ -307,5 +323,4 @@ def main():
 	#print slices("princeton")
 
 if __name__=="__main__":
-	import reboot
 	main()