fixed typo on logger name for exceptions.

[monitor.git] / monitor / wrapper / plc.py

diff --git a/monitor/wrapper/plc.py b/monitor/wrapper/plc.py
index 7d9af2d..5e6fb7f 100644 (file)
--- a/monitor/wrapper/plc.py
+++ b/monitor/wrapper/plc.py
@@ -14,8 +14,10 @@ import time
 import traceback
 from monitor import database
 
+# note: this needs to be consistent with the value in PLEWWW/planetlab/includes/plc_functions.php
 PENDING_CONSORTIUM_ID = 0
-APPROVED_CONSORTIUM_ID = 999999
+# not used in monitor
+#APPROVED_CONSORTIUM_ID = 999999
 
 try:
        from monitor import config
@@ -246,7 +248,11 @@ Returns dict of PCU info of a given node.
 def getpcu(nodename):
        api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
        anon = {'AuthMethod': "anonymous"}
-       nodeinfo = api.GetNodes(auth.auth, {"hostname": nodename}, ["pcu_ids", "ports"])[0]
+        try:
+                nodeinfo = api.GetNodes(auth.auth, {"hostname": nodename}, ["pcu_ids", "ports"])[0]
+        except IndexError:
+                logger.info("Can not find node: %s" % nodename)
+                return False
        if nodeinfo['pcu_ids']:
                print nodeinfo
                sitepcu = api.GetPCUs(auth.auth, nodeinfo['pcu_ids'])[0]
@@ -334,7 +340,7 @@ def isPendingSite(loginbase):
         try:
                 site = api.GetSites(auth.auth, loginbase)[0]
         except Exception, exc:
-                login.info("ERROR: No site %s" % loginbase)
+                logger.info("ERROR: No site %s" % loginbase)
                 return False
 
         if not site['enabled'] and site['ext_consortium_id'] == PENDING_CONSORTIUM_ID:
@@ -376,6 +382,12 @@ def nodePOD(nodename):
 Freeze all site slices.
 '''
 def suspendSiteSlices(loginbase):
+        if isPendingSite(loginbase):
+                msg = "INFO: suspendSiteSlices: Pending Site (%s)" % loginbase
+                print msg
+                logger.info(msg)
+                return
+
        api = xmlrpclib.Server(auth.server, verbose=False)
        for slice in slices(loginbase):
                logger.info("Suspending slice %s" % slice)
@@ -389,16 +401,17 @@ def suspendSiteSlices(loginbase):
 Freeze all site slices.
 '''
 def suspendSlices(nodename):
-       api = xmlrpclib.Server(auth.server, verbose=False)
-       for slice in slices(siteId(nodename)):
-               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)
+        loginbase = siteId(nodename)
+        suspendSiteSlices(loginbase)
+
 
 def enableSiteSlices(loginbase):
+       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):
                logger.info("Enabling slices %s" % slice)
@@ -418,24 +431,8 @@ def enableSiteSlices(loginbase):
                        print "exception: %s" % exc
 
 def enableSlices(nodename):
-       api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
-
-       for slice in slices(siteId(nodename)):
-               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("enableSlices: %s" % exc)
-                       print "exception: %s" % exc
+        loginbase = siteId(nodename)
+        enableSiteSlices(loginbase)
 
 
 #I'm commenting this because this really should be a manual process.  
@@ -449,42 +446,39 @@ 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)
 
 def enableSliceCreation(nodename):
-       api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
-       try:
-               loginbase = siteId(nodename)
-                enableSiteSliceCreation(loginbase)
-       except Exception, exc:
-               print "ERROR: enableSliceCreation:  %s" % exc
-               logger.info("ERROR: enableSliceCreation:  %s" % exc)
+        loginbase = siteId(nodename)
+        enableSiteSliceCreation(loginbase)
 
 '''
 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:
@@ -498,13 +492,9 @@ def removeSiteSliceCreation(loginbase):
 Removes ability to create slices. Returns previous max_slices
 '''
 def removeSliceCreation(nodename):
-       print "removeSliceCreation(%s)" % nodename
-       api = xmlrpclib.Server(auth.server, verbose=False)
-       try:
-               loginbase = siteId(nodename)
-                removeSiteSliceCreation(loginbase)
-       except Exception, exc:
-               logger.info("removeSliceCreation:  %s" % exc)
+        loginbase = siteId(nodename)
+        removeSiteSliceCreation(loginbase)
+
 
 '''
 QED