X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=564aa24c03f1cabc284f715fe7a3b0a4a6a743a6;hb=07c584a2251b97a6e88e79889b06fdf786e2e5a8;hp=bfd9113a28d86e7ae8ed82ad82f92dedbe8604bd;hpb=a53c6df31a0acdd9a0081d6ded652f6b0d734e54;p=nodemanager.git diff --git a/net.py b/net.py index bfd9113..564aa24 100644 --- a/net.py +++ b/net.py @@ -14,16 +14,15 @@ def GetSlivers(data): # XXX Exempt Internet2 destinations from node bwlimits # bwlimit.exempt_init('Internet2', internet2_ips) - - for network in d['networks']: + for network in data['networks']: # Get interface name preferably from MAC address, falling # back on IP address. - if macs.has_key(network['mac'].lower()): + if macs.has_key(network['mac']): dev = macs[network['mac'].lower()] elif ips.has_key(network['ip']): dev = ips[network['ip']] else: - logger.log('%s: no such interface with address %s/%s' % (self.name, network['ip'], network['mac'])) + logger.log('%s: no such interface with address %s/%s' % (network['hostname'], network['ip'], network['mac'])) continue # Get current node cap