X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=PLC%2FMethods%2FGetBootMedium.py;h=7b73a93c34693074f2f555867d404ff5339db5a9;hb=d51a2803a4fb08e542e2debb4b49983066e5aaf4;hp=ba432c348836118b73f8f2afe14f3798acefc832;hpb=87114596636608b1fe26b30f841838e06c8213c3;p=plcapi.git diff --git a/PLC/Methods/GetBootMedium.py b/PLC/Methods/GetBootMedium.py index ba432c3..7b73a93 100644 --- a/PLC/Methods/GetBootMedium.py +++ b/PLC/Methods/GetBootMedium.py @@ -1,3 +1,5 @@ +# pylint: disable=c0111, c0103 + import random import base64 import os @@ -14,36 +16,37 @@ from PLC.Interfaces import Interface, Interfaces from PLC.InterfaceTags import InterfaceTag, InterfaceTags from PLC.NodeTags import NodeTag, NodeTags -from PLC.Accessors.Accessors_standard import * # import node accessors +from PLC.Logger import logger + +from PLC.Accessors.Accessors_standard import * # node accessors # could not define this in the class.. # create a dict with the allowed actions for each type of node # reservable nodes being more recent, we do not support the floppy stuff anymore allowed_actions = { - 'regular' : - [ 'node-preview', - 'node-floppy', - 'node-iso', - 'node-usb', - 'generic-iso', - 'generic-usb', - ], - 'reservable': - [ 'node-preview', - 'node-iso', - 'node-usb', - ], - } + 'regular' : [ + 'node-preview', + 'node-floppy', + 'node-iso', + 'node-usb', + 'generic-iso', + 'generic-usb', + ], + 'reservable': [ + 'node-preview', + 'node-iso', + 'node-usb', + ], +} # compute a new key def compute_key(): # Generate 32 random bytes - bytes = random.sample(xrange(0, 256), 32) + int8s = random.sample(range(0, 256), 32) # Base64 encode their string representation - key = base64.b64encode("".join(map(chr, bytes))) + key = base64.b64encode(bytes(int8s)) # Boot Manager cannot handle = in the key - # XXX this sounds wrong, as it might prevent proper decoding - key = key.replace("=", "") + key = key.replace(b"=", b"") return key class GetBootMedium(Method): @@ -117,9 +120,10 @@ class GetBootMedium(Method): variants are used to run a different kernel on the bootCD see kvariant.sh for how to create a variant - 'no-hangcheck' - disable hangcheck + - 'systemd-debug' - turn on systemd debug in bootcd Tags: the following tags are taken into account when attached to the node: - 'serial', 'cramfs', 'kvariant', 'kargs', 'no-hangcheck' + 'serial', 'cramfs', 'kvariant', 'kargs', 'no-hangcheck', 'systemd-debug' Security: - Non-admins can only generate files for nodes at their sites. @@ -138,9 +142,9 @@ class GetBootMedium(Method): Auth(), Mixed(Node.fields['node_id'], Node.fields['hostname']), - Parameter (str, "Action mode, expected value depends of the type of node"), - Parameter (str, "Empty string for verbatim result, resulting file full path otherwise"), - Parameter ([str], "Options"), + Parameter(str, "Action mode, expected value depends of the type of node"), + Parameter(str, "Empty string for verbatim result, resulting file full path otherwise"), + Parameter([str], "Options"), ] returns = Parameter(str, "Node boot medium, either inlined, or filename, depending on the filename parameter") @@ -150,6 +154,7 @@ class GetBootMedium(Method): BOOTCDBUILD = "/usr/share/bootcd-@NODEFAMILY@/build.sh" GENERICDIR = "/var/www/html/download-@NODEFAMILY@/" WORKDIR = "/var/tmp/bootmedium" + LOGDIR = "/var/tmp/bootmedium/logs/" DEBUG = False # uncomment this to preserve temporary area and bootcustom logs #DEBUG = True @@ -157,11 +162,11 @@ class GetBootMedium(Method): ### returns (host, domain) : # 'host' : host part of the hostname # 'domain' : domain part of the hostname - def split_hostname (self, node): + def split_hostname(self, node): # Split hostname into host and domain parts parts = node['hostname'].split(".", 1) if len(parts) < 2: - raise PLCInvalidArgument, "Node hostname %s is invalid"%node['hostname'] + raise PLCInvalidArgument("Node hostname {} is invalid".format(node['hostname'])) return parts # Generate the node (plnode.txt) configuration content. @@ -170,17 +175,19 @@ class GetBootMedium(Method): # composed by: # - a common part, regardless of the 'node_type' tag # - XXX a special part, depending on the 'node_type' tag value. - def floppy_contents (self, node, renew_key): + def floppy_contents(self, node, renew_key): # Do basic checks if node['peer_id'] is not None: - raise PLCInvalidArgument, "Not a local node" + raise PLCInvalidArgument("Not a local node {}".format(node['hostname'])) # If we are not an admin, make sure that the caller is a # member of the site at which the node is located. if 'admin' not in self.caller['roles']: if node['site_id'] not in self.caller['site_ids']: - raise PLCPermissionDenied, "Not allowed to generate a configuration file for %s"%node['hostname'] + raise PLCPermissionDenied( + "Not allowed to generate a configuration file for {}"\ + .format(node['hostname'])) # Get interface for this node primary = None @@ -190,9 +197,10 @@ class GetBootMedium(Method): primary = interface break if primary is None: - raise PLCInvalidArgument, "No primary network configured on %s"%node['hostname'] + raise PLCInvalidArgument( + "No primary network configured on {}".format(node['hostname'])) - ( host, domain ) = self.split_hostname (node) + host, domain = self.split_hostname(node) # renew the key and save it on the database if renew_key: @@ -204,30 +212,31 @@ class GetBootMedium(Method): file = "" if renew_key: - file += 'NODE_ID="%d"\n' % node['node_id'] - file += 'NODE_KEY="%s"\n' % node['key'] + file += 'NODE_ID="{}"\n'.format(node['node_id']) + file += 'NODE_KEY="{}"\n'.format(node['key']) # not used anywhere, just a note for operations people - file += 'KEY_RENEWAL_DATE="%s"\n' % time.strftime('%Y/%m/%d at %H:%M +0000',time.gmtime()) + file += 'KEY_RENEWAL_DATE="{}"\n'\ + .format(time.strftime('%Y/%m/%d at %H:%M +0000',time.gmtime())) if primary['mac']: - file += 'NET_DEVICE="%s"\n' % primary['mac'].lower() + file += 'NET_DEVICE="{}"\n'.format(primary['mac'].lower()) - file += 'IP_METHOD="%s"\n' % primary['method'] + file += 'IP_METHOD="{}"\n'.format(primary['method']) if primary['method'] == 'static': - file += 'IP_ADDRESS="%s"\n' % primary['ip'] - file += 'IP_GATEWAY="%s"\n' % primary['gateway'] - file += 'IP_NETMASK="%s"\n' % primary['netmask'] - file += 'IP_NETADDR="%s"\n' % primary['network'] - file += 'IP_BROADCASTADDR="%s"\n' % primary['broadcast'] - file += 'IP_DNS1="%s"\n' % primary['dns1'] - file += 'IP_DNS2="%s"\n' % (primary['dns2'] or "") + file += 'IP_ADDRESS="{}"\n'.format(primary['ip']) + file += 'IP_GATEWAY="{}"\n'.format(primary['gateway']) + file += 'IP_NETMASK="{}"\n'.format(primary['netmask']) + file += 'IP_NETADDR="{}"\n'.format(primary['network']) + file += 'IP_BROADCASTADDR="{}"\n'.format(primary['broadcast']) + file += 'IP_DNS1="{}"\n'.format(primary['dns1']) + file += 'IP_DNS2="{}"\n'.format(primary['dns2'] or "") - file += 'HOST_NAME="%s"\n' % host - file += 'DOMAIN_NAME="%s"\n' % domain + file += 'HOST_NAME="{}"\n'.format(host) + file += 'DOMAIN_NAME="{}"\n'.format(domain) # define various interface settings attached to the primary interface - settings = InterfaceTags (self.api, {'interface_id':interface['interface_id']}) + settings = InterfaceTags(self.api, {'interface_id':interface['interface_id']}) categories = set() for setting in settings: @@ -235,56 +244,60 @@ class GetBootMedium(Method): categories.add(setting['category']) for category in categories: - category_settings = InterfaceTags(self.api,{'interface_id':interface['interface_id'], - 'category':category}) + category_settings = InterfaceTags(self.api,{'interface_id' : interface['interface_id'], + 'category' : category}) if category_settings: - file += '### Category : %s\n'%category + file += '### Category : {}\n'.format(category) for setting in category_settings: - file += '%s_%s="%s"\n'%(category.upper(),setting['tagname'].upper(),setting['value']) + file += '{}_{}="{}"\n'\ + .format(category.upper(), setting['tagname'].upper(), setting['value']) for interface in interfaces: if interface['method'] == 'ipmi': - file += 'IPMI_ADDRESS="%s"\n' % interface['ip'] + file += 'IPMI_ADDRESS="{}"\n'.format(interface['ip']) if interface['mac']: - file += 'IPMI_MAC="%s"\n' % interface['mac'].lower() + file += 'IPMI_MAC="{}"\n'.format(interface['mac'].lower()) break return file # see also GetNodeFlavour that does similar things - def get_nodefamily (self, node, auth): + def get_nodefamily(self, node, auth): pldistro = self.api.config.PLC_FLAVOUR_NODE_PLDISTRO fcdistro = self.api.config.PLC_FLAVOUR_NODE_FCDISTRO arch = self.api.config.PLC_FLAVOUR_NODE_ARCH if not node: - return (pldistro,fcdistro,arch) + return pldistro, fcdistro, arch - node_id=node['node_id'] + node_id = node['node_id'] # no support for deployment-based BootCD's, use kvariants instead - node_pldistro = GetNodePldistro (self.api,self.caller).call(auth, node_id) - if node_pldistro: pldistro = node_pldistro + node_pldistro = GetNodePldistro(self.api,self.caller).call(auth, node_id) + if node_pldistro: + pldistro = node_pldistro - node_fcdistro = GetNodeFcdistro (self.api,self.caller).call(auth, node_id) - if node_fcdistro: fcdistro = node_fcdistro + node_fcdistro = GetNodeFcdistro(self.api,self.caller).call(auth, node_id) + if node_fcdistro: + fcdistro = node_fcdistro - node_arch = GetNodeArch (self.api,self.caller).call(auth,node_id) - if node_arch: arch = node_arch + node_arch = GetNodeArch(self.api,self.caller).call(auth,node_id) + if node_arch: + arch = node_arch - return (pldistro,fcdistro,arch) + return pldistro, fcdistro, arch - # xxx Thierry : 5.2.1 build/version.txt for some reason is empty, that's why - # the weird name with downloaded image filenames - def bootcd_version (self): + def bootcd_version(self): try: - return file(self.BOOTCDDIR + "/build/version.txt").readline().strip() + with open(self.BOOTCDDIR + "/build/version.txt") as feed: + return feed.readline().strip() except: - raise Exception,"Unknown boot cd version - probably wrong bootcd dir : %s"%self.BOOTCDDIR + raise Exception("Unknown boot cd version - probably wrong bootcd dir : {}"\ + .format(self.BOOTCDDIR)) - def cleantrash (self): + def cleantrash(self): for file in self.trash: if self.DEBUG: - print 'DEBUG -- preserving',file + logger.debug('DEBUG -- preserving trash file {}'.format(file)) else: os.unlink(file) @@ -292,161 +305,191 @@ class GetBootMedium(Method): # build the filename string # check for permissions and concurrency # returns the filename - def handle_filename (self, filename, nodename, suffix, arch): + def handle_filename(self, filename, nodename, suffix, arch): # allow to set filename to None or any other empty value if not filename: filename='' - filename = filename.replace ("%d",self.WORKDIR) - filename = filename.replace ("%n",nodename) - filename = filename.replace ("%s",suffix) - filename = filename.replace ("%p",self.api.config.PLC_NAME) + filename = filename.replace("%d", self.WORKDIR) + filename = filename.replace("%n", nodename) + filename = filename.replace("%s", suffix) + filename = filename.replace("%p", self.api.config.PLC_NAME) # let's be cautious - try: filename = filename.replace ("%f", self.nodefamily) + try: filename = filename.replace("%f", self.nodefamily) except: pass - try: filename = filename.replace ("%a", arch) + try: filename = filename.replace("%a", arch) except: pass - try: filename = filename.replace ("%v",self.bootcd_version()) + try: filename = filename.replace("%v", self.bootcd_version()) except: pass ### Check filename location if filename != '': if 'admin' not in self.caller['roles']: - if ( filename.index(self.WORKDIR) != 0): - raise PLCInvalidArgument, "File %s not under %s"%(filename,self.WORKDIR) + if filename.index(self.WORKDIR) != 0: + raise PLCInvalidArgument("File {} not under {}".format(filename, self.WORKDIR)) ### output should not exist (concurrent runs ..) # numerous reports of issues with this policy # looks like people sometime suspend/cancel their download # and this leads to the old file sitting in there forever # so, if the file is older than 5 minutes, we just trash - grace=5 + grace = 5 if os.path.exists(filename) and (time.time()-os.path.getmtime(filename)) >= (grace*60): os.unlink(filename) if os.path.exists(filename): - raise PLCInvalidArgument, "Resulting file %s already exists - please try again in %d minutes"%\ - (filename,grace) + raise PLCInvalidArgument( + "Resulting file {} already exists - please try again in {} minutes"\ + .format(filename, grace)) ### we can now safely create the file, ### either we are admin or under a controlled location - filedir=os.path.dirname(filename) + filedir = os.path.dirname(filename) # dirname does not return "." for a local filename like its shell counterpart if filedir: if not os.path.exists(filedir): try: - os.makedirs (filedir,0777) + os.makedirs(filedir, 0o777) except: - raise PLCPermissionDenied, "Could not create dir %s"%filedir + raise PLCPermissionDenied("Could not create dir {}".format(filedir)) return filename - # Build the command line to be executed - # according the node type - def build_command(self, node_type, build_sh_spec, node_image, type, floppy_file, log_file): + def build_command(self, nodename, node_type, build_sh_spec, node_image, type, floppy_file): + """ + returns a tuple + (*) build command to be run + (*) location of the log_file + """ command = "" # regular node, make build's arguments # and build the full command line to be called - if node_type in [ 'regular', 'reservable' ]: + if node_type not in [ 'regular', 'reservable' ]: + logger.error("GetBootMedium.build_command: unexpected node_type {}".format(node_type)) + return command, None - build_sh_options="" - if "cramfs" in build_sh_spec: - type += "_cramfs" - if "serial" in build_sh_spec: - build_sh_options += " -s %s"%build_sh_spec['serial'] - if "variant" in build_sh_spec: - build_sh_options += " -V %s"%build_sh_spec['variant'] + build_sh_options = "" + if "cramfs" in build_sh_spec: + type += "_cramfs" + if "serial" in build_sh_spec: + build_sh_options += " -s {}".format(build_sh_spec['serial']) + if "variant" in build_sh_spec: + build_sh_options += " -V {}".format(build_sh_spec['variant']) - for karg in build_sh_spec['kargs']: - build_sh_options += ' -k "%s"'%karg + for karg in build_sh_spec['kargs']: + build_sh_options += ' -k "{}"'.format(karg) - log_file="%s.log"%node_image + import time + date = time.strftime('%Y-%m-%d-%H-%M', time.gmtime()) + if not os.path.isdir(self.LOGDIR): + os.makedirs(self.LOGDIR) + log_file = "{}/{}-{}.log".format(self.LOGDIR, date, nodename) - command = '%s -f "%s" -o "%s" -t "%s" %s &> %s' % (self.BOOTCDBUILD, - floppy_file, - node_image, - type, - build_sh_options, - log_file) + command = '{} -f "{}" -o "{}" -t "{}" {} > {} 2>&1'\ + .format(self.BOOTCDBUILD, + floppy_file, + node_image, + type, + build_sh_options, + log_file) - if self.DEBUG: - print "The build command line is %s" % command + logger.info("The build command line is {}".format(command)) - return command + return command, log_file - def call(self, auth, node_id_or_hostname, action, filename, options = []): + def call(self, auth, node_id_or_hostname, action, filename, options=None): - self.trash=[] + if options is None: + options = [] + + self.trash = [] ### compute file suffix and type if action.find("-iso") >= 0 : - suffix=".iso" - type = "iso" + suffix = ".iso" + type = "iso" elif action.find("-usb") >= 0: - suffix=".usb" - type = "usb" + suffix = ".usb" + type = "usb" else: - suffix=".txt" - type = "txt" + suffix = ".txt" + type = "txt" # check for node existence and get node_type nodes = Nodes(self.api, [node_id_or_hostname]) if not nodes: - raise PLCInvalidArgument, "No such node %r"%node_id_or_hostname + raise PLCInvalidArgument("No such node {}".format(node_id_or_hostname)) node = nodes[0] - if self.DEBUG: print "%s required on node %s. Node type is: %s" \ - % (action, node['node_id'], node['node_type']) + logger.info("GetBootMedium: {} requested on node {}. Node type is: {}" + .format(action, node['node_id'], node['node_type'])) # check the required action against the node type node_type = node['node_type'] if action not in allowed_actions[node_type]: - raise PLCInvalidArgument, "Action %s not valid for %s nodes, valid actions are %s" \ - % (action, node_type, "|".join(allowed_actions[node_type])) + raise PLCInvalidArgument( + "Action {} not valid for {} nodes, valid actions are {}" + .format(action, node_type, "|".join(allowed_actions[node_type]))) # handle / canonicalize options if type == "txt": if options: - raise PLCInvalidArgument, "Options are not supported for node configs" + raise PLCInvalidArgument("Options are not supported for node configs") else: # create a dict for build.sh - build_sh_spec={'kargs':[]} + build_sh_spec = {'kargs':[]} # use node tags as defaults # check for node tag equivalents tags = NodeTags(self.api, {'node_id': node['node_id'], - 'tagname': ['serial', 'cramfs', 'kvariant', 'kargs', 'no-hangcheck']}, + 'tagname': ['serial', 'cramfs', 'kvariant', 'kargs', + 'no-hangcheck', 'systemd-debug']}, ['tagname', 'value']) if tags: for tag in tags: if tag['tagname'] == 'serial': build_sh_spec['serial'] = tag['value'] - if tag['tagname'] == 'cramfs': + elif tag['tagname'] == 'cramfs': build_sh_spec['cramfs'] = True - if tag['tagname'] == 'kvariant': + elif tag['tagname'] == 'kvariant': build_sh_spec['variant'] = tag['value'] - if tag['tagname'] == 'kargs': + elif tag['tagname'] == 'kargs': build_sh_spec['kargs'] += tag['value'].split() - if tag['tagname'] == 'no-hangcheck': + elif tag['tagname'] == 'no-hangcheck': build_sh_spec['kargs'].append('hcheck_reboot0') + elif tag['tagname'] == 'systemd-debug': + # + build_sh_spec['kargs'].append('systemd.log_level=debug') + build_sh_spec['kargs'].append('systemd.log_target=console') + build_sh_spec['kargs'].append( + 'systemd.default_standard_output=journal+console') + build_sh_spec['kargs'].append( + 'systemd.default_standard_error=journal+console') # then options can override tags for option in options: if option == "cramfs": - build_sh_spec['cramfs']=True + build_sh_spec['cramfs'] = True elif option == 'partition': if type != "usb": - raise PLCInvalidArgument, "option 'partition' is for USB images only" + raise PLCInvalidArgument("option 'partition' is for USB images only") else: - type="usb_partition" + type = "usb_partition" elif option == "serial": - build_sh_spec['serial']='default' + build_sh_spec['serial'] = 'default' elif option.find("serial:") == 0: - build_sh_spec['serial']=option.replace("serial:","") + build_sh_spec['serial'] = option.replace("serial:", "") elif option.find("variant:") == 0: - build_sh_spec['variant']=option.replace("variant:","") + build_sh_spec['variant'] = option.replace("variant:", "") elif option == "no-hangcheck": build_sh_spec['kargs'].append('hcheck_reboot0') + elif option == "systemd-debug": + build_sh_spec['kargs'].append('systemd.log_level=debug') + build_sh_spec['kargs'].append('systemd.log_target=console') + build_sh_spec['kargs'].append( + 'systemd.default_standard_output=journal+console') + build_sh_spec['kargs'].append( + 'systemd.default_standard_error=journal+console') else: - raise PLCInvalidArgument, "unknown option %s"%option + raise PLCInvalidArgument("unknown option {}".format(option)) # compute nodename according the action if action.find("node-") == 0: @@ -454,57 +497,60 @@ class GetBootMedium(Method): else: node = None # compute a 8 bytes random number - tempbytes = random.sample (xrange(0,256), 8); - def hexa2 (c): return chr((c>>4)+65) + chr ((c&16)+65) - nodename = "".join(map(hexa2,tempbytes)) + tempbytes = random.sample(range(0, 256), 8); + def hexa2(c): + return chr((c>>4)+65) + chr((c&16)+65) + nodename = "".join(map(hexa2, tempbytes)) # get nodefamily - (pldistro,fcdistro,arch) = self.get_nodefamily(node,auth) - self.nodefamily="%s-%s-%s"%(pldistro,fcdistro,arch) + pldistro, fcdistro, arch = self.get_nodefamily(node, auth) + self.nodefamily = "{}-{}-{}".format(pldistro, fcdistro, arch) # apply on globals - for attr in [ "BOOTCDDIR", "BOOTCDBUILD", "GENERICDIR" ]: - setattr(self,attr,getattr(self,attr).replace("@NODEFAMILY@",self.nodefamily)) + for attr in ["BOOTCDDIR", "BOOTCDBUILD", "GENERICDIR"]: + setattr(self, attr, + getattr(self, attr).replace("@NODEFAMILY@", self.nodefamily)) filename = self.handle_filename(filename, nodename, suffix, arch) # log call if node: - self.message='GetBootMedium on node %s - action=%s'%(nodename,action) - self.event_objects={'Node': [ node ['node_id'] ]} + self.message = 'GetBootMedium on node {} - action={}'.format(nodename, action) + self.event_objects = {'Node': [node ['node_id']]} else: - self.message='GetBootMedium - generic - action=%s'%action + self.message = 'GetBootMedium - generic - action={}'.format(action) ### generic media - if action == 'generic-iso' or action == 'generic-usb': + if action in ('generic-iso', 'generic-usb'): if options: - raise PLCInvalidArgument, "Options are not supported for generic images" + raise PLCInvalidArgument("Options are not supported for generic images") # this raises an exception if bootcd is missing version = self.bootcd_version() - generic_name = "%s-BootCD-%s%s"%(self.api.config.PLC_NAME, - version, - suffix) - generic_path = "%s/%s" % (self.GENERICDIR,generic_name) + generic_name = "{}-BootCD-{}{}".format(self.api.config.PLC_NAME, version, suffix) + generic_path = "{}/{}".format(self.GENERICDIR, generic_name) if filename: - ret=os.system ('cp "%s" "%s"'%(generic_path,filename)) - if ret==0: + ret = os.system('cp "{}" "{}"'.format(generic_path, filename)) + if ret == 0: return filename else: - raise PLCPermissionDenied, "Could not copy %s into %s"%(generic_path,filename) + raise PLCPermissionDenied("Could not copy {} into {}"\ + .format(generic_path, filename)) else: ### return the generic medium content as-is, just base64 encoded - return base64.b64encode(file(generic_path).read()) + with open(generic_path) as feed: + return base64.b64encode(feed.read()) ### config file preview or regenerated if action == 'node-preview' or action == 'node-floppy': renew_key = (action == 'node-floppy') - floppy = self.floppy_contents (node,renew_key) + floppy = self.floppy_contents(node, renew_key) if filename: try: - file(filename,'w').write(floppy) + with open(filename, 'w') as writer: + writer.write(floppy) except: - raise PLCPermissionDenied, "Could not write into %s"%filename + raise PLCPermissionDenied("Could not write into {}".format(filename)) return filename else: return floppy @@ -516,69 +562,80 @@ class GetBootMedium(Method): # - build and invoke the build command # - delivery the resulting image file - if action == 'node-iso' or action == 'node-usb': + if action in ('node-iso', 'node-usb'): ### check we've got required material version = self.bootcd_version() if not os.path.isfile(self.BOOTCDBUILD): - raise PLCAPIError, "Cannot locate bootcd/build.sh script %s"%self.BOOTCDBUILD + raise PLCAPIError("Cannot locate bootcd/build.sh script {}" + .format(self.BOOTCDBUILD)) # create the workdir if needed if not os.path.isdir(self.WORKDIR): try: - os.makedirs(self.WORKDIR,0777) - os.chmod(self.WORKDIR,0777) + os.makedirs(self.WORKDIR, 0o777) + os.chmod(self.WORKDIR, 0o777) except: - raise PLCPermissionDenied, "Could not create dir %s"%self.WORKDIR + raise PLCPermissionDenied("Could not create dir {}".format(self.WORKDIR)) try: # generate floppy config - floppy_text = self.floppy_contents(node,True) + floppy_text = self.floppy_contents(node, True) # store it - floppy_file = "%s/%s.txt"%(self.WORKDIR,nodename) + floppy_file = "{}/{}.txt".format(self.WORKDIR, nodename) try: - file(floppy_file,"w").write(floppy_text) + with open(floppy_file, "w") as writer: + writer.write(floppy_text) except: - raise PLCPermissionDenied, "Could not write into %s"%floppy_file + raise PLCPermissionDenied("Could not write into {}".format(floppy_file)) self.trash.append(floppy_file) - node_image = "%s/%s%s"%(self.WORKDIR,nodename,suffix) - log_file="%s.log"%node_image + node_image = "{}/{}{}".format(self.WORKDIR, nodename, suffix) - command = self.build_command(node_type, build_sh_spec, node_image, type, floppy_file, log_file) + command, log_file = self.build_command(nodename, node_type, build_sh_spec, + node_image, type, floppy_file) # invoke the image build script if command != "": - ret=os.system(command) + ret = os.system(command) if ret != 0: - raise PLCAPIError, "%s failed Command line was: %s Error logs: %s" % \ - (self.BOOTCDBUILD, command, file(log_file).read()) - - self.trash.append(log_file) + raise PLCAPIError("{} failed Command line was: {} See logs in {}"\ + .format(self.BOOTCDBUILD, command, log_file)) - if not os.path.isfile (node_image): - raise PLCAPIError,"Unexpected location of build.sh output - %s"%node_image + if not os.path.isfile(node_image): + raise PLCAPIError("Unexpected location of build.sh output - {}" + .format(node_image)) # handle result if filename: - ret=os.system('mv "%s" "%s"'%(node_image,filename)) + ret = os.system('mv "{}" "{}"'.format(node_image, filename)) if ret != 0: self.trash.append(node_image) self.cleantrash() - raise PLCAPIError, "Could not move node image %s into %s"%(node_image,filename) + raise PLCAPIError("Could not move node image {} into {}"\ + .format(node_image, filename)) self.cleantrash() return filename else: - result = file(node_image).read() + with open(node_image, "rb") as feed: + result = feed.read() self.trash.append(node_image) self.cleantrash() - return base64.b64encode(result) + logger.info("GetBootMedium - done with build.sh") + encoded_result = base64.b64encode(result) + # stupidly enough, we need to decode this as str now + # so that we remain compatible with former python2 PLCAPI + encoded_result = encoded_result.decode() + logger.info("GetBootMedium - done with base64 encoding -" + " lengths: raw={} - b64={}" + .format(len(result), len(encoded_result))) + return encoded_result except: self.cleantrash() raise # we're done here, or we missed something - raise PLCAPIError,'Unhandled action %s'%action + raise PLCAPIError('Unhandled action {}'.format(action))