X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/e37dd15bbf8683bab8454ea0eec8e9968ce982b2..61154617919ca57b6f1d4bed02aa9847ef14232a:/code/controls.py

diff --git a/code/controls.py b/code/controls.py
index 7134668..2aeb924 100644
--- a/code/controls.py
+++ b/code/controls.py
@@ -68,6 +68,10 @@ def makeDisks(machine):
     for disk in machine.disks:
         lvcreate(machine, disk)
 
+def lvcopy(machine_orig_name, machine, rootpw):
+    """Copy a golden image onto a machine's disk"""
+    remctl('web', 'lvcopy', machine_orig_name, machine.name, rootpw)
+
 def bootMachine(machine, cdtype):
     """Boot a machine with a given boot CD.
 
@@ -95,7 +99,7 @@ def unregisterMachine(machine):
     """Unregister a machine to not be controlled by the web interface"""
     remctl('web', 'unregister', machine.name)
 
-def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom):
+def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom, clone_from):
     """Create a VM and put it in the database"""
     # put stuff in the table
     transaction = ctx.current.create_transaction()
@@ -123,7 +127,7 @@ def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom):
         open_nics = NIC.select_by(machine_id=None)
         if not open_nics: #No IPs left!
             raise CodeError("No IP addresses left!  "
-                            "Contact sipb-xen-dev@mit.edu")
+                            "Contact sipb-xen@mit.edu.")
         nic = open_nics[0]
         nic.machine_id = machine.machine_id
         nic.hostname = name
@@ -136,6 +140,8 @@ def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom):
         raise
     registerMachine(machine)
     makeDisks(machine)
+    if clone_from:
+        lvcopy(clone_from, machine, 'password')
     # tell it to boot with cdrom
     bootMachine(machine, cdrom)
     return machine