Changeset 1135

Timestamp:

11/22/06 11:10:27 (6 years ago)

Author:

mglb1

Message:

Refactor service initialisation

• Remove the concept of service modules
• Services are now normal modules that happen to contain a class derived from ccs_service
• registerService should be called from ccs_init

Location:

ccsd

Files:

• private/dbschema (added)
• private/dbschema/amplet.schema (copied) (copied from ccsd/private/services/amplet.schema)
• private/dbschema/dhcp.schema (copied) (copied from ccsd/private/services/dhcp.schema)
• private/dbschema/quagga.schema (copied) (copied from ccsd/private/services/quagga.schema)
• private/modules/ccs_amplet.py (copied) (copied from ccsd/private/services/amplet.py) (2 diffs)
• private/modules/ccs_dhcp.py (copied) (copied from ccsd/private/services/dhcp.py) (2 diffs)
• private/modules/ccs_firewall.py (copied) (copied from ccsd/private/services/firewall.py) (2 diffs)
• private/modules/ccs_nagios.py (copied) (copied from ccsd/private/services/nagios.py) (2 diffs)
• private/modules/ccs_quagga.py (copied) (copied from ccsd/private/services/quagga.py) (2 diffs)
• private/services (deleted)
• trunk/crcnetd/__init__.py (modified) (1 diff)
• trunk/crcnetd/_utils/ccsd_service.py (modified) (1 diff)
• trunk/crcnetd/modules/ccs_hostapd.py (copied) (copied from ccsd/trunk/services/hostapd.py) (2 diffs)
• trunk/services (deleted)

ccsd/private/modules/ccs_amplet.py

@@ -20 +20 @@
 from crcnetd.modules.ccs_contact import addGroup, getGroupID, getContacts, \
         isGroupMemberU, getGroup, getMembers
+
+ccs_mod_type = CCSD_SERVER
 
 GROUP_PROPERTY = "amplet_group"
@@ -171 +173 @@
         return service_id
 
-registerService(amplet_service)
+def ccs_init():
+    registerService(amplet_service)

ccsd/private/modules/ccs_dhcp.py

@@ -20 +20 @@
 from crcnetd.modules.ccs_link import validateLinkClassId, ccs_link, \
         getInterfaceLink
+
+ccs_mod_type = CCSD_SERVER
 
 NS1_PROPERTY = "ns1"
@@ -337 +339 @@
         return service_id
 
-    
-registerService(dhcp_service)
+def ccs_init():
+    registerService(dhcp_service)

ccsd/private/modules/ccs_firewall.py

@@ -20 +20 @@
 from crcnetd.modules.ccs_contact import addGroup, getGroupID, getContacts, \
         isGroupMemberU, getGroup, getMembers
+
+ccs_mod_type = CCSD_SERVER
 
 NAGIOS_GROUP_NAME = "Nagios Contacts"
@@ -76 +78 @@
         return service_id
 
-registerService(firewall_service)
+def ccs_init():
+    registerService(firewall_service)

ccsd/private/modules/ccs_nagios.py

@@ -20 +20 @@
 from crcnetd.modules.ccs_contact import addGroup, getGroupID, getContacts, \
         isGroupMemberU, getGroup, getMembers
+
+ccs_mod_type = CCSD_SERVER
 
 NAGIOS_GROUP_NAME = "Nagios Contacts"
@@ -200 +202 @@
     return hostlist
 
-registerService(nagios_service)
+def ccs_init():
+    registerService(nagios_service)

ccsd/private/modules/ccs_quagga.py

@@ -19 +19 @@
 
 from crcnetd.modules.ccs_link import validateLinkClassId, ccs_link
+
+ccs_mod_type = CCSD_SERVER
 
 TELNETPASS_PROPERTY = "telnet_password"
@@ -531 +533 @@
     return
 
-    
-registerService(quagga_service)
+def ccs_init():
+    registerService(quagga_service)

ccsd/trunk/crcnetd/__init__.py

@@ -324 +324 @@
     # Initialise services
     processClassMethods(ccsd_service)
-    try:
-        ccsd_service.loadServiceModules()
-    except:
-        log_fatal("Failed to load service modules!", sys.exc_info())
    
     # Initialise the certificate authority

ccsd/trunk/crcnetd/_utils/ccsd_service.py

@@ -678 +678 @@
     except:
         log_error("Failed to register service!", sys.exc_info())
-
-def loadServiceModules():
-    """Look through the services directory for services to import"""
-    global serviceLibDir
-    
-    # Load configuration data
-    serviceLibDir = config_get("ccsd", "service_lib_dir", \
-            DEFAULT_SERVICE_LIB_DIR)
-    serviceDataDir = config_get("ccsd", "service_data_dir", \
-            DEFAULT_SERVICE_DATA_DIR)
-
-    # Add the service dir to the import path
-    sys.path.append(serviceLibDir)
-    
-    for mfile in os.listdir(serviceLibDir):
-        # Skip directories, files not matching pattern
-        if os.path.isdir("%s/%s" % (serviceLibDir, mfile)) or \
-                mfile == "__init__.py" or \
-                re.compile(".*\\.py$").match(mfile) == None:
-            continue
-        sName = mfile[:len(mfile)-3]
-        try:
-            exec "import %s as %s" % (sName, sName)
-            # Look for class methods to be registered with XMLRPC
-            processClassMethods(eval("%s" % sName))
-        except:
-            log_error("Failed to load service '%s'!" % sName, \
-                    sys.exc_info())

ccsd/trunk/crcnetd/modules/ccs_hostapd.py

@@ -26 +26 @@
 from crcnetd._utils.ccsd_service import ccsd_service, ccs_service_error, \
         registerService
+
+ccs_mod_type = CCSD_SERVER
 
 class hostapd_error(ccs_service_error):
@@ -70 +72 @@
         return service_id
 
-registerService(hostapd_service)
+def ccs_init():
+    registerService(hostapd_service)