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
RAM quotas at remctl; RAM quota exception script, table, and usage in -web and -remot...
[invirt/packages/invirt-database.git]
/
python
/
database
/
models.py
diff --git
a/python/database/models.py
b/python/database/models.py
index
e3f2996
..
2944a1f
100644
(file)
--- a/
python/database/models.py
+++ b/
python/database/models.py
@@
-16,6
+16,7
@@
__all__ = ['meta',
'cdroms_table',
'mirrors_table',
'autoinstalls_table',
'cdroms_table',
'mirrors_table',
'autoinstalls_table',
+ 'owners_table',
'Machine',
'MachineAccess',
'NIC',
'Machine',
'MachineAccess',
'NIC',
@@
-24,6
+25,7
@@
__all__ = ['meta',
'CDROM',
'Mirror',
'Autoinstall',
'CDROM',
'Mirror',
'Autoinstall',
+ 'Owner',
'or_',
]
'or_',
]
@@
-82,6
+84,11
@@
autoinstalls_table = Table('autoinstalls', meta,
Column('mirror', String, nullable=False),
Column('arch', String, nullable=False))
Column('mirror', String, nullable=False),
Column('arch', String, nullable=False))
+owners_table = Table('owners', meta,
+ Column('owner_id', String, primary_key=True, nullable=False),
+ Column('ram_quota_total', Integer, nullable=True),
+ Column('ram_quota_single', Integer, nullable=True))
+
machine_access_table = Table('machine_access', meta,
Column('machine_id', Integer, ForeignKey('machines.machine_id', ondelete='CASCADE'), 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', ondelete='CASCADE'), nullable=False, index=True),
Column('user', String, nullable=False, index=True),
@@
-119,6
+126,8
@@
class Autoinstall(object):
def __repr__(self):
return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
def __repr__(self):
return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
+from owner import Owner
+
session.mapper(Machine, machine_table,
properties={'nics': relation(NIC, backref="machine"),
'disks': relation(Disk, backref="machine"),
session.mapper(Machine, machine_table,
properties={'nics': relation(NIC, backref="machine"),
'disks': relation(Disk, backref="machine"),
@@
-132,6
+141,7
@@
session.mapper(Mirror, mirrors_table)
session.mapper(CDROM, cdroms_table,
properties={'mirror': relation(Mirror, backref="cdroms")})
session.mapper(Autoinstall, autoinstalls_table)
session.mapper(CDROM, cdroms_table,
properties={'mirror': relation(Mirror, backref="cdroms")})
session.mapper(Autoinstall, autoinstalls_table)
+session.mapper(Owner, owners_table)
def clear_cache():
"""Clear sqlalchemy's cache
def clear_cache():
"""Clear sqlalchemy's cache