X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fplc.py;h=b7b55d982123fcd15f89ed7de40dee46ff02a436;hb=4a073a361fbf578a505a4439b33685cfab7ca37f;hp=a78541e91a18c1d2a19ce133f41154bb1f8d0380;hpb=36b3183046a4c77cda147b440c6e85d1a036f239;p=monitor.git

diff --git a/monitor/wrapper/plc.py b/monitor/wrapper/plc.py
index a78541e..b7b55d9 100644
--- a/monitor/wrapper/plc.py
+++ b/monitor/wrapper/plc.py
@@ -402,11 +402,11 @@ def suspendSlices(nodename):
 
 
 def enableSiteSlices(loginbase):
-        if isPendingSite(loginbase):
-                msg = "INFO: enableSiteSlices: Pending Site (%s)" % loginbase
-                print msg
-                logger.info(msg)
-                return
+	if isPendingSite(loginbase):
+		msg = "INFO: enableSiteSlices: Pending Site (%s)" % loginbase
+		print msg
+		logger.info(msg)
+		return
 
 	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	for slice in slices(loginbase):
@@ -442,18 +442,20 @@ def enableSlices(nodename):
 #		api.SliceAttributeAdd(auth.auth, slice, "plc_slice_state", {"state" : "suspended"})
 #
 def enableSiteSliceCreation(loginbase):
-        if isPendingSite(loginbase):
-                msg = "INFO: enableSiteSliceCreation: Pending Site (%s)" % loginbase
-                print msg
-                logger.info(msg)
-                return
+	if isPendingSite(loginbase):
+		msg = "INFO: enableSiteSliceCreation: Pending Site (%s)" % loginbase
+		print msg
+		logger.info(msg)
+		return
 
 	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})
+			site = api.GetSites(auth.auth, loginbase)[0]
+			if site['enabled'] == False:
+				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)
@@ -466,13 +468,13 @@ def enableSliceCreation(nodename):
 Removes site's ability to create slices. Returns previous max_slices
 '''
 def removeSiteSliceCreation(loginbase):
-        print "removeSiteSliceCreation(%s)" % loginbase
+	print "removeSiteSliceCreation(%s)" % loginbase
 
-        if isPendingSite(loginbase):
-                msg = "INFO: removeSiteSliceCreation: Pending Site (%s)" % loginbase
-                print msg
-                logger.info(msg)
-                return
+	if isPendingSite(loginbase):
+		msg = "INFO: removeSiteSliceCreation: Pending Site (%s)" % loginbase
+		print msg
+		logger.info(msg)
+		return
 
 	api = xmlrpclib.Server(auth.server, verbose=False)
 	try: