Commit 11339 for the trunk.
[bootmanager.git] / source / steps / WriteNetworkConfig.py
index bb91d3d..4f3af8e 100644 (file)
@@ -1,5 +1,6 @@
-#!/usr/bin/python2
-
+#!/usr/bin/python
+# $Id$
+#
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
 #
@@ -18,6 +19,23 @@ from Exceptions import *
 import BootServerRequest
 import ModelOptions
 import BootAPI
+import plnet
+
+class BootAPIWrap:
+    def __init__(self, vars):
+        self.vars = vars
+    def call(self, func, *args):
+        BootAPI.call_api_function(self.vars, func, args)
+    def __getattr__(self, func):
+        return lambda *args: self.call(func, *args)
+
+class logger:
+    def __init__(self, log):
+        self._log = log
+    def log(self, msg, level=3):
+        self._log.write(msg + "\n")
+    def verbose(self, msg):
+        self.log(msg, 0)
 
 def Run( vars, log ):
     """
@@ -70,29 +88,25 @@ def Run( vars, log ):
 
 
     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")
@@ -109,7 +123,7 @@ def Run( vars, log ):
         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())
@@ -136,112 +150,8 @@ def Run( vars, log ):
     hosts_file.close()
     hosts_file= None
     
-
-    if method == "static":
-        log.write( "Writing /etc/resolv.conf\n" )
-        resolv_file= file("%s/etc/resolv.conf" % SYSIMG_PATH, "w" )
-        if dns1 != "":
-            resolv_file.write( "nameserver %s\n" % dns1 )
-        if dns2 != "":
-            resolv_file.write( "nameserver %s\n" % dns2 )
-        resolv_file.write( "search %s\n" % domainname )
-        resolv_file.close()
-        resolv_file= None
-
-    log.write( "Writing /etc/sysconfig/network\n" )
-    network_file= file("%s/etc/sysconfig/network" % SYSIMG_PATH, "w" )
-    network_file.write( "NETWORKING=yes\n" )
-    network_file.write( "HOSTNAME=%s.%s\n" % (hostname, domainname) )
-    if method == "static":
-        network_file.write( "GATEWAY=%s\n" % gateway )
-    network_file.close()
-    network_file= None
-
-    interfaces = {}
-    interface = 1
-    for interface in vars['INTERFACES']:
-        if method == "static" or method == "dhcp":
-            if interface['is_primary'] == 1:
-                ifnum = 0
-            else:
-                ifnum = interface
-                interface += 1
-
-            int = {}
-            if interface['mac']:
-                int['HWADDR'] = interface['mac']
-
-            if interface['method'] == "static":
-                int['BOOTPROTO'] = "static"
-                int['IPADDR'] = interface['ip']
-                int['NETMASK'] = interface['netmask']
-
-            elif interface['method'] == "dhcp":
-                int['BOOTPROTO'] = "dhcp"
-                if interface['hostname']:
-                    int['DHCP_HOSTNAME'] = interface['hostname']
-                else:
-                    int['DHCP_HOSTNAME'] = hostname
-                if not interface['is_primary']:
-                    int['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:
-                    # to explicitly set interface name
-                    if   setting['name'].upper() == "IFNAME":
-                        ifname=setting['value']
-                    elif setting['name'].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']
-
-                    # 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
-
-                    elif setting['name'].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'
-                    else:
-                        log.write("Warning - ignored setting named %s\n"%setting['name'])
-
-            if alias and 'HWADDR' in int:
-                for (dev, i) in interfaces.iteritems():
-                    if i['HWADDR'] == int['HWADDR']:
-                        break
-                del int['HWADDR']
-                interfaces[dev + alias] = int
-                interface -= 1
-            else:
-                if not ifname:
-                    ifname="eth%d" % ifnum
-                else:
-                    interface -= 1
-                interfaces[ifname] = int
-
-    for (dev, int) in interfaces.iteritems():
-        path = "%s/etc/sysconfig/network-scripts/ifcfg-%s" % (
-               SYSIMG_PATH, dev)
-        f = file(path, "w")
-        log.write("Writing %s\n" % path.replace(SYSIMG_PATH, ""))
-
-        f.write("DEVICE=%s\n" % dev)
-        f.write("ONBOOT=yes\n")
-        f.write("USERCTL=no\n")
-        for (key, val) in int.iteritems():
-            f.write('%s="%s"\n' % (key, val))
-
-        f.close()
+    data =  {'hostname': '%s.%s' % (hostname, domainname),
+             'networks': vars['NODE_NETWORKS']}
+    plnet.InitInterfaces(logger(log), BootAPIWrap(vars), data, SYSIMG_PATH,
+                         True, "BootManager")