-#!/usr/bin/python /usr/bin/plcsh
+#!/usr/bin/python3 /usr/bin/plcsh
import os
import socket
logger.log("net: failed to restart openvswitch")
return False
-def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeManager"):
+def InitInterfaces(logger, plc, data, root="",
+ files_only=False, program="NodeManager"):
global version
sysconfig = "{}/etc/sysconfig/network-scripts".format(root)
try:
os.makedirs(sysconfig)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.EEXIST:
raise e
# query running network interfaces
devs = sioc.gifconf()
- ips = dict(zip(devs.values(), devs.keys()))
+ ips = {ip: interface for (ip, interface) in devs.items()}
macs = {}
for dev in devs:
macs[sioc.gifhwaddr(dev).lower()] = dev
devices_map = {}
device_id = 1
- hostname = data.get('hostname',socket.gethostname())
+ hostname = data.get('hostname', socket.gethostname())
gateway = None
# assume data['interfaces'] contains this node's Interfaces
# can cope with 4.3 ('networks') or 5.0 ('interfaces')
# returned. Because 'interface' is decremented as each interface is processed,
# by the time is_primary=True (primary) interface is reached, the device
# "eth<interface>" is not eth0. But, something like eth-4, or eth-12.
- # This code sorts the interfaces, placing is_primary=True interfaces first.
+ # This code sorts the interfaces, placing is_primary=True interfaces first.
# There is a lot of room for improvement to how this
# script handles interfaces and how it chooses the primary interface.
- def compare_by (fieldname):
- def compare_two_dicts (a, b):
- return cmp(a[fieldname], b[fieldname])
- return compare_two_dicts
-
# NOTE: by sorting on 'is_primary' and then reversing (since False is sorted
# before True) all 'is_primary' interfaces are at the beginning of the list.
- interfaces.sort( compare_by('is_primary') )
- interfaces.reverse()
+ interfaces.sort(key=lambda d: d['is_primary'], reverse=True)
# The names of the bridge devices
bridgeDevices = []
# Get interface name preferably from MAC address, falling back
# on IP address.
hwaddr=interface['mac']
- if hwaddr <> None: hwaddr=hwaddr.lower()
+ if hwaddr != None: hwaddr=hwaddr.lower()
if hwaddr in macs:
orig_ifname = macs[hwaddr]
elif interface['ip'] in ips:
# wireless settings
elif settingname in \
[ "MODE", "ESSID", "NW", "FREQ", "CHANNEL", "SENS", "RATE",
- "KEY", "KEY1", "KEY2", "KEY3", "KEY4", "SECURITYMODE",
+ "KEY", "KEY1", "KEY2", "KEY3", "KEY4", "SECURITYMODE",
"IWCONFIG", "IWPRIV" ] :
details [settingname] = setting['value']
details ['TYPE']='Wireless'
del details['HWADDR']
if hwaddr in macs:
hwifname = macs[hwaddr]
- if ('IFNAME' in details) and details['IFNAME'] <> hwifname:
+ if ('IFNAME' in details) and details['IFNAME'] != hwifname:
logger.log("net:InitInterfaces WARNING: alias ifname ({}) and hwaddr ifname ({}) do not match"
.format(details['IFNAME'], hwifname))
details['IFNAME'] = hwifname
isValid=isValid and part.isalnum()
if isValid:
- devices_map["{}:{}".format(details['IFNAME'], details['ALIAS'])] = details
+ devices_map["{}:{}".format(details['IFNAME'], details['ALIAS'])] = details
else:
logger.log("net:InitInterfaces WARNING: interface alias ({}) not a valid string for RH ifup-aliases"
.format(details['ALIAS']))
logger.log('net:InitInterfaces: Adding {} {}'.format(bridgeType, bridgeName))
bridgeDetails = prepDetails(interface)
-
+
# TD: Add configuration for secondary IPv4 and IPv6 addresses to the bridge.
if len(interface[interface_tag_ids]) > 0:
filter = { interface_tag_id : interface[interface_tag_ids] }
logger.log("net:InitInterfaces WARNING: possibly blowing away {} configuration"
.format(ifname))
devices_map[ifname] = details
- device_id += 1
+ device_id += 1
logger.log('net:InitInterfaces: Device map: {}'.format(devices_map))
m = modprobe.Modprobe()
try:
m.input("{}/etc/modprobe.conf".format(root))
except:
pass
- for (dev, details) in devices_map.iteritems():
+ for (dev, details) in devices_map.items():
# get the driver string "moduleName option1=a option2=b"
driver=details.get('DRIVER','')
- if driver <> '':
+ if driver != '':
driver=driver.split()
kernelmodule=driver[0]
m.aliasset(dev,kernelmodule)
options=" ".join(driver[1:])
- if options <> '':
+ if options != '':
m.optionsset(dev,options)
m.output("{}/etc/modprobe.conf".format(root), program)
if lo in ifcfgs: ifcfgs.remove(lo)
# remove known devices from ifcfgs list
- for (dev, details) in devices_map.iteritems():
+ for (dev, details) in devices_map.items():
ifcfg = 'ifcfg-'+dev
if ifcfg in ifcfgs: ifcfgs.remove(ifcfg)
- # delete the remaining ifcfgs from
+ # delete the remaining ifcfgs from
deletedSomething = False
if not failedToGetSettings:
# Process ifcfg-$dev changes / additions
newdevs = []
table = 10
- for (dev, details) in devices_map.iteritems():
+ for (dev, details) in devices_map.items():
(fd, tmpnam) = tempfile.mkstemp(dir=sysconfig)
f = os.fdopen(fd, "w")
f.write("# Autogenerated by pyplnet... do not edit!\n")
if 'DRIVER' in details:
f.write("# using {} driver for device {}\n".format(details['DRIVER'], dev))
f.write('DEVICE={}\n'.format(dev))
-
+
# print the configuration values
- for (key, val) in details.iteritems():
+ for (key, val) in details.items():
if key not in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER','GATEWAY'):
f.write('{}="{}"\n'.format(key, val))
buf_b = fb.read()
return buf_a == buf_b
- except IOError, e:
+ except IOError as e:
return False
src_route_changed = False
rule_dest = "{}/rule-{}".format(sysconfig, dev)
if not comparefiles(rule_tmpnam, rule_dest):
os.rename(rule_tmpnam, rule_dest)
- os.chmod(rule_dest, 0644)
+ os.chmod(rule_dest, 0o644)
src_route_changed = True
else:
os.unlink(rule_tmpnam)
route_dest = "{}/route-{}".format(sysconfig, dev)
if not comparefiles(route_tmpnam, route_dest):
os.rename(route_tmpnam, route_dest)
- os.chmod(route_dest, 0644)
+ os.chmod(route_dest, 0o644)
src_route_changed = True
else:
os.unlink(route_tmpnam)
logger.verbose('net:InitInterfaces adding configuration for {}'.format(dev))
# add ifcfg-$dev configuration file
os.rename(tmpnam,path)
- os.chmod(path,0644)
+ os.chmod(path,0o644)
newdevs.append(dev)
-
+
elif not comparefiles(tmpnam,path) or src_route_changed:
logger.verbose('net:InitInterfaces Configuration change for {}'.format(dev))
if not files_only:
logger.log('replacing configuration for {}'.format(dev))
# replace ifcfg-$dev configuration file
os.rename(tmpnam,path)
- os.chmod(path,0644)
+ os.chmod(path,0o644)
newdevs.append(dev)
else:
# tmpnam & path are identical
for dev in newdevs:
cfgvariables = {}
- with file("{}/ifcfg-{}".format(sysconfig, dev), "r") as fb:
+ with open("{}/ifcfg-{}".format(sysconfig, dev), "r") as fb:
for line in fb.readlines():
parts = line.split()
if parts[0][0]=="#":continue
details = {}
details['ONBOOT'] = 'yes'
details['USERCTL'] = 'no'
+ # starting with f27, it's OK to use NetworkManager
# attempt to work around issues seen starting with f23
- details['NM_CONTROLLED'] = 'no'
+ # details['NM_CONTROLLED'] = 'no'
if interface['mac']:
details['HWADDR'] = interface['mac']
if interface['is_primary']:
# TD: Also turn off IPv6
details['IPV6INIT'] = 'no'
details['IPV6_AUTOCONF'] = 'no'
-
+
return details
if __name__ == "__main__":
dest="program", default="plnet")
(options, args) = parser.parse_args()
if len(args) != 1 or options.root is None:
- print sys.argv
- print >>sys.stderr, "Missing root or node_id"
+ print(sys.argv)
+ print("Missing root or node_id", file=sys.stderr)
parser.print_help()
sys.exit(1)
self.verbosity = verbose
def log(self, msg, loglevel=2):
if self.verbosity:
- print msg
+ print(msg)
def verbose(self, msg):
self.log(msg, 1)
l = logger(options.verbose)
git://git.onelab.eu / pyplnet.git / blobdiff