import sioc
import modprobe
+global version
+version = 4.3
+
def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeManager"):
+ global version
+
sysconfig = "%s/etc/sysconfig/network-scripts" % root
try:
os.makedirs(sysconfig)
inter['BOOTPROTO'] = "static"
inter['IPADDR'] = network['ip']
inter['NETMASK'] = network['netmask']
+ inter['DNS1'] = network['dns1']
+ inter['DNS2'] = network['dns2']
if network['is_primary']:
gateway = network['gateway']
if not network['is_primary']:
inter['DHCLIENTARGS'] = "-R subnet-mask"
- if len(network['interface_tag_ids']) > 0:
+ try:
+ plc.GetInterfaceTags()
+ version = 4.3
+ except AttributeError:
+ version = 4.2
+
+ if version == 4.3:
+ interface_tag_ids = "interface_tag_ids"
+ interface_tag_id = "interface_tag_id"
+ else:
+ interface_tag_ids = "nodenetwork_setting_ids"
+ interface_tag_id = "nodenetwork_setting_id"
+
+ if len(network[interface_tag_ids]) > 0:
try:
- settings = plc.GetInterfaceTags({'interface_tag_id':
- network['interface_tag_ids']})
+ if version == 4.3:
+ settings = plc.GetInterfaceTags({interface_tag_id:network[interface_tag_ids]})
+ else:
+ settings = plc.GetNodeNetworkSettings({interface_tag_id:network[interface_tag_ids]})
except:
logger.log("net:InitInterfaces FATAL: failed call GetInterfaceTags({'interface_tag_id':{%s})"% \
network['interface_tag_ids'])
for setting in settings:
# to explicitly set interface name
- settingname = setting['name'].upper()
+ name_key = "name"
+ if version == 4.3:
+ name_key = "tagname"
+
+ settingname = setting[name_key].upper()
if settingname in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER'):
inter[settingname]=setting['value']
else:
- logger.log("net:InitInterfaces WARNING: ignored setting named %s"%setting['name'])
+ logger.log("net:InitInterfaces WARNING: ignored setting named %s"%setting[name_key])
# support aliases to interfaces either by name or HWADDR
if 'ALIAS' in inter:
m = modprobe.Modprobe()
try:
- m.input("%s/etc/modprobe.conf" % root, program)
+ m.input("%s/etc/modprobe.conf" % root)
except:
pass
for (dev, inter) in interfaces.iteritems():
options=" ".join(driver[1:])
if options <> '':
m.optionsset(dev,options)
- m.output("%s/etc/modprobe.conf" % root)
+ m.output("%s/etc/modprobe.conf" % root, program)
# clean up after any ifcfg-$dev script that's no longer listed as
# part of the NodeNetworks associated with this node
sys.exit(1)
node = shell.GetNodes({'node_id': [int(args[0])]})
- networks = shell.GetInterfaces({'interface_id': node[0]['interface_ids']})
+ try:
+ networks = shell.GetInterfaces({'interface_id': node[0]['interface_ids']})
+ except AttributeError:
+ networks = shell.GetNodeNetworks({'nodenetwork_id':node[0]['nodenetwork_ids']})
+ version = 4.2
+
data = {'hostname': node[0]['hostname'], 'networks': networks}
class logger: