Index: trunk/packages/sipb-xen-www/code/main.py
===================================================================
--- trunk/packages/sipb-xen-www/code/main.py	(revision 864)
+++ trunk/packages/sipb-xen-www/code/main.py	(revision 865)
@@ -40,6 +40,6 @@
 import controls
 from getafsgroups import getAfsGroupMembers
-import sipb_xen_database as database
-from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
+from invirt import database
+from invirt.database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
 from invirt.config import structs as config
 
Index: trunk/packages/sipb-xen-www/code/validation.py
===================================================================
--- trunk/packages/sipb-xen-www/code/validation.py	(revision 864)
+++ trunk/packages/sipb-xen-www/code/validation.py	(revision 865)
@@ -5,5 +5,5 @@
 import re
 import string
-from sipb_xen_database import Machine, NIC, Type, Disk, CDROM, Autoinstall
+from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
 from webcommon import InvalidInput
 
Index: trunk/packages/sipb-xen-www/code/xen-ips
===================================================================
--- trunk/packages/sipb-xen-www/code/xen-ips	(revision 864)
+++ trunk/packages/sipb-xen-www/code/xen-ips	(revision 865)
@@ -1,5 +1,5 @@
 #!/usr/bin/python
 import random
-from sipb_xen_database import *
+from invirt import database
 import sys
 
@@ -38,7 +38,7 @@
 
 def addip(ip):
-    n = NIC(machine_id=None, mac_addr=randomMAC(), ip=ip, hostname=None)
-    ctx.current.save(n)
-    ctx.current.flush()
+    n = database.NIC(machine_id=None, mac_addr=randomMAC(), ip=ip, hostname=None)
+    database.ctx.current.save(n)
+    database.ctx.current.flush()
 
 
@@ -49,4 +49,4 @@
         usage()
         sys.exit(1)
-    connect('postgres://sipb-xen@sipb-xen-dev/sipb_xen')
+    database.connect()
     addip(ip)