projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove extraneous whitespace and add documentation
[invirt/packages/invirt-web.git]
/
code
/
validation.py
diff --git
a/code/validation.py
b/code/validation.py
index
3f05017
..
a2e19fe
100644
(file)
--- a/
code/validation.py
+++ b/
code/validation.py
@@
-4,7
+4,7
@@
import cache_acls
import getafsgroups
import re
import string
import getafsgroups
import re
import string
-from sipb_xen_database import Machine, NIC
+from sipb_xen_database import Machine, NIC, Type
from webcommon import InvalidInput, g
MAX_MEMORY_TOTAL = 512
from webcommon import InvalidInput, g
MAX_MEMORY_TOTAL = 512
@@
-123,7
+123,15
@@
def validDisk(user, disk, machine=None):
raise InvalidInput('disk', disk,
"Minimum %s GiB" % MIN_DISK_SINGLE)
return disk
raise InvalidInput('disk', disk,
"Minimum %s GiB" % MIN_DISK_SINGLE)
return disk
-
+
+def validVmType(vm_type):
+ if vm_type == 'hvm':
+ return Type.get('linux-hvm')
+ elif vm_type == 'paravm':
+ return Type.get('linux')
+ else:
+ raise CodeError("Invalid vm type '%s'" % vm_type)
+
def testMachineId(user, machine_id, exists=True):
"""Parse, validate and check authorization for a given user and machine.
def testMachineId(user, machine_id, exists=True):
"""Parse, validate and check authorization for a given user and machine.