Changeset 1202

Timestamp:

12/13/06 16:25:01 (6 years ago)

Author:

mglb1

Message:

Check network templates for service state in the same way that host templates
are checked and ignore templates relating to disabled or unknown services.

File:

• ccsd/trunk/crcnetd/_utils/ccsd_cfengine.py (modified) (10 diffs)

ccsd/trunk/crcnetd/_utils/ccsd_cfengine.py

@@ -48 +48 @@
 from crcnetd._utils.ccsd_server import registerResource, exportViaXMLRPC, \
         initThread, registerRecurring, suggestThreadpoolSize
+from crcnetd._utils.ccsd_service import getServiceInstance, ccs_service_error
 
 DEFAULT_MAX_THREADS = 10
@@ -293 +294 @@
     stats["planned"] = {}
     stats["generated"] = {}
+    stats["skipped"] = {}
     stats["initiated"] = time.time()
     stats["setupprogress"] = 10
@@ -314 +316 @@
     stats["planned"]["hosts"] = hosts
     stats["generated"]["hosts"] = {}
-    
+    stats["skipped"]["hosts"] = {}
+
     # Work out how many host templates we're going to be generating
     total = 0
@@ -331 +334 @@
     stats["planned"]["total"] += len(stats["planned"]["network"])
     stats["generated"]["network"] = {}
-        
+    stats["skipped"]["network"] = {}
+
     # Aquire the lock to deal with statistics
     statsKey = token = createPassword(8)
@@ -499 +503 @@
             try:
                 generated = _templateStats[statsKey]["generated"]["network"]
+                skipped = _templateStats[statsKey]["skipped"]["network"]
                 for template in network:
-                    if not template in generated.keys():
-                        continue
-                    # Check for errors
-                    if generated[template]["error"] != "":
-                        hasTemplateError = True
+                    if template in generated.keys():
+                        # Check for errors
+                        if generated[template]["error"] != "":
+                            hasTemplateError = True
+                    else:
+                        if template not in skipped.keys():
+                            continue
                     # Remove from the list
                     network.remove(template)
@@ -666 +673 @@
         template = _networkTemplates[template_id]
         t = eval("template.%s()" % template.templateName)
+        # Is it enabled?
+        if not t.enabledOnNetwork(networkData["session_id"]):
+            _statsLock.acquire()
+            try:
+                skipped = _templateStats[statsKey]["skipped"]["network"]
+                skipped[template_id] = True
+            finally:
+                _statsLock.release()
+            _threadLimit.release()
+            return
         # Set up the variables we want to substitute in
         t._searchList = [networkData]
@@ -789 +806 @@
         return host.hasServiceEnabledByName(serviceName)
 
+    def enabledOnNetwork(self, session_id):
+        """Returns true if the template is able to be processed
+
+        By default this method looks to see if the template has defined a 
+        serviceName parameter. If it has then the function checks to see if
+        that service is enabled. If it is not the function returns False. 
+        
+        This function may be overriden by other classes/templates if you want
+        to implement more logic than the default implementation provides.
+        """
+        serviceName = getattr(self, "serviceName", None)
+        if serviceName is None:
+            return True
+
+        try:
+            service = getServiceInstance(session_id, serviceName)
+        except ccs_service_error:
+            # Named service not known
+            return False
+        return service.getState()
+
     def getTemplateVariables(self):
         """Returns a dictionary of variables that can be used by the template
@@ -913 +951 @@
         session.begin("Moved SSH keys due to host rename from %s => %s" % 
                 (old_name, host["host_name"]))
-        print "started revision"
         commit = 1
 
@@ -940 +977 @@
     # Commit changeset if necessary
     if commit==1:
-        print "committing revision"
         session.commit()
         
@@ -1259 +1295 @@
     # PHP sends in an associative array we want the values only
     hosts = hosts.values()
-    print hosts
 
     # Loop through the specified hosts and mark them as pending