X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/7aa5faf0356f7532729efe48840f84d4685303ed..ef7d3ef0efdb390b33bc4b0c5aa399afba841c7c:/sipb_xen_database/models.py

diff --git a/sipb_xen_database/models.py b/sipb_xen_database/models.py
index 12db8c9..8b4a389 100644
--- a/sipb_xen_database/models.py
+++ b/sipb_xen_database/models.py
@@ -6,11 +6,13 @@ from sqlalchemy.ext.assignmapper import assign_mapper
 __all__ = ['meta',
            'ctx',
            'machine_table',
+           'machine_access_table',
            'nic_table',
            'disk_table',
            'types_table',
            'cdroms_table',
            'Machine',
+           'MachineAccess',
            'NIC',
            'Disk',
            'Type',
@@ -69,19 +71,10 @@ class MachineAccess(object):
         return "<MachineAccess machine='%s' user='%s'>" % (self.machine, self.user)
 
 class NIC(object):
-    def __init__(self, machine_id, mac_addr, ip, hostname):
-        self.machine_id = machine_id
-        self.mac_addr = mac_addr
-        self.ip = ip
-        self.hostname = hostname
     def __repr__(self):
         return "<NIC: mac='%s' machine='%s' ip='%s' hostname='%s'>" % (self.mac_addr, self.machine_id, self.ip, self.hostname)
 
 class Disk(object):
-    def __init__(self, machine_id, guest, size):
-        self.machine_id = machine_id
-        self.guest_device_name = guest
-        self.size = size
     def __repr__(self):
         return "<Disk: machine=%s device=%s size=%s>" % (self.machine_id, self.guest_device_name, self.size)
 
@@ -90,9 +83,6 @@ class Type(object):
         return "<Type %s: %s>" % (self.type_id, self.description)
 
 class CDROM(object):
-    def __init__(self, cdrom_id, description):
-        self.cdrom_id = cdrom_id
-        self.description = description
     def __repr__(self):
         return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
 
@@ -100,9 +90,17 @@ assign_mapper(ctx, Machine, machine_table,
               properties={'nics': relation(NIC, backref="machine"),
                           'disks': relation(Disk, backref="machine"),
                           'type': relation(Type),
-                          'users': relation(MachineAccess, backref="machine")});
+                          'acl': relation(MachineAccess, backref="machine")});
 assign_mapper(ctx, MachineAccess, machine_access_table)
 assign_mapper(ctx, NIC, nic_table)
 assign_mapper(ctx, Disk, disk_table)
 assign_mapper(ctx, Type, types_table)
 assign_mapper(ctx, CDROM, cdroms_table)
+
+def clear_cache():
+    """Clear sqlalchemy's cache.
+
+    This _seems_ to be the way; it works, but the docs don't mention
+    it.  Why is this so obscure?"""
+
+    ctx.registry.clear()