return d
def __getattr__(self, name):
+ # At the point __getattr__ is called, tools haven't been run. Make sure the user is logged in.
+ cherrypy.tools.remote_user_login.callable()
+
if name in ("admin", "overlord"):
if not cherrypy.request.login in getAfsGroupMembers(config.adminacl, config.authz.afs.cells[0].cell):
raise InvalidInput('username', cherrypy.request.login,
<p>We recommend using a ParaVM when possible and an HVM when necessary.
""",
- 'CPU Weight': """
-Don't ask us! We're as mystified as you are.""",
'Owner': """
The owner field is used to determine <a
href="help?subject=Quotas">quotas</a>. It must be the name of a
console will suffer artifacts.
""",
'Windows': """
+<strong>Windows 7:</strong> The Windows 7 image is licensed for all MIT students and will automatically activate off the network; see <a href="/static/msca-7.txt">the licensing agreement</a> for details. The installer requires 512 MiB RAM and at least 15 GiB disk space (20 GiB or more recommended).<br>
<strong>Windows Vista:</strong> The Vista image is licensed for all MIT students and will automatically activate off the network; see <a href="/static/msca-email.txt">the licensing confirmation e-mail</a> for details. The installer requires 512 MiB RAM and at least 7.5 GiB disk space (15 GiB or more recommended).<br>
<strong>Windows XP:</strong> This is the volume license CD image. You will need your own volume license key to complete the install. We do not have these available for the general MIT community; ask your department if they have one, or visit <a href="http://msca.mit.edu/">http://msca.mit.edu/</a> if you are staff/faculty to request one.
"""
defaults=defaults,
machines=machines,
has_vnc=has_vnc,
- installing=installing)
+ installing=installing,
+ disable_creation=False)
return d
def getHostname(nic):
olddisk = {}
session.begin()
try:
- kws = dict([(kw, fields[kw]) for kw in
+ kws = dict((kw, fields[kw]) for kw in
'owner admin contact name description memory vmtype disksize'.split()
- if fields[kw]])
+ if fields.get(kw))
kws['machine_id'] = machine_id
validate = validation.Validate(username, state, **kws)
machine = validate.machine
if hasattr(validate, 'vmtype'):
machine.type = validate.vmtype
- if hasattr(validate, 'disksize'):
- disksize = validate.disksize
- disk = machine.disks[0]
- if disk.size != disksize:
- olddisk[disk.guest_device_name] = disksize
- disk.size = disksize
- session.save_or_update(disk)
-
update_acl = False
if hasattr(validate, 'owner') and validate.owner != machine.owner:
machine.owner = validate.owner
update_acl = True
- if hasattr(validate, 'name'):
- machine.name = validate.name
- for n in machine.nics:
- if n.hostname == oldname:
- n.hostname = validate.name
if hasattr(validate, 'description'):
machine.description = validate.description
if hasattr(validate, 'admin') and validate.admin != machine.administrator:
if hasattr(validate, 'contact'):
machine.contact = validate.contact
- session.save_or_update(machine)
- if update_acl:
- cache_acls.refreshMachine(machine)
+ session.add(machine)
session.commit()
except:
session.rollback()
raise
- for diskname in olddisk:
- controls.resizeDisk(oldname, diskname, str(olddisk[diskname]))
- if hasattr(validate, 'name'):
- controls.renameMachine(machine, oldname, validate.name)
+
+ session.begin()
+ try:
+ if hasattr(validate, 'disksize'):
+ disksize = validate.disksize
+ disk = machine.disks[0]
+ if disk.size != disksize:
+ olddisk[disk.guest_device_name] = disksize
+ disk.size = disksize
+ session.add(disk)
+ for diskname in olddisk:
+ controls.resizeDisk(oldname, diskname, str(olddisk[diskname]))
+ session.add(machine)
+ session.commit()
+ except:
+ session.rollback()
+ raise
+
+ session.begin()
+ try:
+ if hasattr(validate, 'name'):
+ machine.name = validate.name
+ for n in machine.nics:
+ if n.hostname == oldname:
+ n.hostname = validate.name
+ if hasattr(validate, 'name'):
+ controls.renameMachine(machine, oldname, validate.name)
+ session.add(machine)
+ session.commit()
+ except:
+ session.rollback()
+ raise
+
+ if update_acl:
+ cache_acls.refreshMachine(machine)
+
return dict(machine=machine)
def infoDict(username, state, machine):
"""Get the variables used by info.tmpl."""
- status = controls.statusInfo(machine)
+ try:
+ status = controls.statusInfo(machine)
+ except CodeError, e:
+ # machine was shut down in between the call to listInfoDict and this
+ status = None
has_vnc = hasVnc(status)
if status is None:
main_status = dict(name=machine.name,
else:
main_status = dict(status[1:])
main_status['host'] = controls.listHost(machine)
- start_time = float(main_status.get('start_time', 0))
- uptime = datetime.timedelta(seconds=int(time.time()-start_time))
+ start_time = main_status.get('start_time')
+ if start_time is None:
+ uptime = "Still booting?"
+ else:
+ start_time = float(start_time)
+ uptime = datetime.timedelta(seconds=int(time.time()-start_time))
cpu_time_float = float(main_status.get('cpu_time', 0))
cputime = datetime.timedelta(seconds=int(cpu_time_float))
display_fields = [('name', 'Name'),
projects / invirt/packages/invirt-web.git / blobdiff