pvl-verkko: comparison pvl/dhcp/leases.py

equal deleted inserted replaced

-:5fc4c5e83b72
+:6f339a8a87dc
 for line in lines :
 for item in self.parse(line) :
 yield item
-class DHCPLeasesDatabase (object) :
+class DHCPLeases (object) :
 """
-Process log-structured leases file.
+Process log-structured leases file, updated by dhcpd.
 """
 LEASE_DATES = ('starts', 'ends', 'tstp', 'tsfp', 'atsfp', 'cltt')
 # default format
 """
 path        - path to dhcpd.leases file
 """
 # tail; handles file re-writes
-self.source = pvl.syslog.tail.TailFile(path)
+self.source = pvl.syslog.tail.Tail(path)
 # parser state
 self.parser = DHCPLeasesParser()
 # initial leases state
-self.leases = None
+self._leases = None
 def reset (self) :
 """
 Reset state, if we started to read a new file.
 """
-self.leases = {}
+self._leases = {}
 def process_lease_item_date (self, args) :
 """
 Process lease-item date spec into datetime.
 Returns the lease object, and a possible old lease.
 """
 # replace any existing
-lease = self.leases[lease_name] = {}
+lease = self._leases[lease_name] = {}
 # meta
 lease['lease'] = lease_name
 # parse items
 # the lease address
 lease, = args
 log.debug("lease: %s: %s", lease, items)
-if lease in self.leases :
+if lease in self._leases :
-old = self.leases[lease]
+old = self._leases[lease]
 else :
 old = None
 new = self.process_lease(lease, items)
 return new
 else :
 log.warn("unknown block: %s: %s", type, args)
-def process (self) :
+def readleases (self) :
 """
 Read new lines from the leases database and update our state.
-XXX: Returns
+Yields changed leases. On startup and on periodic database reset, all leases are yielded.
-(sync, leases)
-whereby sync is normally False, and leases the set of (possibly) changed leases, unless during initial
-startup and on database replacement, when the sync is True, and the entire set of valid leases is returned.
 """
 # handle file replace by reading until EOF
 sync = False
 #        leases = []
-if self.leases is None :
+if self._leases is None :
 # initial sync
 self.reset()
 sync = True
 # parse in any new lines from TailFile... yields None if the file was replaced
 #        if sync :
 #            return True, self.leases.values()
 #        else :
 #            return False, leases
-def __iter__ (self) :
+__iter__ = readleases
+def leases (self) :
 """
 Iterate over all leases.
 """
 return self.leases.itervalues()
 # XXX: mark as, "expired", even they next-binding-state is probably "free"
 state = 'expired' # lease['next-binding-state']
 return state
+# XXX: from db.dhcp_leases instead?
+import pvl.verkko.db as db
+class DHCPLeasesDatabase (object) :
+"""
+pvl.verkko.Database dhcp_leases model for updates.
+"""
+def __init__ (self, db) :
+"""
+db      - pvl.verkko.Database
+"""
+self.db = db
+def create (self) :
+"""
+CREATE TABLEs
+"""
+log.info("Creating database tables: dhcp_leases")
+db.dhcp_leases.create(self.db.engine, checkfirst=True)
+def update (self, lease) :
+"""
+Try an extend an existing lease?
+"""
+c = db.dhcp_leases.c
+ip = lease['lease']
+mac = lease.get('hwaddr')
+starts = lease['starts']
+ends = lease.get('ends')
+update = db.dhcp_leases.update()
+# XXX: if ends is None?
+if mac :
+# renew lease..?
+update = update.where((c.ip == ip) & (c.mac == mac) & ((starts < c.ends) | (c.ends == None)))
+else :
+# new state for lease..?
+update = update.where((c.ip == ip) & ((starts < c.ends) | (c.ends == ends)))
+update = update.values(
+state       = lease['binding-state'],
+next        = lease.get('next-binding-state'),
+ends        = ends,
+)
+if lease.get('client-hostname') :
+update = update.values(hostname = lease['client-hostname'])
+return self.db.update(update) > 0
+def insert (self, lease) :
+"""
+Record a new lease.
+"""
+c = db.dhcp_leases.c
+query = db.dhcp_leases.insert().values(
+ip          = lease['lease'],
+mac         = lease['hwaddr'],
+hostname    = lease.get('client-hostname'),
+starts      = lease['starts'],
+ends        = lease.get('ends'),
+state       = lease['binding-state'],
+next        = lease.get('next-binding-state'),
+)
+return self.db.insert(query)
+def __call__ (self, lease) :
+"""
+Process given DHCP lease to update currently active lease, or insert a new one.
+XXX: transaction? *leases?
+"""
+# update existing?
+if self.update(lease) :
+log.info("Update: %s", lease)
+elif lease.get('hwaddr') :
+# new
+id = self.insert(lease)
+log.info("Insert: %s -> %d", lease, id)
+else :
+# may be a free lease
+log.warn("Ignored lease: %s", lease)
 if __name__ == '__main__' :
 import logging
 logging.basicConfig()

changeset 174	6f339a8a87dc
parent 169	a81ca751664d
child 211	cf74bbb95d2b