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
Export mirrors_table and Mirrors in invirt.database.models
[invirt/packages/invirt-database.git]
/
python
/
database
/
models.py
diff --git
a/python/database/models.py
b/python/database/models.py
index
df3707f
..
e44aff3
100644
(file)
--- a/
python/database/models.py
+++ b/
python/database/models.py
@@
-14,6
+14,7
@@
__all__ = ['meta',
'disk_table',
'types_table',
'cdroms_table',
'disk_table',
'types_table',
'cdroms_table',
+ 'mirrors_table',
'autoinstalls_table',
'Machine',
'MachineAccess',
'autoinstalls_table',
'Machine',
'MachineAccess',
@@
-21,6
+22,7
@@
__all__ = ['meta',
'Disk',
'Type',
'CDROM',
'Disk',
'Type',
'CDROM',
+ 'Mirror',
'Autoinstall',
'or_',
]
'Autoinstall',
'or_',
]
@@
-62,9
+64,15
@@
types_table = Table('types', meta,
Column('acpi', Boolean, nullable=False),
Column('pae', Boolean, nullable=False))
Column('acpi', Boolean, nullable=False),
Column('pae', Boolean, nullable=False))
+mirrors_table = Table('mirrors', meta,
+ Column('mirror_id', String, primary_key=True, nullable=False),
+ Column('uri_prefix', String, nullable=False))
+
cdroms_table = Table('cdroms', meta,
Column('cdrom_id', String, primary_key=True, nullable=False),
cdroms_table = Table('cdroms', meta,
Column('cdrom_id', String, primary_key=True, nullable=False),
- Column('description', String, nullable=False))
+ Column('description', String, nullable=False),
+ Column('mirror_id', String, ForeignKey('mirrors.mirror_id')),
+ Column('uri_suffix', String))
autoinstalls_table = Table('autoinstalls', meta,
Column('autoinstall_id', String, primary_key=True, nullable=False),
autoinstalls_table = Table('autoinstalls', meta,
Column('autoinstall_id', String, primary_key=True, nullable=False),
@@
-74,9
+82,9
@@
autoinstalls_table = Table('autoinstalls', meta,
Column('mirror', String, nullable=False))
machine_access_table = Table('machine_access', meta,
Column('mirror', String, nullable=False))
machine_access_table = Table('machine_access', meta,
- Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False, index=True),
+ Column('machine_id', Integer, ForeignKey('machines.machine_id', ondelete='CASCADE'), nullable=False, index=True),
Column('user', String, nullable=False, index=True),
Column('user', String, nullable=False, index=True),
- PrimaryKeyConstraint('machine_id', 'user', ondelete='CASCADE'))
+ PrimaryKeyConstraint('machine_id', 'user'))
class Machine(object):
def __repr__(self):
class Machine(object):
def __repr__(self):
@@
-98,6
+106,10
@@
class Type(object):
def __repr__(self):
return "<Type %s: %s>" % (self.type_id, self.description)
def __repr__(self):
return "<Type %s: %s>" % (self.type_id, self.description)
+class Mirror(object):
+ def __repr__(self):
+ return "<Mirror %s>" % (self.mirror_id)
+
class CDROM(object):
def __repr__(self):
return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
class CDROM(object):
def __repr__(self):
return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
@@
-115,6
+127,7
@@
session.mapper(MachineAccess, machine_access_table)
session.mapper(NIC, nic_table)
session.mapper(Disk, disk_table)
session.mapper(Type, types_table)
session.mapper(NIC, nic_table)
session.mapper(Disk, disk_table)
session.mapper(Type, types_table)
+session.mapper(Mirror, mirrors_table)
session.mapper(CDROM, cdroms_table)
session.mapper(Autoinstall, autoinstalls_table)
session.mapper(CDROM, cdroms_table)
session.mapper(Autoinstall, autoinstalls_table)