In invirt-dhcp:

  * Don't throw a sqlalchemy.exceptions.InvalidRequestError exception if
    we get a DHCPREQUEST for a MAC address that's not in our database.

svn path=/trunk/packages/invirt-dhcp/; revision=2347

diff --git a/debian/changelog b/debian/changelog
index 935f8c2..ea490a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-dhcp (0.0.2) unstable; urgency=low
+
+  * Don't throw a sqlalchemy.exceptions.InvalidRequestError exception if
+    we get a DHCPREQUEST for a MAC address that's not in our database.
+
+ -- Evan Broder <broder@mit.edu>  Mon, 04 May 2009 21:14:26 -0400
+

 invirt-dhcp (0.0.1) unstable; urgency=low
 
   * sipb-xen-dhcp -> invirt-dhcp
 invirt-dhcp (0.0.1) unstable; urgency=low
 
   * sipb-xen-dhcp -> invirt-dhcp

diff --git a/invirt-dhcpserver b/invirt-dhcpserver
index 74e554f..04376d0 100755 (executable)
--- a/invirt-dhcpserver
+++ b/invirt-dhcpserver
@@ -25,7 +25,7 @@ class DhcpBackend:
         database.connect()
     def findNIC(self, mac):
         database.clear_cache()
         database.connect()
     def findNIC(self, mac):
         database.clear_cache()

-        return database.NIC.query().filter_by(mac_addr=mac).one()
+        return database.NIC.query().filter_by(mac_addr=mac).first()

     def find_interface(self, packet):
         chaddr = hwmac(packet.GetHardwareAddress())
         nic = self.findNIC(str(chaddr))
     def find_interface(self, packet):
         chaddr = hwmac(packet.GetHardwareAddress())
         nic = self.findNIC(str(chaddr))