X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/91cbb0a23c6f76ca67a0ab462c5708442db4b77e..230d47ec0096ba45aeb3a690fa2c4551f4fcbb16:/code/main.py
diff --git a/code/main.py b/code/main.py
index 98fe1a8..9caf7c4 100755
--- a/code/main.py
+++ b/code/main.py
@@ -59,8 +59,8 @@ checkpoint = Checkpoint()
def helppopup(subj):
"""Return HTML code for a (?) link to a specified help topic"""
- return ('(?)')
def makeErrorPre(old, addition):
@@ -142,19 +142,17 @@ def parseCreate(user, fields):
if Machine.get_by(name=name):
raise InvalidInput('name', name,
"Name already exists.")
-
+
owner = validation.testOwner(user, fields.getfirst('owner'))
memory = fields.getfirst('memory')
memory = validation.validMemory(owner, memory, on=True)
-
+
disk_size = fields.getfirst('disk')
disk_size = validation.validDisk(owner, disk_size)
vm_type = fields.getfirst('vmtype')
- if vm_type not in ('hvm', 'paravm'):
- raise CodeError("Invalid vm type '%s'" % vm_type)
- is_hvm = (vm_type == 'hvm')
+ vm_type = validation.validVmType(vm_type)
cdrom = fields.getfirst('cdrom')
if cdrom is not None and not CDROM.get(cdrom):
@@ -163,9 +161,9 @@ def parseCreate(user, fields):
clone_from = fields.getfirst('clone_from')
if clone_from and clone_from != 'ice3':
raise CodeError("Invalid clone image '%s'" % clone_from)
-
+
return dict(contact=user, name=name, memory=memory, disk_size=disk_size,
- owner=owner, is_hvm=is_hvm, cdrom=cdrom, clone_from=clone_from)
+ owner=owner, machine_type=vm_type, cdrom=cdrom, clone_from=clone_from)
def create(user, fields):
"""Handler for create requests."""
@@ -188,6 +186,7 @@ def create(user, fields):
def getListDict(user):
+ """Gets the list of local variables used by list.tmpl."""
machines = g.machines
checkpoint.checkpoint('Got my machines')
on = {}
@@ -230,7 +229,7 @@ def listVms(user, fields):
d = getListDict(user)
checkpoint.checkpoint('Got list dict')
return templates.list(searchList=[d])
-
+
def vnc(user, fields):
"""VNC applet page.
@@ -242,9 +241,9 @@ def vnc(user, fields):
You might want iptables like:
-t nat -A PREROUTING -s ! 18.181.0.60 -i eth1 -p tcp -m tcp \
- --dport 10003 -j DNAT --to-destination 18.181.0.60:10003
+ --dport 10003 -j DNAT --to-destination 18.181.0.60:10003
-t nat -A POSTROUTING -d 18.181.0.60 -o eth1 -p tcp -m tcp \
- --dport 10003 -j SNAT --to-source 18.187.7.142
+ --dport 10003 -j SNAT --to-source 18.187.7.142
-A FORWARD -d 18.181.0.60 -i eth1 -o eth1 -p tcp -m tcp \
--dport 10003 -j ACCEPT
@@ -252,7 +251,7 @@ def vnc(user, fields):
echo 1 > /proc/sys/net/ipv4/ip_forward
"""
machine = validation.testMachineId(user, fields.getfirst('machine_id'))
-
+
TOKEN_KEY = "0M6W0U1IXexThi5idy8mnkqPKEq1LtEnlK/pZSn0cDrN"
data = {}
@@ -265,10 +264,10 @@ def vnc(user, fields):
token = {'data': pickled_data, 'digest': m.digest()}
token = cPickle.dumps(token)
token = base64.urlsafe_b64encode(token)
-
+
status = controls.statusInfo(machine)
has_vnc = hasVnc(status)
-
+
d = dict(user=user,
on=status,
has_vnc=has_vnc,
@@ -278,6 +277,10 @@ def vnc(user, fields):
return templates.vnc(searchList=[d])
def getHostname(nic):
+ """Find the hostname associated with a NIC.
+
+ XXX this should be merged with the similar logic in DNS and DHCP.
+ """
if nic.hostname and '.' in nic.hostname:
return nic.hostname
elif nic.machine:
@@ -319,7 +322,7 @@ def getDiskInfo(data_dict, machine):
disk_fields = []
for disk in machine.disks:
name = disk.guest_device_name
- disk_fields.extend([(x % name, y % name) for x, y in
+ disk_fields.extend([(x % name, y % name) for x, y in
disk_fields_template])
data_dict['%s_size' % name] = "%0.1f GiB" % (disk.size / 1024.)
return disk_fields
@@ -354,6 +357,10 @@ def command(user, fields):
raise InvalidInput('back', back, 'Not a known back page.')
def modifyDict(user, fields):
+ """Modify a machine as specified by CGI arguments.
+
+ Return a list of local variables for modify.tmpl.
+ """
olddisk = {}
transaction = ctx.current.create_transaction()
try:
@@ -371,7 +378,7 @@ def modifyDict(user, fields):
if memory is not None:
memory = validation.validMemory(user, memory, machine, on=False)
machine.memory = memory
-
+
disksize = validation.testDisk(user, fields.getfirst('disk'))
if disksize is not None:
disksize = validation.validDisk(user, disksize, machine)
@@ -380,7 +387,7 @@ def modifyDict(user, fields):
olddisk[disk.guest_device_name] = disksize
disk.size = disksize
ctx.current.save(disk)
-
+
if owner is not None:
machine.owner = owner
if name is not None:
@@ -389,7 +396,7 @@ def modifyDict(user, fields):
machine.administrator = admin
if contact is not None:
machine.contact = contact
-
+
ctx.current.save(machine)
transaction.commit()
except:
@@ -402,7 +409,7 @@ def modifyDict(user, fields):
return dict(user=user,
command=command,
machine=machine)
-
+
def modify(user, fields):
"""Handler for modifying attributes of a machine."""
try:
@@ -421,17 +428,18 @@ def modify(user, fields):
setattr(info_dict['defaults'], field, fields.getfirst(field))
info_dict['result'] = result
return templates.info(searchList=[info_dict])
-
+
def helpHandler(user, fields):
"""Handler for help messages."""
simple = fields.getfirst('simple')
subjects = fields.getlist('subject')
-
+
help_mapping = dict(paravm_console="""
-ParaVM machines do not support console access over VNC. To access
-these machines, you either need to boot with a liveCD and ssh in or
-hope that the sipb-xen maintainers add support for serial consoles.""",
+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
+username.""",
hvm_paravm="""
HVM machines use the virtualization features of the processor, while
ParaVM machines use Xen's emulation of virtualization features. You
@@ -443,8 +451,8 @@ The owner field is used to determine 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 see who administers the LOCKER locker using the
-command 'fs la /mit/LOCKER' on Athena.) See also administrator.""",
administrator="""
The administrator field determines who can access the console and
@@ -461,22 +469,24 @@ 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())
-
+
d = dict(user=user,
simple=simple,
subjects=subjects,
mapping=help_mapping)
-
+
return templates.help(searchList=[d])
-
+
def badOperation(u, e):
+ """Function called when accessing an unknown URI."""
raise CodeError("Unknown operation")
def infoDict(user, machine):
+ """Get the variables used by info.tmpl."""
status = controls.statusInfo(machine)
checkpoint.checkpoint('Getting status info')
has_vnc = hasVnc(status)
@@ -523,14 +533,14 @@ def infoDict(user, machine):
nic_fields = getNicInfo(machine_info, machine)
nic_point = display_fields.index('NIC_INFO')
- display_fields = (display_fields[:nic_point] + nic_fields +
+ display_fields = (display_fields[:nic_point] + nic_fields +
display_fields[nic_point+1:])
disk_fields = getDiskInfo(machine_info, machine)
disk_point = display_fields.index('DISK_INFO')
- display_fields = (display_fields[:disk_point] + disk_fields +
+ display_fields = (display_fields[:disk_point] + disk_fields +
display_fields[disk_point+1:])
-
+
main_status['memory'] += ' MiB'
for field, disp in display_fields:
if field in ('uptime', 'cputime') and locals()[field] is not None:
@@ -584,6 +594,7 @@ mapping = dict(list=listVms,
help=helpHandler)
def printHeaders(headers):
+ """Print a dictionary as HTTP headers."""
for key, value in headers.iteritems():
print '%s: %s' % (key, value)
print
@@ -594,7 +605,7 @@ def getUser():
username = os.environ['SSL_CLIENT_S_DN_Email'].split("@")[0]
return username
-def main(operation, user, fields):
+def main(operation, user, fields):
start_time = time.time()
fun = mapping.get(operation, badOperation)