Actually expose the function

[invirt/packages/invirt-database.git] / sipb_xen_database / models.py

diff --git a/sipb_xen_database/models.py b/sipb_xen_database/models.py
index 4226598..b075886 100644 (file)
--- a/sipb_xen_database/models.py
+++ b/sipb_xen_database/models.py
@@ -5,12 +5,15 @@ from sqlalchemy.ext.assignmapper import assign_mapper
 
 __all__ = ['meta',
            'ctx',
 
 __all__ = ['meta',
            'ctx',

+           'clear_cache',

            'machine_table',
            'machine_table',

+           'machine_access_table',

            'nic_table',
            'disk_table',
            'types_table',
            'cdroms_table',
            'Machine',
            'nic_table',
            'disk_table',
            'types_table',
            'cdroms_table',
            'Machine',

+           'MachineAccess',

            'NIC',
            'Disk',
            'Type',
            'NIC',
            'Disk',
            'Type',

@@ -26,7 +29,7 @@ machine_table = Table('machines', meta,
        Column('owner', String, nullable=False),
        Column('contact', String, nullable=False),
        Column('uuid', String, nullable=False),
        Column('owner', String, nullable=False),
        Column('contact', String, nullable=False),
        Column('uuid', String, nullable=False),

-       Column('boot_off_cd', Boolean, nullable=False, default=False),
+       Column('administrator', String, nullable=False, default=False),

        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('autorestart', Boolean, nullable=False, default=False),
        Column('cpus', Integer, nullable=False, default=1))
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('autorestart', Boolean, nullable=False, default=False),
        Column('cpus', Integer, nullable=False, default=1))

@@ -55,37 +58,50 @@ cdroms_table = Table('cdroms', meta,
        Column('cdrom_id', String, primary_key=True, nullable=False),
        Column('description', String, nullable=False))
 
        Column('cdrom_id', String, primary_key=True, nullable=False),
        Column('description', String, nullable=False))
 

+machine_access_table = Table('machine_access', meta,
+       Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False, index=True),
+       Column('user', String, nullable=False, index=True),
+       PrimaryKeyConstraint('machine_id', 'user'))

 
 class Machine(object):
 
 class Machine(object):

-    pass
+    def __repr__(self):
+        return "<Machine %s: name='%s' owner='%s'>" % (self.machine_id, self.name, self.owner)
+
+class MachineAccess(object):
+    def __repr__(self):
+        return "<MachineAccess machine='%s' user='%s'>" % (self.machine, self.user)

 
 class NIC(object):
 
 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):
 
 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)

 
 class Type(object):
 
 class Type(object):

-    pass
+    def __repr__(self):
+        return "<Type %s: %s>" % (self.type_id, self.description)

 
 class CDROM(object):
 
 class CDROM(object):

-    def __init__(self, cdrom_id, description):
-        self.cdrom_id = cdrom_id
-        self.description = description
-
-assign_mapper(ctx, Machine, machine_table, \
-              properties={'nics': relation(NIC),
-                          'disks': relation(Disk),
-                          'type': relation(Type)});
+    def __repr__(self):
+        return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
+
+assign_mapper(ctx, Machine, machine_table,
+              properties={'nics': relation(NIC, backref="machine"),
+                          'disks': relation(Disk, backref="machine"),
+                          'type': relation(Type),
+                          '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)
 
 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()