Changeset 186 for trunk/src/pxeconfig.py

Timestamp:

10/28/10 16:04:25 (14 years ago)

Author:

bas

Message:

Added mac address support for environments that have dynamic ip's. Depended on arp command

File:

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

trunk/src/pxeconfig.py

@@ -174 +174 @@
         return r
 
-def hosts_2_hex(hosts, options):
+def host_2_hex(host, options):
         """
         Convert hostname(s) to a net address that can be handled by manage_links function
@@ -182 +182 @@
                 print str
 
-        for host in hosts:
-                try:
-                        addr = socket.gethostbyname(host)
-                except socket.error,detail:
-                        error =  '%s not an valid hostname: %s' %(host,detail)
-                        raise PxeConfig, error
-
-                net = string.splitfields(addr, '.')
-                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)
+        try:
+                addr = socket.gethostbyname(host)
+        except socket.error,detail:
+                error =  '%s not an valid hostname: %s' %(host,detail)
+                raise PxeConfig, error
+
+        net = string.splitfields(addr, '.')
+        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)
+
+
+def mac_2_hex(mac_addr, options):
+        """
+        Convert mac address to pxeconfig address
+        """
+        if options.DEBUG:
+                str = 'mac_2_hex: %s' %mac_addr
+                print mac_addr
+
+        haddr = '01-%s' %(mac_addr.replace(':', '-').lower())
+        manage_links(haddr, options)
 
 def add_options(p):
@@ -251 +262 @@
         )
 
-def parser(argv, settings): 
+def parser(argv, config, defaults): 
         """
         Make use of sara advance parser module. It can handle regex in hostnames
@@ -272 +283 @@
         if not options.DEBUG:
                 try:
-                        if settings['debug']:
-                                options.DEBUG = int(settings['debug'])
+                        if defaults['debug']:
+                                options.DEBUG = int(defaults['debug'])
                 except KeyError:
                         pass
@@ -290 +301 @@
         # ...
         try:
-                options.SCRIPT_HOOK = settings['client_script_hook']
+                options.SCRIPT_HOOK = defaults['client_script_hook']
         except KeyError, detail:
                 pass
@@ -297 +308 @@
                 print args, options
 
-        hosts_2_hex(args, options)
-
+        ##
+        # Are the hosts wiht only mac addresses defined in the configuration file
+
+        for host in args:
+                if host in config.sections():
+                        mac_addr = config.get(host, 'mac_address') 
+                        mac_2_hex(mac_addr, options)
+                else:
+                        host_2_hex(host, options)
 
 def main():
@@ -304 +322 @@
         #
         global PXE_CONF_DIR
-        settings = ReadConfig() 
-        
-        try:
-                PXE_CONF_DIR = settings['pxe_config_dir']
+        parser_config, default_settings = ReadConfig() 
+        
+        try:
+                PXE_CONF_DIR = default_settings['pxe_config_dir']
 
         except KeyError:
@@ -317 +335 @@
                 raise PxeConfig, error
 
-        parser(sys.argv, settings)
+        parser(sys.argv, parser_config, default_settings)