git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a4ec40e
)
bug in matching MAC addr with nodenetworks mac addr.
author
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Mon, 10 Nov 2008 20:45:25 +0000
(20:45 +0000)
committer
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Mon, 10 Nov 2008 20:45:25 +0000
(20:45 +0000)
net.py
patch
|
blob
|
history
diff --git
a/net.py
b/net.py
index
16953aa
..
c03035f
100644
(file)
--- a/
net.py
+++ b/
net.py
@@
-23,12
+23,10
@@
def InitNodeLimit(data):
for dev in devs:
macs[sioc.gifhwaddr(dev).lower()] = dev
for dev in devs:
macs[sioc.gifhwaddr(dev).lower()] = dev
- # XXX Exempt Internet2 destinations from node bwlimits
- # bwlimit.exempt_init('Internet2', internet2_ips)
for network in data['networks']:
# Get interface name preferably from MAC address, falling
# back on IP address.
for network in data['networks']:
# Get interface name preferably from MAC address, falling
# back on IP address.
- if macs.has_key(network['mac']):
+ if macs.has_key(network['mac']
.lower()
):
dev = macs[network['mac'].lower()]
elif ips.has_key(network['ip']):
dev = ips[network['ip']]
dev = macs[network['mac'].lower()]
elif ips.has_key(network['ip']):
dev = ips[network['ip']]