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
fix more imports EIBTI-style
[invirt/packages/invirt-database.git]
/
python
/
database
/
models.py
diff --git
a/python/database/models.py
b/python/database/models.py
index
6b53a2a
..
02b5092
100644
(file)
--- a/
python/database/models.py
+++ b/
python/database/models.py
@@
-5,8
+5,8
@@
from sqlalchemy.orm import create_session, relation
from sqlalchemy.ext.sessioncontext import SessionContext
from sqlalchemy.ext.assignmapper import assign_mapper
from sqlalchemy.ext.sessioncontext import SessionContext
from sqlalchemy.ext.assignmapper import assign_mapper
-from record import *
-from owner import Owner
+from invirt.database import record
+from invirt.database.owner import Owner
__all__ = ['meta',
'session',
__all__ = ['meta',
'session',
@@
-101,28
+101,28
@@
machine_access_table = Table('machine_access', meta,
Column('user', String, nullable=False, index=True),
PrimaryKeyConstraint('machine_id', 'user'))
Column('user', String, nullable=False, index=True),
PrimaryKeyConstraint('machine_id', 'user'))
-class Machine(Record):
+class Machine(record.Record):
_identity_field = 'name'
_identity_field = 'name'
-class MachineAccess(Record):
+class MachineAccess(record.Record):
pass
pass
-class NIC(Record):
+class NIC(record.Record):
pass
pass
-class Disk(Record):
+class Disk(record.Record):
pass
pass
-class Type(Record):
+class Type(record.Record):
_identity_field = 'type_id'
_identity_field = 'type_id'
-class Mirror(Record):
+class Mirror(record.Record):
_identity_field = 'mirror_id'
_identity_field = 'mirror_id'
-class CDROM(Record):
+class CDROM(record.Record):
_identity_field = 'cdrom_id'
_identity_field = 'cdrom_id'
-class Autoinstall(Record):
+class Autoinstall(record.Record):
_identity_field = 'autoinstall_id'
session.mapper(Machine, machine_table,
_identity_field = 'autoinstall_id'
session.mapper(Machine, machine_table,