-#
-# $Id$
-#
-
-"""network configuration"""
+"""
+network configuration
+"""
# system provided modules
-import os, string, time, socket
+import os
# PlanetLab system modules
import sioc, plnet
# local modules
-import bwlimit, logger, iptables, tools
+import plnode.bwlimit as bwlimit
+import logger
+import iptables
+import tools
+
+# we can't do anything without a network
+priority = 1
dev_default = tools.get_default_if()
-def start(options, conf):
- logger.log("net plugin starting up...")
+
+def start():
+ logger.log("net: plugin starting up...")
def GetSlivers(data, config, plc):
- logger.verbose("net:GetSlivers called.")
- InitInterfaces(plc, data) # writes sysconfig files.
- if 'OVERRIDES' in dir(config):
+ # added by caglar
+ # band-aid for short period as old API returns networks instead of interfaces
+ global KEY_NAME
+ KEY_NAME = "interfaces"
+ #################
+
+ logger.verbose("net: GetSlivers called.")
+ 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')
+ # return
+ if not 'networks' in data:
+ logger.log_missing_data('net.GetSlivers', 'interfaces')
+ return
+ else:
+ KEY_NAME = "networks"
+ ##################
+
+ plnet.InitInterfaces(logger, plc, data)
+ if 'OVERRIDES' in dir(config):
if config.OVERRIDES.get('net_max_rate') == '-1':
logger.log("net: Slice and node BW Limits disabled.")
- if len(bwlimit.tc("class show dev %s" % dev_default)):
- logger.verbose("*** DISABLING NODE BW LIMITS ***")
+ if len(bwlimit.tc("class show dev %s" % dev_default)):
+ logger.verbose("net: *** DISABLING NODE BW LIMITS ***")
bwlimit.stop()
else:
InitNodeLimit(data)
def InitNodeLimit(data):
- if not 'networks' in data: return
# 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
- for network in data['networks']:
+ for interface in data[KEY_NAME]:
# Get interface name preferably from MAC address, falling
# back on IP address.
- hwaddr=network['mac']
- if hwaddr <> None: hwaddr=hwaddr.lower()
+ hwaddr=interface['mac']
+ if hwaddr != None: hwaddr=hwaddr.lower()
if hwaddr in macs:
- dev = macs[network['mac']]
- elif network['ip'] in ips:
- dev = ips[network['ip']]
+ dev = macs[interface['mac']]
+ elif interface['ip'] in ips:
+ dev = ips[interface['ip']]
else:
- logger.log('%s: no such interface with address %s/%s' % (network['hostname'], network['ip'], network['mac']))
+ logger.log('net: %s: no such interface with address %s/%s' % (interface['hostname'], interface['ip'], interface['mac']))
continue
# Get current node cap
old_bwlimit = None
# Get desired node cap
- if network['bwlimit'] is None or network['bwlimit'] < 0:
+ if interface['bwlimit'] is None or interface['bwlimit'] < 0:
new_bwlimit = bwlimit.bwmax
else:
- new_bwlimit = network['bwlimit']
+ new_bwlimit = interface['bwlimit']
if old_bwlimit != new_bwlimit:
# Reinitialize bandwidth limits
if not 'groups' in data: return
if "Internet2" in data['groups']:
- logger.log("This is an Internet2 node. Setting rules.")
+ logger.log("net: This is an Internet2 node. Setting rules.")
i2nodes = []
i2nodeids = plc.GetNodeGroups(["Internet2"])[0]['node_ids']
for node in plc.GetInterfaces({"node_id": i2nodeids}, ["ip"]):
# and add IPs that don't exist in the set rather than
# just recreateing the set.
bwlimit.exempt_init('Internet2', i2nodes)
-
+
# set the iptables classification rule if it doesnt exist.
cmd = '-A POSTROUTING -m set --set Internet2 dst -j CLASSIFY --set-class 0001:2000 --add-mark'
rules = []
os.popen("/sbin/iptables -t mangle " + cmd)
def InitNAT(plc, data):
- if not 'networks' in data: return
-
+
# 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
ipt = iptables.IPTables()
- for network in data['networks']:
+ for interface in data[KEY_NAME]:
# Get interface name preferably from MAC address, falling
# back on IP address.
- hwaddr=network['mac']
- if hwaddr <> None: hwaddr=hwaddr.lower()
+ hwaddr=interface['mac']
+ if hwaddr != None: hwaddr=hwaddr.lower()
if hwaddr in macs:
- dev = macs[network['mac']]
- elif network['ip'] in ips:
- dev = ips[network['ip']]
+ dev = macs[interface['mac']]
+ elif interface['ip'] in ips:
+ dev = ips[interface['ip']]
else:
- logger.log('%s: no such interface with address %s/%s' % (network['hostname'], network['ip'], network['mac']))
+ logger.log('net: %s: no such interface with address %s/%s' % (interface['hostname'], interface['ip'], interface['mac']))
continue
try:
- settings = plc.GetInterfaceTags({'interface_tag_id': network['interface_tag_ids']})
+ settings = plc.GetInterfaceTags({'interface_tag_id': interface['interface_tag_ids']})
except:
continue
fields['source'] = "0.0.0.0/0"
ipt.add_pf(fields)
ipt.commit()
-
-def InitInterfaces(plc, data):
- if not 'networks' in data: return
- plnet.InitInterfaces(logger, plc, data)
-
-def start(options, config):
- pass
git://git.onelab.eu / nodemanager.git / blobdiff