git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No such variable self.name. Changed it to network['hostname'].
[nodemanager.git]
/
net.py
diff --git
a/net.py
b/net.py
index
bfd9113
..
564aa24
100644
(file)
--- 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)
# 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.
# 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:
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
continue
# Get current node cap