Changeset 2322 for trunk

Timestamp:

May 2, 2009, 6:53:48 PM (16 years ago)

Author:

price

Message:

xen-ips: silently ignore already-present IPs

Also from the first hours of April. You all can imagine
how happy I was to be running this code. =)

File:

• trunk/packages/invirt-web/code/xen-ips (modified) (2 diffs)

trunk/packages/invirt-web/code/xen-ips

@@ -2 +2 @@
 import random
 from invirt import database
+import sqlalchemy.exceptions
 import sys
 
@@ -38 +39 @@
 
 def addip(ip):
-    n = database.NIC(machine=None, mac_addr=randomMAC(), ip=ip, hostname=None)
-    database.session.save(n)
-    database.session.flush()
+    try:
+        n = database.NIC(machine=None, mac_addr=randomMAC(), ip=ip, hostname=None)
+        database.session.save(n)
+        database.session.flush()
+    except sqlalchemy.exceptions.IntegrityError:
+        pass