Changeset 609 for trunk/packages/sipb-xen-www/code/main.py
- Timestamp:
- Jun 18, 2008, 3:50:31 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/sipb-xen-www/code/main.py
r607 r609 104 104 autoinstall = '' 105 105 name = '' 106 description = '' 106 107 type = 'linux-hvm' 107 108 … … 136 137 137 138 def parseCreate(username, state, fields): 138 kws = dict([(kw, fields.getfirst(kw)) for kw in 'name owner memory disksize vmtype cdrom clone_from'.split()])139 kws = dict([(kw, fields.getfirst(kw)) for kw in 'name description owner memory disksize vmtype cdrom clone_from'.split()]) 139 140 validate = validation.Validate(username, state, strict=True, **kws) 140 return dict(contact=username, name=validate.name, memory=validate.memory,141 return dict(contact=username, name=validate.name, description=validate.description, memory=validate.memory, 141 142 disksize=validate.disksize, owner=validate.owner, machine_type=validate.vmtype, 142 143 cdrom=getattr(validate, 'cdrom', None), … … 347 348 transaction = ctx.current.create_transaction() 348 349 try: 349 kws = dict([(kw, fields.getfirst(kw)) for kw in 'machine_id owner admin contact name memory vmtype disksize'.split()])350 kws = dict([(kw, fields.getfirst(kw)) for kw in 'machine_id owner admin contact name description memory vmtype disksize'.split()]) 350 351 validate = validation.Validate(username, state, **kws) 351 352 machine = validate.machine … … 372 373 if hasattr(validate, 'name'): 373 374 machine.name = validate.name 375 if hasattr(validate, 'description'): 376 machine.description = validate.description 374 377 if hasattr(validate, 'admin') and validate.admin != machine.administrator: 375 378 machine.administrator = validate.admin … … 489 492 on_poweroff on_crash on_xend_start on_xend_stop bootloader""".split() 490 493 display_fields = [('name', 'Name'), 494 ('description', 'Description'), 491 495 ('owner', 'Owner'), 492 496 ('administrator', 'Administrator'), … … 510 514 machine_info = {} 511 515 machine_info['name'] = machine.name 516 machine_info['description'] = machine.description 512 517 machine_info['type'] = machine.type.hvm and 'HVM' or 'ParaVM' 513 518 machine_info['owner'] = machine.owner … … 544 549 max_disk = validation.maxDisk(machine.owner, machine) 545 550 defaults = Defaults() 546 for name in 'machine_id name administrator owner memory contact'.split():551 for name in 'machine_id name description administrator owner memory contact'.split(): 547 552 setattr(defaults, name, getattr(machine, name)) 548 553 defaults.type = machine.type.type_id … … 613 618 errorMessage=str(err), stderr=emsg, traceback=traceback) 614 619 details = templates.error_raw(searchList=[d]) 615 send_error_mail('xvm error on %s for %s: %s' % (op, username, err),616 details)617 620 d['details'] = details 618 621 return templates.error(searchList=[d])
Note: See TracChangeset
for help on using the changeset viewer.