STDERR:
' + str(addition) + '' +Template.sipb_xen_database = sipb_xen_database Template.helppopup = staticmethod(helppopup) Template.err = None @@ -96,9 +103,10 @@ class Defaults: memory = 256 disk = 4.0 cdrom = '' + autoinstall = '' name = '' - vmtype = 'hvm' def __init__(self, max_memory=None, max_disk=None, **kws): + self.type = Type.get('linux-hvm') if max_memory is not None: self.memory = min(self.memory, max_memory) if max_disk is not None: @@ -142,12 +150,12 @@ 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) @@ -161,7 +169,7 @@ 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, machine_type=vm_type, cdrom=cdrom, clone_from=clone_from) @@ -186,6 +194,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 = {} @@ -218,8 +227,7 @@ def getListDict(user): defaults=defaults, machines=machines, has_vnc=has_vnc, - uptimes=g.uptimes, - cdroms=CDROM.select()) + uptimes=g.uptimes) return d def listVms(user, fields): @@ -228,7 +236,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. @@ -240,9 +248,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 @@ -250,7 +258,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 = {} @@ -263,10 +271,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, @@ -276,6 +284,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: @@ -317,7 +329,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 @@ -352,6 +364,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: @@ -369,7 +385,11 @@ def modifyDict(user, fields): if memory is not None: memory = validation.validMemory(user, memory, machine, on=False) machine.memory = memory - + + vm_type = validation.validVmType(fields.getfirst('vmtype')) + if vm_type is not None: + machine.type = vm_type + disksize = validation.testDisk(user, fields.getfirst('disk')) if disksize is not None: disksize = validation.validDisk(user, disksize, machine) @@ -378,17 +398,22 @@ def modifyDict(user, fields): olddisk[disk.guest_device_name] = disksize disk.size = disksize ctx.current.save(disk) - - if owner is not None: + + update_acl = False + if owner is not None and owner != machine.owner: machine.owner = owner + update_acl = True if name is not None: machine.name = name - if admin is not None: + if admin is not None and admin != machine.administrator: machine.administrator = admin + update_acl = True if contact is not None: machine.contact = contact - + ctx.current.save(machine) + if update_acl: + cache_acls.refreshMachine(machine) transaction.commit() except: transaction.rollback() @@ -400,7 +425,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: @@ -419,13 +444,13 @@ 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 local console access over VNC. To access the serial console of these machines, you can SSH with Kerberos @@ -460,22 +485,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) @@ -522,14 +549,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: @@ -549,12 +576,11 @@ def infoDict(user, machine): checkpoint.checkpoint('Got mem') max_disk = validation.maxDisk(user, machine) defaults = Defaults() - for name in 'machine_id name administrator owner memory contact'.split(): + for name in 'machine_id name administrator owner memory contact type'.split(): setattr(defaults, name, getattr(machine, name)) defaults.disk = "%0.2f" % (machine.disks[0].size/1024.) checkpoint.checkpoint('Got defaults') d = dict(user=user, - cdroms=CDROM.select(), on=status is not None, machine=machine, defaults=defaults, @@ -583,6 +609,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 @@ -593,7 +620,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)