X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FWriteNetworkConfig.py;h=ac4431c6c2d18e2ca28a39ff008ff97f85e11509;hb=4de28ef9f2e41cee5b41c3b652aaef63abb0ed4c;hp=7f89f81aae7c1d005a2133a4f431377ebfaa8089;hpb=f901241a99a01377b7371a645f483c68900cb7b6;p=bootmanager.git diff --git a/source/steps/WriteNetworkConfig.py b/source/steps/WriteNetworkConfig.py index 7f89f81..ac4431c 100644 --- a/source/steps/WriteNetworkConfig.py +++ b/source/steps/WriteNetworkConfig.py @@ -1,5 +1,4 @@ #!/usr/bin/python -# $Id$ # # Copyright (c) 2003 Intel Corporation # All rights reserved. @@ -25,7 +24,7 @@ class BootAPIWrap: def __init__(self, vars): self.vars = vars def call(self, func, *args): - BootAPI.call_api_function(self.vars, func, args) + return BootAPI.call_api_function(self.vars, func, args) def __getattr__(self, func): return lambda *args: self.call(func, *args) @@ -37,7 +36,7 @@ class logger: def verbose(self, msg): self.log(msg, 0) -def Run( vars, log ): +def Run(vars, log): """ Write out the network configuration for this machine: /etc/hosts @@ -69,89 +68,85 @@ def Run( vars, log ): SYSIMG_PATH the path where the system image will be mounted (always starts with TEMP_PATH) INTERFACES All the interfaces associated with this node - INTERFACE_SETTINGS dictionary + INTERFACE_SETTINGS dictionary Sets the following variables: None """ - log.write( "\n\nStep: Install: Writing Network Configuration files.\n" ) + log.write("\n\nStep: Install: Writing Network Configuration files.\n") try: - SYSIMG_PATH= vars["SYSIMG_PATH"] + SYSIMG_PATH = vars["SYSIMG_PATH"] if SYSIMG_PATH == "": - raise ValueError, "SYSIMG_PATH" + raise ValueError("SYSIMG_PATH") - except KeyError, var: - raise BootManagerException, "Missing variable in vars: %s\n" % var - except ValueError, var: - raise BootManagerException, "Variable in vars, shouldn't be: %s\n" % var + except KeyError as var: + raise BootManagerException("Missing variable in vars: {}\n".format(var)) + except ValueError as var: + raise BootManagerException("Variable in vars, shouldn't be: {}\n".format(var)) try: - INTERFACE_SETTINGS= vars['INTERFACE_SETTINGS'] - except KeyError, e: - raise BootManagerException, "No interface settings found in vars." + INTERFACE_SETTINGS = vars['INTERFACE_SETTINGS'] + except KeyError as e: + raise BootManagerException("No interface settings found in vars.") try: - hostname= INTERFACE_SETTINGS['hostname'] - domainname= INTERFACE_SETTINGS['domainname'] - method= INTERFACE_SETTINGS['method'] - ip= INTERFACE_SETTINGS['ip'] - gateway= INTERFACE_SETTINGS['gateway'] - network= INTERFACE_SETTINGS['network'] - netmask= INTERFACE_SETTINGS['netmask'] - dns1= INTERFACE_SETTINGS['dns1'] - mac= INTERFACE_SETTINGS['mac'] - except KeyError, e: - raise BootManagerException, "Missing value %s in interface settings." % str(e) + hostname = INTERFACE_SETTINGS['hostname'] + domainname = INTERFACE_SETTINGS['domainname'] + method = INTERFACE_SETTINGS['method'] + ip = INTERFACE_SETTINGS['ip'] + gateway = INTERFACE_SETTINGS['gateway'] + network = INTERFACE_SETTINGS['network'] + netmask = INTERFACE_SETTINGS['netmask'] + dns1 = INTERFACE_SETTINGS['dns1'] + mac = INTERFACE_SETTINGS['mac'] + except KeyError as e: + raise BootManagerException("Missing value {} in interface settings.".format(e)) # dns2 is not required to be set dns2 = INTERFACE_SETTINGS.get('dns2','') # Node Manager needs at least PLC_API_HOST and PLC_BOOT_HOST log.write("Writing /etc/planetlab/plc_config\n") - utils.makedirs("%s/etc/planetlab" % SYSIMG_PATH) - plc_config = file("%s/etc/planetlab/plc_config" % SYSIMG_PATH, "w") - - api_url = vars['BOOT_API_SERVER'] - (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(api_url) - parts = netloc.split(':') - host = parts[0] - if len(parts) > 1: - port = parts[1] - else: - port = '80' - try: - log.write("getting via https://%s/PlanetLabConf/get_plc_config.php " % host) - bootserver = httplib.HTTPSConnection(host, int(port)) - bootserver.connect() - bootserver.request("GET","https://%s/PlanetLabConf/get_plc_config.php" % host) - plc_config.write("%s" % bootserver.getresponse().read()) - bootserver.close() - log.write("Done\n") - except : - log.write(" .. Failed. Using old method. -- stack trace follows\n") - traceback.print_exc(file=log.OutputFile) - bs= BootServerRequest.BootServerRequest() - if bs.BOOTSERVER_CERTS: - print >> plc_config, "PLC_BOOT_HOST='%s'" % bs.BOOTSERVER_CERTS.keys()[0] - print >> plc_config, "PLC_API_HOST='%s'" % host - print >> plc_config, "PLC_API_PORT='%s'" % port - print >> plc_config, "PLC_API_PATH='%s'" % path - - plc_config.close() - - - log.write( "Writing /etc/hosts\n" ) - hosts_file= file("%s/etc/hosts" % SYSIMG_PATH, "w" ) - hosts_file.write( "127.0.0.1 localhost\n" ) - if method == "static": - hosts_file.write( "%s %s.%s\n" % (ip, hostname, domainname) ) - hosts_file.close() - hosts_file= None - - data = {'hostname': '%s.%s' % (hostname, domainname), - 'networks': vars['INTERFACES']} - plnet.InitInterfaces(logger(log), BootAPIWrap(vars), data, SYSIMG_PATH, - True, "BootManager") - + utils.makedirs("{}/etc/planetlab".format(SYSIMG_PATH)) + with open("{}/etc/planetlab/plc_config".format(SYSIMG_PATH), "w") as plc_config: + + api_url = vars['BOOT_API_SERVER'] + (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(api_url) + parts = netloc.split(':') + host = parts[0] + if len(parts) > 1: + port = parts[1] + else: + port = '80' + try: + log.write("getting via https://{}/PlanetLabConf/get_plc_config.php ".format(host)) + bootserver = httplib.HTTPSConnection(host, int(port)) + bootserver.connect() + bootserver.request("GET","https://{}/PlanetLabConf/get_plc_config.php".format(host)) + plc_config.write("{}".format(bootserver.getresponse().read())) + bootserver.close() + log.write("Done\n") + except: + log.write(" .. Failed. Using old method. -- stack trace follows\n") + traceback.print_exc(file=log.OutputFile) + bs = BootServerRequest.BootServerRequest(vars) + if bs.BOOTSERVER_CERTS: + plc_config.write("PLC_BOOT_HOST='{}'\n".format(bs.BOOTSERVER_CERTS.keys()[0])) + plc_config.write("PLC_API_HOST='{}'\n".format(host)) + plc_config.write("PLC_API_PORT='{}'\n".format(port)) + plc_config.write("PLC_API_PATH='{}'\n".format(path)) + + log.write("Writing /etc/hosts\n") + with open("{}/etc/hosts".format(SYSIMG_PATH), "w") as hosts_file: + hosts_file.write("127.0.0.1 localhost\n") + if method == "static": + hosts_file.write("{} {}.{}\n".format(ip, hostname, domainname)) + + data = {'hostname': '{}.{}'.format(hostname, domainname), + 'interfaces': vars['INTERFACES']} + plnet.InitInterfaces( + logger(log), BootAPIWrap(vars), + data, SYSIMG_PATH, + files_only=True, program="BootManager")