Changeset 572 for trunk/packages/sipb-xen-www/code/controls.py

Timestamp:

Jun 2, 2008, 11:25:47 PM (16 years ago)

Author:

ecprice

Message:

Put validation behind more abstraction.

File:

• trunk/packages/sipb-xen-www/code/controls.py (modified) (6 diffs)

trunk/packages/sipb-xen-www/code/controls.py

@@ -93 +93 @@
                         % (err, machine.name, cdtype))
 
-def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone_from):
+def createVm(username, state, owner, contact, name, 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:
-        validation.validMemory(owner, memory)
-        validation.validDisk(owner, disk_size  * 1. / 1024)
-        validation.validAddVm(owner)
+        validation.Validate(username, state, owner=owner, memory=memory, disksize=disksize/1024.)
         res = meta.engine.execute('select nextval('
                                   '\'"machines_machine_id_seq"\')')
@@ -116 +114 @@
         ctx.current.save(machine)
         disk = Disk(machine_id=machine.machine_id,
-                    guest_device_name='hda', size=disk_size)
+                    guest_device_name='hda', size=disksize)
         open_nics = NIC.select_by(machine_id=None)
         if not open_nics: #No IPs left!
@@ -141 +139 @@
     """Return a dictionary mapping machine names to dicts."""
     value_string = remctl('web', 'listvms')
-    value_dict = yaml.load(value_string, yaml.CSafeLoader)
+    value_dict = yaml.load(value_string, yaml.SafeLoader)
     return value_dict
 
@@ -209 +207 @@
         remctl('web', 'lvremove', mname, dname)
 
-def commandResult(user, fields):
+def commandResult(username, state, fields):
     start_time = 0
-    machine = validation.testMachineId(user, fields.getfirst('machine_id'))
+    machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
     action = fields.getfirst('action')
     cdrom = fields.getfirst('cdrom')
@@ -236 +234 @@
                 
     elif action == 'Power on':
-        if validation.maxMemory(user, machine) < machine.memory:
+        if validation.maxMemory(username, state, machine) < machine.memory:
             raise InvalidInput('action', 'Power on',
                                "You don't have enough free RAM quota "
@@ -264 +262 @@
         deleteVM(machine)
 
-    d = dict(user=user,
+    d = dict(user=username,
              command=action,
              machine=machine)