Changeset 203 for trunk/src

Timestamp:

08/22/12 14:17:15 (12 years ago)

Author:

bas

Message:

added two new configuration options for client program, closes #17

File:

• trunk/src/pxeconfig.py (modified) (7 diffs)

trunk/src/pxeconfig.py

@@ -125 +125 @@
     return files[index-1]
 
-def manage_links(haddr, options):
+def manage_links(haddr, ip_addr, options):
     """
     Create the links in the PXE_CONF_DIR,
@@ -141 +141 @@
             print 'removing %s/%s' %(PXE_CONF_DIR, haddr)
 
+            if options.SCRIPT_HOOK_REMOVE and ip_addr:
+                print 'Executing client script hook remove : %s with arg: %s' %(options.SCRIPT_HOOK_REMOVE, ip_addr)
+
         if os.path.exists(haddr) and not options.DRY_RUN:
             os.unlink(haddr)
 
     else:
+
         if options.DEBUG or options.DRY_RUN or options.VERBOSE:
             print 'linking %s to %s' %(haddr, pxe_filename)
+
+            if options.SCRIPT_HOOK_ADD and ip_addr:
+                print 'Executing client script hook add : %s with arg: %s' %(options.SCRIPT_HOOK_ADD, ip_addr)
 
         if not options.DRY_RUN:
@@ -152 +159 @@
                 os.unlink(haddr) 
             os.symlink(pxe_filename, haddr)
+    
+            if options.SCRIPT_HOOK_ADD and ip_addr:
+                cmd = '%s %s' %(options.SCRIPT_HOOK_ADD, ip_addr)
+                os.system(cmd)
 
 def net_2_hex(net, options):
@@ -194 +205 @@
     cnet = string.joinfields(net[0:3], '.')
 
-    if options.SCRIPT_HOOK:
-        if options.DEBUG or options.DRY_RUN or options.VERBOSE:
-            print 'Executing client script hook: %s with arg: %s' %(options.SCRIPT_HOOK, addr)
-        if not options.DRY_RUN:
-            cmd = '%s %s' %(options.SCRIPT_HOOK, addr)
-            os.system(cmd)
 
     haddr = '%s%02X' %(net_2_hex(cnet, options), int(net[3])) 
-    manage_links(haddr, options)
+    manage_links(haddr, addr, options)
 
 
@@ -214 +219 @@
 
     haddr = '01-%s' %(mac_addr.replace(':', '-').lower())
-    manage_links(haddr, options)
+    manage_links(haddr, None, options)
 
 def add_options(p):
@@ -226 +231 @@
         REMOVE  = False,
         VERSION  = False,
-        SCRIPT_HOOK = False,
+        SCRIPT_HOOK_ADD = False,
+        SCRIPT_HOOK_REMOVE = False,
     )
 
@@ -302 +308 @@
             options.filename = select_pxe_configfile() 
 
-    # ...
-    try:
-        options.SCRIPT_HOOK = defaults['client_script_hook']
+
+    ## This will be obsoleted by client_script_hook_add
+    #
+    try:
+        options.SCRIPT_HOOK_ADD = defaults['client_script_hook']
+    except KeyError, detail:
+        pass
+
+    try:
+        options.SCRIPT_HOOK_ADD = defaults['client_script_hook_add']
+    except KeyError, detail:
+        pass
+
+    try:
+        options.SCRIPT_HOOK_REMOVE = defaults['client_script_hook_remove']
     except KeyError, detail:
         pass