Index: trunk/scripts/lib/database.py
===================================================================
--- trunk/scripts/lib/database.py	(revision 1863)
+++ 	(revision )
@@ -1,129 +1,0 @@
-from invirt.config import structs as config
-import sqlalchemy
-
-from sqlalchemy import *
-from sqlalchemy import orm
-from sqlalchemy.orm import create_session, relation
-
-from sqlalchemy.ext.sessioncontext import SessionContext
-from sqlalchemy.ext.assignmapper import assign_mapper
-
-def connect(uri = config.db.uri):
-    """ Connect to a given database URI"""
-    global session
-    
-    engine = sqlalchemy.create_engine(uri, pool_timeout=5)
-    meta.bind = engine
-    
-    session = Session(bind=engine)
-
-def clear_cache():
-    """Clear sqlalchemy's cache
-    """
-
-    session.clear()
-
-meta = MetaData()
-Session = orm.sessionmaker(transactional=False, autoflush=False)
-
-machine_table = Table('machines', meta,
-       Column('machine_id', Integer, primary_key=True, nullable=False),
-       Column('name', String, nullable=False),
-       Column('description', String, nullable=False),
-       Column('memory', Integer, nullable=False),
-       Column('owner', String, nullable=False),
-       Column('contact', String, nullable=False),
-       Column('uuid', String, nullable=False),
-       Column('administrator', String, nullable=False, default=False),
-       Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
-       Column('autorestart', Boolean, nullable=False, default=False),
-       Column('cpus', Integer, nullable=False, default=1),
-       Column('adminable', Boolean, nullable=False, default=False))
-
-nic_table = Table('nics', meta,
-       Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True),
-       Column('mac_addr', String, nullable=False, primary_key=True),
-       Column('ip', String, nullable=False, unique=True),
-       Column('hostname', String, nullable=True))
-
-disk_table = Table('disks', meta,
-       Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False),
-       Column('guest_device_name', String, nullable=False),
-       Column('size', Integer, nullable=False),
-       PrimaryKeyConstraint('machine_id', 'guest_device_name'))
-
-types_table = Table('types', meta,
-       Column('type_id', String, primary_key=True, nullable=False),
-       Column('description', String, nullable=False),
-       Column('hvm', Boolean, nullable=False),
-       Column('apic', 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),
-       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),
-       Column('description', String, nullable=False),
-       Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
-       Column('distribution', String, nullable=False),
-       Column('mirror', String, nullable=False))
-
-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),
-       PrimaryKeyConstraint('machine_id', 'user'))
-
-class Machine(object):
-    def __repr__(self):
-        return "<Machine %s: name='%s' owner='%s'>" % (self.machine_id, self.name, self.owner)
-
-class MachineAccess(object):
-    def __repr__(self):
-        return "<MachineAccess machine='%s' user='%s'>" % (self.machine, self.user)
-
-class NIC(object):
-    def __repr__(self):
-        return "<NIC: mac='%s' machine='%s' ip='%s' hostname='%s'>" % (self.mac_addr, self.machine_id, self.ip, self.hostname)
-
-class Disk(object):
-    def __repr__(self):
-        return "<Disk: machine=%s device=%s size=%s>" % (self.machine_id, self.guest_device_name, self.size)
-
-class Type(object):
-    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 Autoinstall(object):
-    def __repr__(self):
-        return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
-
-orm.mapper(Machine, machine_table,
-              properties={'nics': relation(NIC, backref="machine", lazy=False),
-                          'disks': relation(Disk, backref="machine", lazy=False),
-                          'type': relation(Type, lazy=False),
-                          'acl': relation(MachineAccess, backref="machine", lazy=False, passive_deletes=True, cascade="all, delete-orphan")});
-orm.mapper(MachineAccess, machine_access_table)
-orm.mapper(NIC, nic_table)
-orm.mapper(Disk, disk_table)
-orm.mapper(Type, types_table)
-orm.mapper(Mirror, mirrors_table)
-orm.mapper(CDROM, cdroms_table,
-               properties={'mirror': relation(Mirror, backref="cdroms")})
-orm.mapper(Autoinstall, autoinstalls_table)
Index: trunk/scripts/prod-migration/lib/database.py
===================================================================
--- trunk/scripts/prod-migration/lib/database.py	(revision 1864)
+++ trunk/scripts/prod-migration/lib/database.py	(revision 1864)
@@ -0,0 +1,129 @@
+from invirt.config import structs as config
+import sqlalchemy
+
+from sqlalchemy import *
+from sqlalchemy import orm
+from sqlalchemy.orm import create_session, relation
+
+from sqlalchemy.ext.sessioncontext import SessionContext
+from sqlalchemy.ext.assignmapper import assign_mapper
+
+def connect(uri = config.db.uri):
+    """ Connect to a given database URI"""
+    global session
+    
+    engine = sqlalchemy.create_engine(uri, pool_timeout=5)
+    meta.bind = engine
+    
+    session = Session(bind=engine)
+
+def clear_cache():
+    """Clear sqlalchemy's cache
+    """
+
+    session.clear()
+
+meta = MetaData()
+Session = orm.sessionmaker(transactional=False, autoflush=False)
+
+machine_table = Table('machines', meta,
+       Column('machine_id', Integer, primary_key=True, nullable=False),
+       Column('name', String, nullable=False),
+       Column('description', String, nullable=False),
+       Column('memory', Integer, nullable=False),
+       Column('owner', String, nullable=False),
+       Column('contact', String, nullable=False),
+       Column('uuid', String, nullable=False),
+       Column('administrator', String, nullable=False, default=False),
+       Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
+       Column('autorestart', Boolean, nullable=False, default=False),
+       Column('cpus', Integer, nullable=False, default=1),
+       Column('adminable', Boolean, nullable=False, default=False))
+
+nic_table = Table('nics', meta,
+       Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True),
+       Column('mac_addr', String, nullable=False, primary_key=True),
+       Column('ip', String, nullable=False, unique=True),
+       Column('hostname', String, nullable=True))
+
+disk_table = Table('disks', meta,
+       Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False),
+       Column('guest_device_name', String, nullable=False),
+       Column('size', Integer, nullable=False),
+       PrimaryKeyConstraint('machine_id', 'guest_device_name'))
+
+types_table = Table('types', meta,
+       Column('type_id', String, primary_key=True, nullable=False),
+       Column('description', String, nullable=False),
+       Column('hvm', Boolean, nullable=False),
+       Column('apic', 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),
+       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),
+       Column('description', String, nullable=False),
+       Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
+       Column('distribution', String, nullable=False),
+       Column('mirror', String, nullable=False))
+
+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),
+       PrimaryKeyConstraint('machine_id', 'user'))
+
+class Machine(object):
+    def __repr__(self):
+        return "<Machine %s: name='%s' owner='%s'>" % (self.machine_id, self.name, self.owner)
+
+class MachineAccess(object):
+    def __repr__(self):
+        return "<MachineAccess machine='%s' user='%s'>" % (self.machine, self.user)
+
+class NIC(object):
+    def __repr__(self):
+        return "<NIC: mac='%s' machine='%s' ip='%s' hostname='%s'>" % (self.mac_addr, self.machine_id, self.ip, self.hostname)
+
+class Disk(object):
+    def __repr__(self):
+        return "<Disk: machine=%s device=%s size=%s>" % (self.machine_id, self.guest_device_name, self.size)
+
+class Type(object):
+    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 Autoinstall(object):
+    def __repr__(self):
+        return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
+
+orm.mapper(Machine, machine_table,
+              properties={'nics': relation(NIC, backref="machine", lazy=False),
+                          'disks': relation(Disk, backref="machine", lazy=False),
+                          'type': relation(Type, lazy=False),
+                          'acl': relation(MachineAccess, backref="machine", lazy=False, passive_deletes=True, cascade="all, delete-orphan")});
+orm.mapper(MachineAccess, machine_access_table)
+orm.mapper(NIC, nic_table)
+orm.mapper(Disk, disk_table)
+orm.mapper(Type, types_table)
+orm.mapper(Mirror, mirrors_table)
+orm.mapper(CDROM, cdroms_table,
+               properties={'mirror': relation(Mirror, backref="cdroms")})
+orm.mapper(Autoinstall, autoinstalls_table)
Index: trunk/scripts/prod-migration/xvm-migrate-machine
===================================================================
--- trunk/scripts/prod-migration/xvm-migrate-machine	(revision 1864)
+++ trunk/scripts/prod-migration/xvm-migrate-machine	(revision 1864)
@@ -0,0 +1,150 @@
+#!/usr/bin/python
+# Migrates the machine passed as arguments from the dev cluster.
+# To be run on the prod cluster.
+
+from invirt import remctl as r
+from lib import database
+import subprocess
+import sys
+import time
+import os
+
+sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
+
+kinit = dict(principal='host/aperture-science.mit.edu', keytab='/etc/krb5.keytab')
+
+dev_db_uri = 'postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen'
+database.connect(dev_db_uri)
+dev_sess = database.session
+
+database.connect()
+prod_sess = database.session
+
+## dump from dev db
+def take_data(machine_name):
+  dev_sess.begin()
+  machine = dev_sess.query(database.Machine).filter_by(name=machine_name).one()
+  
+  # Clean out the ACL just so we don't have to think about it
+  machine.acl = []
+  dev_sess.update(machine)
+  
+  print 'VM Info:'
+  print '  name: %s' % machine.name
+  print '  description: %s' % machine.description
+  print '  cpus: %s' % machine.cpus
+  print '  memory: %s' % machine.memory
+  print '  owner: %s' % machine.owner
+  print '  contact: %s' % machine.contact
+  print '  administrator: %s' % machine.administrator
+  print '  uuid: %s' % machine.uuid
+  print '  type: %s' % machine.type.type_id
+  print '  autorestart: %s' % machine.autorestart
+  print '  adminable: %s' % machine.adminable
+  print '  Disks:'
+  for disk in machine.disks:
+    print '  - %s (%s)' % (disk.guest_device_name, disk.size)
+  print '  NICs:'
+  for nic in machine.nics:
+    print '  - %s, %s, %s' % (nic.mac_addr, nic.ip, nic.hostname)
+  print '==============================================='
+  print
+  
+  disks = machine.disks
+  nics = machine.nics
+  for r in disks + nics + [machine]:
+    dev_sess.delete(r)
+  
+  dev_sess.flush()
+  
+  for r in disks + nics + [machine]:
+    dev_sess.expunge(r)
+    del r._instance_key
+  
+  return machine
+
+## add to prod db
+def restore_data(machine, session):
+  # The machine's type is still the one attached to the dev database;
+  # get the right one
+  machine.type = session.query(database.Type).filter_by(type_id=machine.type.type_id).one()
+  session.begin()
+  session.save(machine)
+  session.commit()
+  
+def migrate_vm(machine_name):
+  # Power off the VM on dev
+  #
+  # This has to be done first, because once the machine is deleted
+  # from the database, we can't remctl for it anymore
+  out, err = r.remctl('xvm-remote.mit.edu', 'control', machine_name, 'destroy', err=True, **kinit)
+  print out
+  
+  machine = take_data(machine_name)
+  subprocess.call(['zwrite', '-d', '-c', 'xvm-auto', '-i', 'migration', '-s', 'XVM Migration Script', '-m', 
+                   'Migrating %s, disk size %0.2fG...' % (machine.name, sum(disk.size for disk in machine.disks) / 1024.0)])
+  
+  success = True
+  ## copy disk image... copy, copy...
+  for disk in machine.disks:
+    lvname='d_%s_%s' % (machine.name, disk.guest_device_name)
+    
+    if 0 != subprocess.call(['lvcreate', '-L%sM' % str(disk.size), '-n', lvname, 'xenvg']):
+      success = False
+      break
+    
+    ssh = subprocess.Popen(['rsh',
+                '10.6.0.165',
+                'dd', 'if=/dev/xenvg/%s' % lvname, 'bs=1M'],
+                 stdout=subprocess.PIPE)
+    dd = subprocess.Popen(['dd', 'of=/dev/xenvg/%s' % lvname, 'bs=1M'],
+                stdin=ssh.stdout)
+    if 0 != dd.wait():
+      success = False
+      break
+    if 0 != ssh.wait():
+      success = False
+      break
+  
+  if not success:
+    dev_sess.rollback()
+    
+    print '==============================================='
+    print 'ERROR: VM %s failed to migrate' % machine.name
+    print '==============================================='
+  else:
+    restore_data(machine, prod_sess)
+    dev_sess.commit()
+  
+  return success
+
+if __name__ == '__main__':
+  while True:
+    r.checkKinit(**kinit)
+    p = subprocess.Popen(['curl', '-s', '-k', '--negotiate', '-u', ':', 'https://xvm.mit.edu:442/offlist'], stdout=subprocess.PIPE)
+    if 0 != p.wait():
+        subprocess.call(['zwrite', '-d', '-c', 'xvm', '-i', 'migration', '-s', 'XVM Migration Script', '-m',
+                         'Failed to get list of remaining VMs. Will try again in 15 seconds'])
+        time.sleep(15)
+        continue
+    
+    next_line = p.stdout.read().split('\n')[0]
+    if next_line == '':
+      subprocess.call(['zwrite', '-d', '-c', 'xvm', '-i', 'migration', '-s', 'XVM Migration Script', '-m',
+                       'XVM migration complete'])
+      break
+    
+    next, uptime = next_line.split('\t')[:2]
+    
+    print '==============================================='
+    print 'Migrating %s' % next
+    print '==============================================='
+    if not migrate_vm(next):
+      subprocess.call(['zwrite', '-d', '-c', 'xvm', '-i', 'migration', '-s', 'XVM Migration Script', '-m',
+                       'Error in migrating %s' % next])
+      sys.exit(1)
+    if uptime.strip() != '':
+      r.remctl('xvm-remote-dev.mit.edu', 'control', next, 'create', **kinit)
+    
+    subprocess.call(['zwrite', '-d', '-c', 'xvm-auto', '-i', 'migration', '-s', 'XVM Migration Script', '-m',
+                     'done'])
Index: trunk/scripts/xvm-migrate-machine
===================================================================
--- trunk/scripts/xvm-migrate-machine	(revision 1863)
+++ 	(revision )
@@ -1,150 +1,0 @@
-#!/usr/bin/python
-# Migrates the machine passed as arguments from the dev cluster.
-# To be run on the prod cluster.
-
-from invirt import remctl as r
-from lib import database
-import subprocess
-import sys
-import time
-import os
-
-sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
-
-kinit = dict(principal='host/aperture-science.mit.edu', keytab='/etc/krb5.keytab')
-
-dev_db_uri = 'postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen'
-database.connect(dev_db_uri)
-dev_sess = database.session
-
-database.connect()
-prod_sess = database.session
-
-## dump from dev db
-def take_data(machine_name):
-  dev_sess.begin()
-  machine = dev_sess.query(database.Machine).filter_by(name=machine_name).one()
-  
-  # Clean out the ACL just so we don't have to think about it
-  machine.acl = []
-  dev_sess.update(machine)
-  
-  print 'VM Info:'
-  print '  name: %s' % machine.name
-  print '  description: %s' % machine.description
-  print '  cpus: %s' % machine.cpus
-  print '  memory: %s' % machine.memory
-  print '  owner: %s' % machine.owner
-  print '  contact: %s' % machine.contact
-  print '  administrator: %s' % machine.administrator
-  print '  uuid: %s' % machine.uuid
-  print '  type: %s' % machine.type.type_id
-  print '  autorestart: %s' % machine.autorestart
-  print '  adminable: %s' % machine.adminable
-  print '  Disks:'
-  for disk in machine.disks:
-    print '  - %s (%s)' % (disk.guest_device_name, disk.size)
-  print '  NICs:'
-  for nic in machine.nics:
-    print '  - %s, %s, %s' % (nic.mac_addr, nic.ip, nic.hostname)
-  print '==============================================='
-  print
-  
-  disks = machine.disks
-  nics = machine.nics
-  for r in disks + nics + [machine]:
-    dev_sess.delete(r)
-  
-  dev_sess.flush()
-  
-  for r in disks + nics + [machine]:
-    dev_sess.expunge(r)
-    del r._instance_key
-  
-  return machine
-
-## add to prod db
-def restore_data(machine, session):
-  # The machine's type is still the one attached to the dev database;
-  # get the right one
-  machine.type = session.query(database.Type).filter_by(type_id=machine.type.type_id).one()
-  session.begin()
-  session.save(machine)
-  session.commit()
-  
-def migrate_vm(machine_name):
-  # Power off the VM on dev
-  #
-  # This has to be done first, because once the machine is deleted
-  # from the database, we can't remctl for it anymore
-  out, err = r.remctl('xvm-remote.mit.edu', 'control', machine_name, 'destroy', err=True, **kinit)
-  print out
-  
-  machine = take_data(machine_name)
-  subprocess.call(['zwrite', '-d', '-c', 'xvm-auto', '-i', 'migration', '-s', 'XVM Migration Script', '-m', 
-                   'Migrating %s, disk size %0.2fG...' % (machine.name, sum(disk.size for disk in machine.disks) / 1024.0)])
-  
-  success = True
-  ## copy disk image... copy, copy...
-  for disk in machine.disks:
-    lvname='d_%s_%s' % (machine.name, disk.guest_device_name)
-    
-    if 0 != subprocess.call(['lvcreate', '-L%sM' % str(disk.size), '-n', lvname, 'xenvg']):
-      success = False
-      break
-    
-    ssh = subprocess.Popen(['rsh',
-                '10.6.0.165',
-                'dd', 'if=/dev/xenvg/%s' % lvname, 'bs=1M'],
-                 stdout=subprocess.PIPE)
-    dd = subprocess.Popen(['dd', 'of=/dev/xenvg/%s' % lvname, 'bs=1M'],
-                stdin=ssh.stdout)
-    if 0 != dd.wait():
-      success = False
-      break
-    if 0 != ssh.wait():
-      success = False
-      break
-  
-  if not success:
-    dev_sess.rollback()
-    
-    print '==============================================='
-    print 'ERROR: VM %s failed to migrate' % machine.name
-    print '==============================================='
-  else:
-    restore_data(machine, prod_sess)
-    dev_sess.commit()
-  
-  return success
-
-if __name__ == '__main__':
-  while True:
-    r.checkKinit(**kinit)
-    p = subprocess.Popen(['curl', '-s', '-k', '--negotiate', '-u', ':', 'https://xvm.mit.edu:442/offlist'], stdout=subprocess.PIPE)
-    if 0 != p.wait():
-        subprocess.call(['zwrite', '-d', '-c', 'xvm', '-i', 'migration', '-s', 'XVM Migration Script', '-m',
-                         'Failed to get list of remaining VMs. Will try again in 15 seconds'])
-        time.sleep(15)
-        continue
-    
-    next_line = p.stdout.read().split('\n')[0]
-    if next_line == '':
-      subprocess.call(['zwrite', '-d', '-c', 'xvm', '-i', 'migration', '-s', 'XVM Migration Script', '-m',
-                       'XVM migration complete'])
-      break
-    
-    next, uptime = next_line.split('\t')[:2]
-    
-    print '==============================================='
-    print 'Migrating %s' % next
-    print '==============================================='
-    if not migrate_vm(next):
-      subprocess.call(['zwrite', '-d', '-c', 'xvm', '-i', 'migration', '-s', 'XVM Migration Script', '-m',
-                       'Error in migrating %s' % next])
-      sys.exit(1)
-    if uptime.strip() != '':
-      r.remctl('xvm-remote-dev.mit.edu', 'control', next, 'create', **kinit)
-    
-    subprocess.call(['zwrite', '-d', '-c', 'xvm-auto', '-i', 'migration', '-s', 'XVM Migration Script', '-m',
-                     'done'])