-#!/usr/bin/python2
+#!/usr/bin/python
# $Id$
#
# Copyright (c) 2003 Intel Corporation
try:
- interface_settings= vars['INTERFACE_SETTINGS']
+ INTERFACE_SETTINGS= vars['INTERFACE_SETTINGS']
except KeyError, 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']
+ 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)
- try:
- dns2= ''
- dns2= interface_settings['dns2']
- except KeyError, e:
- pass
-
+ # 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")
port = '80'
try:
log.write("getting via https://%s/PlanetLabConf/get_plc_config.php " % host)
- bootserver = httplib.HTTPSConnection(host, port)
+ 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())
ifnum = interface_count
interface_count += 1
- int = {}
+ inter = {}
if interface['mac']:
- int['HWADDR'] = interface['mac']
+ inter['HWADDR'] = interface['mac']
if interface['method'] == "static":
- int['BOOTPROTO'] = "static"
- int['IPADDR'] = interface['ip']
- int['NETMASK'] = interface['netmask']
+ inter['BOOTPROTO'] = "static"
+ inter['IPADDR'] = interface['ip']
+ inter['NETMASK'] = interface['netmask']
elif interface['method'] == "dhcp":
- int['BOOTPROTO'] = "dhcp"
+ inter['BOOTPROTO'] = "dhcp"
if interface['hostname']:
- int['DHCP_HOSTNAME'] = interface['hostname']
+ inter['DHCP_HOSTNAME'] = interface['hostname']
else:
- int['DHCP_HOSTNAME'] = hostname
+ inter['DHCP_HOSTNAME'] = hostname
if not interface['is_primary']:
- int['DHCLIENTARGS'] = "-R subnet-mask"
+ inter['DHCLIENTARGS'] = "-R subnet-mask"
alias = ""
ifname=None
- if len(interface['interface_setting_ids']) > 0:
- settings = \
- BootAPI.call_api_function(vars, "GetInterfaceSettings",
- ({'interface_setting_id':
- interface['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
+ del inter['HWADDR']
+ interfaces[dev + alias] =inter
interface_count -= 1
else:
if not ifname:
ifname="eth%d" % ifnum
else:
interface_count -= 1
- interfaces[ifname] = int
+ 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()