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
moving towards 5.0
[nodemanager.git]
/
net.py
diff --git
a/net.py
b/net.py
index
088f9a3
..
9ba9b3e
100644
(file)
--- a/
net.py
+++ b/
net.py
@@
-59,7
+59,7
@@
def InitI2(plc, data):
logger.log("This is an Internet2 node. Setting rules.")
i2nodes = []
i2nodeids = plc.GetNodeGroups(["Internet2"])[0]['node_ids']
logger.log("This is an Internet2 node. Setting rules.")
i2nodes = []
i2nodeids = plc.GetNodeGroups(["Internet2"])[0]['node_ids']
- for node in plc.Get
NodeNetwork
s({"node_id": i2nodeids}, ["ip"]):
+ for node in plc.Get
Interface
s({"node_id": i2nodeids}, ["ip"]):
i2nodes.append(node['ip'])
bwlimit.exempt_init('Internet2', i2nodes)
i2nodes.append(node['ip'])
bwlimit.exempt_init('Internet2', i2nodes)
@@
-84,7
+84,7
@@
def InitNAT(plc, data):
continue
try:
continue
try:
- settings = plc.Get
NodeNetworkSettings({'nodenetwork_setting_id': network['nodenetwork
_setting_ids']})
+ settings = plc.Get
InterfaceSettings({'interface_setting_id': network['interface
_setting_ids']})
except:
continue
# XXX arbitrary names
except:
continue
# XXX arbitrary names