Changeset 186 for trunk/src/pxeconfigd.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/pxeconfigd.py (modified) (4 diffs)

trunk/src/pxeconfigd.py

@@ -67 +67 @@
 
 
-def remove_link(filename):
-  """This removes the pxe config filename for the host that is connected:
-      filename : string
-  """
+def remove_link(ip, arp_cmd):
+        """
+        This removes the pxe config filename for the host that is connected:
+                ip      : ip address of the client host
+                arp_cmd : For Dynamic ips, look up the mac address via arp
+        """
 
-  file = os.path.join(PXE_CONF_DIR, filename)
+        ## translate ip address ---> hex address 
+        #
+        d = string.split(ip, '.')
+        haddr = '%02X%02X%02X%02X' %(int(d[0]), int(d[1]), int(d[2]), int(d[3])) 
 
-  if DEBUG:
-    print 'file = %s' %file
+        file = os.path.join(PXE_CONF_DIR, haddr)
 
-  if not os.path.exists(file): return
+        if not os.path.exists(file): 
 
-  if os.path.islink(file): 
-    try:
-      os.unlink(file)
-      syslog.openlog("pxeconfigd")
-      syslog.syslog(syslog.LOG_INFO, file)
-      syslog.closelog()
-    except OSError:
-      err_msg = "No permission at directory: %s" %PXE_CONF_DIR
-      os.write(STDOUT, err_msg)
-      sys.exit(1)
+                ##
+                # No ARP command set, just return
+                #
+                if not arp_cmd:
+                        return
+
+                else:
+                        ##
+                        #  arp -n 192.168.146.112 
+                        # Address          HWtype  HWaddress           Flags Mask Iface
+                        # 192.168.146.112  ether   00:23:ae:fd:cf:74   C          vlan133
+
+                        cmd = '%s %s' %(arp_cmd, ip)
+                        lines = os.popen(cmd).readlines()
+                        for line in lines:
+                                if line.startswith(ip):
+                                        t = line.split()
+                                        mac_addr = t[2] 
+                                        haddr = '01-%s' %(mac_addr.replace(':', '-').lower())
+                                        file = os.path.join(PXE_CONF_DIR, haddr) 
+                                        if not os.path.exists(file): 
+                                                return
+
+        if DEBUG:
+                print 'file = %s' %file
+
+        if os.path.islink(file): 
+                try:
+                        os.unlink(file)
+                        syslog.openlog("pxeconfigd")
+                        syslog.syslog(syslog.LOG_INFO, file)
+                        syslog.closelog()
+                except OSError:
+                        err_msg = "No permission at directory: %s" %PXE_CONF_DIR
+                        os.write(STDOUT, err_msg)
+                        sys.exit(1)
+
 
 # This function handles the client connection. It closes
@@ -108 +139 @@
                 raise PxeConfig, error 
                 
-        # translate ip address ---> hex address
-        #
-        d = string.split(client_ip, '.')
-        client_haddr = '%02X%02X%02X%02X' %(int(d[0]), int(d[1]), int(d[2]), int(d[3])) 
         
         if DEBUG:
@@ -123 +150 @@
                 pass
 
-        remove_link(client_haddr)
+        try:
+                arp_cmd = settings['arp_command']
+        except KeyError:
+                arp_cmd = None
+
+        remove_link(client_ip, arp_cmd)
         sys.exit(0)
 
@@ -157 +189 @@
   """Start the daemon
   """
-  config = ReadConfig()
-  check_args(sys.argv, config)
-  handleConnection(config)
+  parser_config, default_settings = ReadConfig()
+  check_args(sys.argv, default_settings)
+  handleConnection(default_settings)
 
 if __name__ == '__main__':