X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/251a74f2ce55741ee63f8d5b6c732f5631912b79..9a58d0785024a99e409fe95cba99391676c026f2:/code/main.py
diff --git a/code/main.py b/code/main.py
index e208a13..ce523cb 100755
--- a/code/main.py
+++ b/code/main.py
@@ -214,7 +214,7 @@ def getListDict(user):
elif m.type.hvm:
has_vnc[m] = "WTF?"
else:
- has_vnc[m] = "ParaVM"+helppopup("paravm_console")
+ has_vnc[m] = "ParaVM"+helppopup("ParaVM Console")
max_memory = validation.maxMemory(user)
max_disk = validation.maxDisk(user)
checkpoint.checkpoint('Got max mem/disk')
@@ -456,40 +456,40 @@ def helpHandler(user, fields):
simple = fields.getfirst('simple')
subjects = fields.getlist('subject')
- help_mapping = dict(paravm_console="""
+ help_mapping = {'ParaVM Console': """
ParaVM machines do not support local console access over VNC. To
access the serial console of these machines, you can SSH with Kerberos
-to sipb-xen-console.mit.edu, using the name of the machine as your
+to console.xvm.mit.edu, using the name of the machine as your
username.""",
- hvm_paravm="""
+ 'HVM/ParaVM': """
HVM machines use the virtualization features of the processor, while
ParaVM machines use Xen's emulation of virtualization features. You
want an HVM virtualized machine.""",
- cpu_weight="""
+ 'CPU Weight': """
Don't ask us! We're as mystified as you are.""",
- owner="""
+ 'Owner': """
The owner field is used to determine quotas. It must be the name of a
+href="help?subject=Quotas">quotas. It must be the name of a
locker that you are an AFS administrator of. In particular, you or an
AFS group you are a member of must have AFS rlidwka bits on the
locker. You can check who administers the LOCKER locker using the
commands 'attach LOCKER; fs la /mit/LOCKER' on Athena.) See also administrator.""",
- administrator="""
+href="help?subject=Administrator">administrator.""",
+ 'Administrator': """
The administrator field determines who can access the console and
power on and off the machine. This can be either a user or a moira
group.""",
- quotas="""
+ 'Quotas': """
Quotas are determined on a per-locker basis. Each locker may have a
maximum of 512 megabytes of active ram, 50 gigabytes of disk, and 4
active machines.""",
- console="""
+ 'Console': """
Framebuffer: At a Linux boot prompt in your VM, try
setting fb=false to disable the framebuffer. If you don't,
your machine will run just fine, but the applet's display of the
console will suffer artifacts.
"""
- )
+ }
if not subjects:
subjects = sorted(help_mapping.keys())
@@ -536,7 +536,7 @@ def infoDict(user, machine):
('memory', 'RAM'),
'DISK_INFO',
('state', 'state (xen format)'),
- ('cpu_weight', 'CPU weight'+helppopup('cpu_weight')),
+ ('cpu_weight', 'CPU weight'+helppopup('CPU Weight')),
('on_reboot', 'Action on VM reboot'),
('on_poweroff', 'Action on VM poweroff'),
('on_crash', 'Action on VM crash'),
@@ -595,7 +595,7 @@ def infoDict(user, machine):
ram=machine.memory,
max_mem=max_mem,
max_disk=max_disk,
- owner_help=helppopup("owner"),
+ owner_help=helppopup("Owner"),
fields = fields)
return d
@@ -671,7 +671,7 @@ def main(operation, user, fields):
sys.exit(1)
print 'Content-Type: text/plain\n'
print 'Uh-oh! We experienced an error.'
- print 'Please email sipb-xen@mit.edu with the contents of this page.'
+ print 'Please email xvm-dev@mit.edu with the contents of this page.'
print '----'
e = revertStandardError()
print e