projects
/
invirt/packages/invirt-database.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support autoinstalls table for creation list.
[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
d07950a
..
3f54821
100644
(file)
--- a/
sipb_xen_database/models.py
+++ b/
sipb_xen_database/models.py
@@
-5,18
+5,22
@@
from sqlalchemy.ext.assignmapper import assign_mapper
__all__ = ['meta',
'ctx',
__all__ = ['meta',
'ctx',
+ 'clear_cache',
'machine_table',
'machine_access_table',
'nic_table',
'disk_table',
'types_table',
'cdroms_table',
'machine_table',
'machine_access_table',
'nic_table',
'disk_table',
'types_table',
'cdroms_table',
+ 'autoinstalls_table',
'Machine',
'MachineAccess',
'NIC',
'Disk',
'Type',
'Machine',
'MachineAccess',
'NIC',
'Disk',
'Type',
- 'CDROM']
+ 'CDROM',
+ 'Autoinstall',
+ ]
meta = DynamicMetaData()
ctx = SessionContext(create_session)
meta = DynamicMetaData()
ctx = SessionContext(create_session)
@@
-57,6
+61,11
@@
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))
+autoinstalls_table = Table('autoinstalls', meta,
+ Column('autoinstall_id', String, primary_key=True, nullable=False),
+ Column('description', String, nullable=False),
+ Column('type_id', String, ForeignKey('types.type_id'), 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),
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),
@@
-86,13
+95,26
@@
class CDROM(object):
def __repr__(self):
return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
def __repr__(self):
return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
+class Autoinstall(object):
+ def __repr__(self):
+ return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
+
assign_mapper(ctx, Machine, machine_table,
properties={'nics': relation(NIC, backref="machine"),
'disks': relation(Disk, backref="machine"),
'type': relation(Type),
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)
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, Autoinstall, autoinstalls_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()