-# $Id$
-# $URL$
-
"""network configuration"""
# system provided modules
import sioc, plnet
# local modules
-import bwlimit, logger, iptables, tools
+import plnode.bwlimit as bwlimit
+import logger, iptables, tools
# we can't do anything without a network
priority=1
dev_default = tools.get_default_if()
-# added by caglar
-# band-aid for short period as old API returns networks instead of interfaces
def start():
logger.log("net: plugin starting up...")
def GetSlivers(data, config, plc):
# added by caglar
+ # band-aid for short period as old API returns networks instead of interfaces
global KEY_NAME
KEY_NAME = "interfaces"
#################
if not 'interfaces' in data:
# added by caglar
# band-aid for short period as old API returns networks instead of interfaces
- # logger.log_missing_data('net.GetSlivers','interfaces')
+ # logger.log_missing_data('net.GetSlivers', 'interfaces')
# return
if not 'networks' in data:
- logger.log_missing_data('net.GetSlivers','interfaces')
+ logger.log_missing_data('net.GetSlivers', 'interfaces')
return
else:
KEY_NAME = "networks"
# query running network interfaces
devs = sioc.gifconf()
- ips = dict(zip(devs.values(), devs.keys()))
+ ips = dict(list(zip(list(devs.values()), list(devs.keys()))))
macs = {}
for dev in devs:
macs[sioc.gifhwaddr(dev).lower()] = dev
# 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:
dev = macs[interface['mac']]
elif interface['ip'] in ips:
# query running network interfaces
devs = sioc.gifconf()
- ips = dict(zip(devs.values(), devs.keys()))
+ ips = dict(list(zip(list(devs.values()), list(devs.keys()))))
macs = {}
for dev in devs:
macs[sioc.gifhwaddr(dev).lower()] = dev
# 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:
dev = macs[interface['mac']]
elif interface['ip'] in ips: