From fda8d4da0b665b91cb6c2c4524c15a6a3feb3aad Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 26 May 2008 14:13:19 +0000 Subject: [PATCH] moving towards 5.0 --- Makefile | 2 ++ net.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1f4c8d7..2492116 100644 --- a/Makefile +++ b/Makefile @@ -31,5 +31,7 @@ clean: .PHONY: all install clean +########## tags: find . '(' -name '*.py' -o -name '*.c' -o -name '*.spec' ')' | xargs etags + diff --git a/net.py b/net.py index 088f9a3..9ba9b3e 100644 --- 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'] - for node in plc.GetNodeNetworks({"node_id": i2nodeids}, ["ip"]): + for node in plc.GetInterfaces({"node_id": i2nodeids}, ["ip"]): i2nodes.append(node['ip']) bwlimit.exempt_init('Internet2', i2nodes) @@ -84,7 +84,7 @@ def InitNAT(plc, data): continue try: - settings = plc.GetNodeNetworkSettings({'nodenetwork_setting_id': network['nodenetwork_setting_ids']}) + settings = plc.GetInterfaceSettings({'interface_setting_id': network['interface_setting_ids']}) except: continue # XXX arbitrary names -- 2.43.0