X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/eb9adb539fb47ab4b5c4e859cf119b554b9116cb..0e16120a7b3ae7887089cd1f8fc8d1e9925ebe52:/code/controls.py

diff --git a/code/controls.py b/code/controls.py
index b2c60d5..3cf6b1d 100644
--- a/code/controls.py
+++ b/code/controls.py
@@ -45,7 +45,7 @@ def remctl(*args, **kws):
     kinits if necessary, and outputs errors to stderr.
     """
     checkKinit()
-    p = subprocess.Popen(['remctl', 'black-mesa.mit.edu']
+    p = subprocess.Popen(['remctl', 'remote.mit.edu']
                          + list(args),
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)
@@ -91,15 +91,7 @@ def bootMachine(machine, cdtype):
         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
 
-def registerMachine(machine):
-    """Register a machine to be controlled by the web interface"""
-    remctl('web', 'register', machine.name)
-
-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, clone_from):
+def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone_from):
     """Create a VM and put it in the database"""
     # put stuff in the table
     transaction = ctx.current.create_transaction()
@@ -119,7 +111,6 @@ def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom, clone_from)
         machine.contact = contact
         machine.uuid = uuidToString(randomUUID())
         machine.boot_off_cd = True
-        machine_type = Type.get_by(hvm=is_hvm)
         machine.type_id = machine_type.type_id
         ctx.current.save(machine)
         disk = Disk(machine_id=machine.machine_id, 
@@ -127,7 +118,7 @@ def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom, clone_from)
         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
@@ -138,7 +129,6 @@ def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom, clone_from)
     except:
         transaction.rollback()
         raise
-    registerMachine(machine)
     makeDisks(machine)
     if clone_from:
         lvcopy(clone_from, machine, 'password')
@@ -225,7 +215,6 @@ def deleteVM(machine):
         raise
     for mname, dname in delete_disk_pairs:
         remctl('web', 'lvremove', mname, dname)
-    unregisterMachine(machine)
 
 def commandResult(user, fields):
     start_time = 0
@@ -294,5 +283,4 @@ def renameMachine(machine, old_name, new_name):
     for disk in machine.disks:
         remctl("web", "lvrename", old_name, 
                disk.guest_device_name, new_name)
-    remctl("web", "moveregister", old_name, new_name)