X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fplc.py;h=8f70c1f6c0bf654e9a8e0daa0dd3649d69f272b7;hb=16b7bc48471b0695e72320fbcf761db695af032e;hp=2ab180872d51df05a41e1e971efc074dce614198;hpb=4d56ef5473c6486c321dd2797be45b45b0606dae;p=monitor.git

diff --git a/monitor/wrapper/plc.py b/monitor/wrapper/plc.py
index 2ab1808..8f70c1f 100644
--- a/monitor/wrapper/plc.py
+++ b/monitor/wrapper/plc.py
@@ -17,8 +17,12 @@ from monitor import database
 try:
 	from monitor import config
 	debug = config.debug
+	XMLRPC_SERVER=config.API_SERVER
 except:
 	debug = False
+	# NOTE: this host is used by default when there are no auth files.
+	XMLRPC_SERVER="https://boot.planet-lab.org/PLCAPI/"
+
 logger = logging.getLogger("monitor")
 	
 class Auth:
@@ -34,8 +38,6 @@ class Auth:
 							'AuthMethod' : 'password',
 							'AuthString' : password}
 
-# NOTE: this host is used by default when there are no auth files.
-XMLRPC_SERVER="https://boot.planet-lab.org/PLCAPI/"
 
 # NOTE: by default, use anonymous access, but if auth files are 
 #       configured, use them, with their auth definitions.
@@ -54,7 +56,7 @@ except:
 		auth = Auth()
 		auth.server = XMLRPC_SERVER
 
-api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
+global_error_count = 0
 
 class PLC:
 	def __init__(self, auth, url):
@@ -67,11 +69,23 @@ class PLC:
 		if method is None:
 			raise AssertionError("method does not exist")
 
-		return lambda *params : method(self.auth, *params)
+		try:
+			return lambda *params : method(self.auth, *params)
+		except ProtocolError:
+			traceback.print_exc()
+			global_error_count += 1
+			if global_error_count >= 10:
+				print "maximum error count exceeded; exiting..."
+				sys.exit(1)
+			else:
+				print "%s errors have occurred" % global_error_count
+			raise Exception("ProtocolError continuing")
 
 	def __repr__(self):
 		return self.api.__repr__()
 
+api = PLC(auth.auth, auth.server)
+
 class CachedPLC(PLC):
 
 	def _param_to_str(self, name, *params):
@@ -287,14 +301,14 @@ def getSiteNodes2(loginbase):
 
 def getNodeNetworks(filter=None):
 	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
-	nodenetworks = api.GetNodeNetworks(auth.auth, filter, None)
+	nodenetworks = api.GetInterfaces(auth.auth, filter, None)
 	return nodenetworks
 
 def getNodes(filter=None, fields=None):
 	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',
+			#'site_id', 'date_created', 'node_id', 'version', 'interface_ids',
 			#'last_updated', 'peer_node_id', 'ssh_rsa_key' ])
 	return nodes
 
@@ -327,6 +341,19 @@ def nodePOD(nodename):
 	except Exception, exc:
 			logger.info("nodePOD:  %s" % exc)
 
+'''
+Freeze all site slices.
+'''
+def suspendSiteSlices(loginbase):
+	api = xmlrpclib.Server(auth.server, verbose=False)
+	for slice in slices(loginbase):
+		logger.info("Suspending slice %s" % slice)
+		try:
+			if not debug:
+				api.AddSliceAttribute(auth.auth, slice, "enabled", "0")
+		except Exception, exc:
+			logger.info("suspendSlices:  %s" % exc)
+
 '''
 Freeze all site slices.
 '''
@@ -340,6 +367,25 @@ def suspendSlices(nodename):
 		except Exception, exc:
 			logger.info("suspendSlices:  %s" % exc)
 
+def enableSiteSlices(loginbase):
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
+	for slice in slices(loginbase):
+		logger.info("Enabling slices %s" % slice)
+		try:
+			if not 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("enableSiteSlices: %s" % exc)
+			print "exception: %s" % exc
+
 def enableSlices(nodename):
 	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	for slice in slices(siteId(nodename)):
@@ -369,6 +415,17 @@ def enableSlices(nodename):
 #		logger.info("Suspending slice %s" % slice)
 #		api.SliceAttributeAdd(auth.auth, slice, "plc_slice_state", {"state" : "suspended"})
 #
+def enableSiteSliceCreation(loginbase):
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
+	try:
+		logger.info("Enabling slice creation for site %s" % loginbase)
+		if not debug:
+			logger.info("\tcalling UpdateSite(%s, enabled=True)" % loginbase)
+			api.UpdateSite(auth.auth, loginbase, {'enabled': True})
+	except Exception, exc:
+		print "ERROR: enableSiteSliceCreation:  %s" % exc
+		logger.info("ERROR: enableSiteSliceCreation:  %s" % exc)
+
 def enableSliceCreation(nodename):
 	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	try:
@@ -381,6 +438,19 @@ def enableSliceCreation(nodename):
 		print "ERROR: enableSliceCreation:  %s" % exc
 		logger.info("ERROR: enableSliceCreation:  %s" % exc)
 
+'''
+Removes site's ability to create slices. Returns previous max_slices
+'''
+def removeSiteSliceCreation(sitename):
+	print "removeSiteSliceCreation(%s)" % sitename
+	api = xmlrpclib.Server(auth.server, verbose=False)
+	try:
+		logger.info("Removing slice creation for site %s" % sitename)
+		if not debug:
+			api.UpdateSite(auth.auth, sitename, {'enabled': False})
+	except Exception, exc:
+		logger.info("removeSiteSliceCreation:  %s" % exc)
+
 '''
 Removes ability to create slices. Returns previous max_slices
 '''