-#!/usr/bin/python2
-
+#!/usr/bin/python
+# $Id$
+#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# expected /proc/partitions format
import os, string
+import traceback
-from Exceptions import *
import utils
-import BootServerRequest
-import ModelOptions
import urlparse
import httplib
+
+from Exceptions import *
+import BootServerRequest
+import ModelOptions
import BootAPI
def Run( vars, log ):
"""
Write out the network configuration for this machine:
/etc/hosts
- /etc/sysconfig/network-scripts/ifcfg-eth0
+ /etc/sysconfig/network-scripts/ifcfg-<ifname>
/etc/resolv.conf (if applicable)
/etc/sysconfig/network
The values to be used for the network settings are to be set in vars
- in the variable 'NETWORK_SETTINGS', which is a dictionary
+ in the variable 'INTERFACE_SETTINGS', which is a dictionary
with keys:
Key Used by this function
Expect the following variables from the store:
SYSIMG_PATH the path where the system image will be mounted
- (always starts with TEMP_PATH)
- NETWORK_SETTINGS A dictionary of the values from the network
- configuration file
- NODE_NETWORKS All the network associated with this node
+ (always starts with TEMP_PATH)
+ INTERFACES All the interfaces associated with this node
+ INTERFACE_SETTINGS dictionary
Sets the following variables:
None
"""
try:
- network_settings= vars['NETWORK_SETTINGS']
- except KeyError, e:
- raise BootManagerException, "No network settings found in vars."
-
- try:
- hostname= network_settings['hostname']
- domainname= network_settings['domainname']
- method= network_settings['method']
- ip= network_settings['ip']
- gateway= network_settings['gateway']
- network= network_settings['network']
- netmask= network_settings['netmask']
- dns1= network_settings['dns1']
- mac= network_settings['mac']
+ INTERFACE_SETTINGS= vars['INTERFACE_SETTINGS']
except KeyError, e:
- raise BootManagerException, "Missing value %s in network settings." % str(e)
+ raise BootManagerException, "No interface settings found in vars."
try:
- dns2= ''
- dns2= network_settings['dns2']
+ 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:
- pass
+ raise BootManagerException, "Missing value %s in interface settings." % str(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")
else:
port = '80'
try:
- log.write("getting via https://%s/PlanetLabConf/get_plc_config.php" % host)
- bootserver = httplib.HTTPSConnection(host, port)
+ 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()
- except:
- log.write("Failed. Using old method.")
+ 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]
network_file= None
interfaces = {}
- interface = 1
- for network in vars['NODE_NETWORKS']:
+ interface_count = 1
+ for interface in vars['INTERFACES']:
if method == "static" or method == "dhcp":
- if network['is_primary'] == 1:
+ if interface['is_primary'] == 1:
ifnum = 0
else:
- ifnum = interface
- interface += 1
-
- int = {}
- if network['mac']:
- int['HWADDR'] = network['mac']
-
- if network['method'] == "static":
- int['BOOTPROTO'] = "static"
- int['IPADDR'] = network['ip']
- int['NETMASK'] = network['netmask']
-
- elif network['method'] == "dhcp":
- int['BOOTPROTO'] = "dhcp"
- if network['hostname']:
- int['DHCP_HOSTNAME'] = network['hostname']
+ ifnum = interface_count
+ interface_count += 1
+
+ inter = {}
+ if interface['mac']:
+ inter['HWADDR'] = interface['mac']
+
+ if interface['method'] == "static":
+ inter['BOOTPROTO'] = "static"
+ inter['IPADDR'] = interface['ip']
+ inter['NETMASK'] = interface['netmask']
+
+ elif interface['method'] == "dhcp":
+ inter['BOOTPROTO'] = "dhcp"
+ if interface['hostname']:
+ inter['DHCP_HOSTNAME'] = interface['hostname']
else:
- int['DHCP_HOSTNAME'] = hostname
- if not network['is_primary']:
- int['DHCLIENTARGS'] = "-R subnet-mask"
+ inter['DHCP_HOSTNAME'] = hostname
+ if not interface['is_primary']:
+ inter['DHCLIENTARGS'] = "-R subnet-mask"
alias = ""
ifname=None
- if len(network['interface_setting_ids']) > 0:
- settings = BootAPI.call_api_function(vars, "GetInterfaceSettings",
- ({'interface_setting_id': network['interface_setting_ids']},))
- for setting in settings:
+ if len(interface['interface_tag_ids']) > 0:
+ tags = BootAPI.call_api_function(vars, "GetInterfaceTags",
+ ({'interface_tag_id': interface['interface_tag_ids']},))
+ for tag in tags:
# to explicitly set interface name
- if setting['name'].upper() == "IFNAME":
- ifname=setting['value']
- elif setting['name'].upper() == "DRIVER":
+ if tag['tagname'].upper() == "IFNAME":
+ ifname=tag['value']
+ elif tag['tagname'].upper() == "DRIVER":
# xxx not sure how to do that yet - probably add a line in modprobe.conf
pass
- elif setting['name'].upper() == "ALIAS":
- alias = ":" + setting['value']
+ elif tag['tagname'].upper() == "ALIAS":
+ alias = ":" + tag['value']
# a hack for testing before a new setting is hardcoded here
- # use the backdoor setting and put as a value 'var=value'
- elif setting['name'].upper() == "BACKDOOR":
- [var,value]=setting['value'].split('=',1)
- int[var]=value
+ # use the backdoor tag and put as a value 'var=value'
+ elif tag['tagname'].upper() == "BACKDOOR":
+ [var,value]=tag['value'].split('=',1)
+ inter[var]=value
- elif setting['name'].lower() in \
+ elif tag['tagname'].lower() in \
[ "mode", "essid", "nw", "freq", "channel", "sens", "rate",
"key", "key1", "key2", "key3", "key4", "securitymode",
"iwconfig", "iwpriv" ] :
- int [setting['name'].upper()] = setting['value']
- int ['TYPE']='Wireless'
+ inter [tag['tagname'].upper()] = tag['value']
+ inter ['TYPE']='Wireless'
else:
- log.write("Warning - ignored setting named %s\n"%setting['name'])
+ log.write("Warning - ignored tag named %s\n"%tag['tagname'])
- if alias and 'HWADDR' in int:
+ if alias and 'HWADDR' in inter:
for (dev, i) in interfaces.iteritems():
- if i['HWADDR'] == int['HWADDR']:
+ if i['HWADDR'] == inter['HWADDR']:
break
- del int['HWADDR']
- interfaces[dev + alias] = int
- interface -= 1
+ del inter['HWADDR']
+ interfaces[dev + alias] =inter
+ interface_count -= 1
else:
if not ifname:
ifname="eth%d" % ifnum
else:
- interface -= 1
- interfaces[ifname] = int
+ interface_count -= 1
+ interfaces[ifname] =inter
- for (dev, int) in interfaces.iteritems():
+ for (dev, inter) in interfaces.iteritems():
path = "%s/etc/sysconfig/network-scripts/ifcfg-%s" % (
SYSIMG_PATH, dev)
f = file(path, "w")
f.write("DEVICE=%s\n" % dev)
f.write("ONBOOT=yes\n")
f.write("USERCTL=no\n")
- for (key, val) in int.iteritems():
+ for (key, val) in inter.iteritems():
f.write('%s="%s"\n' % (key, val))
f.close()