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 unnecessary constructors
[invirt/packages/invirt-web.git]
/
main.py
diff --git
a/main.py
b/main.py
index
e7412ba
..
29b410e
100755
(executable)
--- a/
main.py
+++ b/
main.py
@@
-149,8
+149,8
@@
def parseCreate(user, fields):
memory = fields.getfirst('memory')
memory = validation.validMemory(user, memory, on=True)
memory = fields.getfirst('memory')
memory = validation.validMemory(user, memory, on=True)
- disk = fields.getfirst('disk')
- disk = validation.validDisk(user, disk)
+ disk_size = fields.getfirst('disk')
+ disk_size = validation.validDisk(user, disk_size)
vm_type = fields.getfirst('vmtype')
if vm_type not in ('hvm', 'paravm'):
vm_type = fields.getfirst('vmtype')
if vm_type not in ('hvm', 'paravm'):
@@
-160,7
+160,7
@@
def parseCreate(user, fields):
cdrom = fields.getfirst('cdrom')
if cdrom is not None and not CDROM.get(cdrom):
raise CodeError("Invalid cdrom type '%s'" % cdrom)
cdrom = fields.getfirst('cdrom')
if cdrom is not None and not CDROM.get(cdrom):
raise CodeError("Invalid cdrom type '%s'" % cdrom)
- return dict(contact=user, name=name, memory=memory, disk=disk,
+ return dict(contact=user, name=name, memory=memory, disk_size=disk_size,
owner=owner, is_hvm=is_hvm, cdrom=cdrom)
def create(user, fields):
owner=owner, is_hvm=is_hvm, cdrom=cdrom)
def create(user, fields):