-# $Id$
-# $URL$
-
"""network configuration"""
# system provided modules
import os, string, time, socket
+from socket import inet_aton
# PlanetLab system modules
import sioc, plnet
# local modules
-import bwlimit, logger, iptables, tools
+import plnode.bwlimit as bwlimit
+import logger, iptables, tools
+import subprocess
# we can't do anything without a network
priority=1
dev_default = tools.get_default_if()
+
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"
+ #################
+
logger.verbose("net: GetSlivers called.")
if not 'interfaces' in data:
- logger.log_missing_data('net.GetSlivers','interfaces')
- return
+ # 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.")
InitNodeLimit(data)
InitI2(plc, data)
InitNAT(plc, data)
-
-
+ """
+
def InitNodeLimit(data):
# query running network interfaces
for dev in devs:
macs[sioc.gifhwaddr(dev).lower()] = dev
- for interface in data['interfaces']:
+ for interface in data[KEY_NAME]:
# Get interface name preferably from MAC address, falling
# back on IP address.
hwaddr=interface['mac']
macs[sioc.gifhwaddr(dev).lower()] = dev
ipt = iptables.IPTables()
- for interface in data['interfaces']:
+ for interface in data[KEY_NAME]:
# Get interface name preferably from MAC address, falling
# back on IP address.
hwaddr=interface['mac']
fields['source'] = "0.0.0.0/0"
ipt.add_pf(fields)
ipt.commit()
+
+# Helper functions for converting to CIDR notation
+def get_net_size(netmask):
+ binary_str = ''
+ for octet in netmask:
+ binary_str += bin(int(octet))[2:].zfill(8)
+ return str(len(binary_str.rstrip('0')))
+
+def to_cidr(ipaddr, netmask):
+ # validate input
+ inet_aton(ipaddr)
+ inet_aton(netmask)
+
+ ipaddr = ipaddr.split('.')
+ netmask = netmask.split('.')
+
+ net_start = [str(int(ipaddr[x]) & int(netmask[x])) for x in range(0,4)]
+ return '.'.join(net_start) + '/' + get_net_size(netmask)
+
+def ipaddr_range(network, broadcast):
+ start = network.split('.')
+ end = broadcast.split('.')
+
+ # Assume interface always claims the first address in the block
+ start[3] = str(int(start[3]) + 2)
+ end[3] = str(int(end[3]) - 1)
+
+ return '.'.join(start) + ',' + '.'.join(end)
+