X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/a754e7beadaaa4d401bfeaac5b8b67df29fb7893..66d08ff5bec3db89c6bedf399c0b6f5ae5f821c5:/python/database/models.py diff --git a/python/database/models.py b/python/database/models.py index 6b53a2a..02b5092 100644 --- 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 record import * -from owner import Owner +from invirt.database import record +from invirt.database.owner import Owner __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')) -class Machine(Record): +class Machine(record.Record): _identity_field = 'name' -class MachineAccess(Record): +class MachineAccess(record.Record): pass -class NIC(Record): +class NIC(record.Record): pass -class Disk(Record): +class Disk(record.Record): pass -class Type(Record): +class Type(record.Record): _identity_field = 'type_id' -class Mirror(Record): +class Mirror(record.Record): _identity_field = 'mirror_id' -class CDROM(Record): +class CDROM(record.Record): _identity_field = 'cdrom_id' -class Autoinstall(Record): +class Autoinstall(record.Record): _identity_field = 'autoinstall_id' session.mapper(Machine, machine_table,