web: fix file permissions on each make

[invirt/packages/invirt-web.git] / code / controls.py

diff --git a/code/controls.py b/code/controls.py
index 63221a2..bb6c590 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -92,18 +92,19 @@ def bootMachine(machine, cdtype):
         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
 
         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
 

-def createVm(username, state, owner, contact, name, memory, disksize, machine_type, cdrom, clone_from):
+def createVm(username, state, owner, contact, name, description, memory, disksize, machine_type, cdrom, clone_from):

     """Create a VM and put it in the database"""
     # put stuff in the table
     transaction = ctx.current.create_transaction()
     try:
     """Create a VM and put it in the database"""
     # put stuff in the table
     transaction = ctx.current.create_transaction()
     try:

-        validation.Validate(username, state, owner=owner, memory=memory, disksize=disksize/1024.)
+        validation.Validate(username, state, name=name, description=description, owner=owner, memory=memory, disksize=disksize/1024.)

         res = meta.engine.execute('select nextval('
                                   '\'"machines_machine_id_seq"\')')
         id = res.fetchone()[0]
         machine = Machine()
         machine.machine_id = id
         machine.name = name
         res = meta.engine.execute('select nextval('
                                   '\'"machines_machine_id_seq"\')')
         id = res.fetchone()[0]
         machine = Machine()
         machine.machine_id = id
         machine.name = name

+        machine.description = description

         machine.memory = memory
         machine.owner = owner
         machine.administrator = owner
         machine.memory = memory
         machine.owner = owner
         machine.administrator = owner

@@ -175,7 +176,7 @@ def statusInfo(machine):
     if 'Unknown command' in err_string:
         raise CodeError("ERROR in remctl list-long %s is not registered" % 
                         (machine.name,))
     if 'Unknown command' in err_string:
         raise CodeError("ERROR in remctl list-long %s is not registered" % 
                         (machine.name,))

-    elif 'does not exist' in err_string:
+    elif 'is not on' in err_string:

         return None
     elif err_string:
         raise CodeError("ERROR in remctl list-long %s:  %s" % 
         return None
     elif err_string:
         raise CodeError("ERROR in remctl list-long %s:  %s" % 

@@ -196,8 +197,6 @@ def deleteVM(machine):
             ctx.current.save(nic)
         for disk in machine.disks:
             ctx.current.delete(disk)
             ctx.current.save(nic)
         for disk in machine.disks:
             ctx.current.delete(disk)

-        for access in machine.acl:
-            ctx.current.delete(access)

         ctx.current.delete(machine)
         transaction.commit()
     except:
         ctx.current.delete(machine)
         transaction.commit()
     except: