Changeset 125 for trunk

Timestamp:

04/13/08 18:46:59 (16 years ago)

Author:

bas

Message:

pxeconfig.in:

• renamed some functions
• added some verbose commands

File:

• trunk/pxeconfig.in (modified) (10 diffs)

trunk/pxeconfig.in

@@ -211 +211 @@
            start number, end number
   """
+  str = 'manage_links'
+  verbose(str)
+
   os.chdir(PXE_CONF_DIR)
   naddr = dict[NETWORK]
@@ -230 +233 @@
        os.symlink(pxe_filename, haddr)
 
-def convert_network(net):
+def net_2_hex(net):
         """
         This function checks if the give network is a Class C-network and will
         convert the network address to a hex address if true.
         """
-        str = 'convert_network : %s' %(net)
+        str = 'net_2_hex : %s' %(net)
         verbose(str) 
         
@@ -286 +289 @@
 
                 try:
-                        naddr = convert_network(network) 
+                        naddr = net_2_hex(network) 
                         break
                 except PxeConfig, detail:
@@ -344 +347 @@
 
         if hostnames:
-                host_2_net(hostnames, binfo)
+                host_2_hex(hostnames, binfo)
                 sys.exit(0)
                 
@@ -356 +359 @@
                 else:
                         set_padding(binfo)
-                        create_links =  base_2_net
+                        create_links =  base_2_host
 
         elif binfo.has_key(NETWORK):
@@ -512 +515 @@
 
                 elif opt in ['-n', '--net']:
-                        binfo[NETWORK] = convert_network(value) 
+                        binfo[NETWORK] = net_2_hex(value) 
                         
                 elif opt in ['-r', '--remove']:
@@ -548 +551 @@
         check_args(binfo, args)
 
-def host_2_net(hosts, binfo):
+def host_2_hex(hosts, binfo):
         """
         Convert hostname(s) to a net address that can be handled by manage_links function
         """
+        str = 'host_2_hex: %s' %hosts
+        verbose(str)
+
         for host in hosts:
                 try:
@@ -562 +568 @@
                 cnet = string.joinfields(net[0:3], '.')
 
-                binfo[NETWORK] = convert_network(cnet)
+                binfo[NETWORK] = net_2_hex(cnet)
                 binfo[START] = int(net[3])
                 binfo[END] =  int(net[3])
                 manage_links(binfo)
 
-def base_2_net(binfo):
+def base_2_host(binfo):
         """
         Construct hostname(s) from the supplied basename and start and end numbers
         """
+        str = 'base_2_host'
+        verbose(str)
+
         start = binfo[START]
         end = binfo[END]
@@ -589 +598 @@
                 hostnames.append(hostname)
 
-        host_2_net(hostnames,binfo)
+        host_2_hex(hostnames,binfo)
 
 def rack_2_net(binfo):
         """
         """
+        str = 'rack_2_net'
+        verbose(str)
         basename = binfo[BASENAME]
         start = binfo[RACK][START]
         end = binfo[RACK][END]
-
 
         if start > end:
@@ -619 +629 @@
                         print 'rack ', new_bootinfo
 
-                base_2_net(new_bootinfo)
+                base_2_host(new_bootinfo)
 
 def main():