Changeset 126 for trunk

Timestamp:

04/14/08 09:44:08 (16 years ago)

Author:

bas

Message:

pxeconfig.in:

• added --dry-run option
• reformat manage_links function

Location:

trunk

Files:

• Changelog (modified) (1 diff)
• pxeconfig.in (modified) (8 diffs)

trunk/Changelog

@@ -66 +66 @@
        - gb-r02n02
 
+   Author: Bas van der Vlies
+
+ - Added --dry-run mode 
    Author: Bas van der Vlies
 

trunk/pxeconfig.in

@@ -48 +48 @@
  -r,--remove 
  -w,--equal-width 
+ --dry-run
 
 If leading zeros are used for <number>, then host names will be padded 
@@ -56 +57 @@
 command line options.
 
-When this program is started interactive it will ask the following questions:
-  1) Network address (Class C-network address only)
-  2) Starting number
-  3) Ending number
-  4) Which PXE config file to use 
-
-For example, if the answers are: 
-  1) 10.168.44
-  2) 2
-  3) 4
-  4) default.node_install
-
-Then the result is that is create symbolic links in /tftpboot/pxelinux.cfg:
-  0AA82C02 ----> default.node_install
-  0AA82C03 ----> default.node_install
-  0AA82C04 ----> default.node_install
+See following link for usage and examples:
+ - https://subtrac.sara.nl/oss/pxeconfig/wiki/PxeUsage
 """
 
@@ -83 +70 @@
 import re
 
-# DEBUG
-#
-DEBUG=0
-VERBOSE=0
+# Global Variables
+#
+DEBUG   = False
+VERBOSE = False
+DRY_RUN = False
 
 # Constants
@@ -104 +92 @@
 
 SHORTOPT_LIST='b:e:f:hin:s:rwvN:H:R:V'
-LONGOPT_LIST=[ 'basename=', 'debug', 'end=', 'equal-width', 
-    'file=', 'help', 'host-range=', 'interactive', 'net=', 
-    'node=', 'start=', 'rack=', 'remove', 'verbose', 
-    'version', 'equal-width'
+LONGOPT_LIST=[ 'basename=', 'debug', 'dry-run', 'end=', 'equal-width', 
+    'file=', 'help', 'host-range=', 'interactive', 'net=', 'node=', 
+    'start=', 'rack=', 'remove', 'verbose', 'version', 'equal-width'
         ]
 
@@ -206 +193 @@
 
 def manage_links(dict):
-  """
-  Create the links in the PXE_CONF_DIR,
-    list : A list containing: network hex address, pxe config file, 
+        """
+        Create the links in the PXE_CONF_DIR,
+        list : A list containing: network hex address, pxe config file, 
            start number, end number
-  """
-  str = 'manage_links'
-  verbose(str)
-
-  os.chdir(PXE_CONF_DIR)
-  naddr = dict[NETWORK]
-  pxe_filename = dict[FILENAME]
-
-  for i in range(dict[START], dict[END]+1):
-    haddr = '%s%02X' %(naddr, i)
-
-    if dict[REMOVE] == True:
-       if DEBUG:
-          print 'removing %s/%s' %(PXE_CONF_DIR, haddr)
-       if os.path.exists(haddr):
-          os.unlink(haddr)
-    else:
-       if DEBUG:
-          print 'linking %s to %s' %(haddr, pxe_filename)
-       if os.path.exists(haddr):
-          os.unlink(haddr)
-       os.symlink(pxe_filename, haddr)
+        """
+        str = 'manage_links'
+        verbose(str) 
+        
+        os.chdir(PXE_CONF_DIR)
+        naddr = dict[NETWORK]
+        pxe_filename = dict[FILENAME] 
+        
+        for i in range(dict[START], dict[END]+1):
+                haddr = '%s%02X' %(naddr, i) 
+                
+                if dict[REMOVE] == True:
+                        if DEBUG or DRY_RUN:
+                                print 'removing %s/%s' %(PXE_CONF_DIR, haddr)
+
+                        if os.path.exists(haddr) and not DRY_RUN:
+                                os.unlink(haddr)
+
+                else:
+                        if DEBUG or DRY_RUN:
+                                print 'linking %s to %s' %(haddr, pxe_filename)
+
+                        if not DRY_RUN:
+                                if os.path.exists(haddr):
+                                        os.unlink(haddr) 
+                                os.symlink(pxe_filename, haddr)
 
 def net_2_hex(net):
@@ -479 +470 @@
         global DEBUG
         global VERBOSE
+        global DRY_RUN
 
         # if nothing is specified then print usage and exit
@@ -498 +490 @@
                         
                 elif opt in ['--debug']:
-                        DEBUG = 1 
+                        DEBUG = True 
+
+                elif opt in ['--dry-run']:
+                        DRY_RUN = True 
                         
                 elif opt in ['-e', '--end']: 
@@ -527 +522 @@
 
                 elif opt in ['-v', '--verbose']:
-                        VERBOSE = 1
+                        VERBOSE = True
 
                 elif opt in ['-H', '--host-range']: