From 67b805c26868bef266105e210e504965b77232f9 Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Thu, 31 May 2012 17:28:25 -0300 Subject: [PATCH] ipaddr branches/3144 compatibility: IPNetwork was removed (use IPv4Network) --- src/nepi/testbeds/planetlab/interfaces.py | 6 +++--- src/nepi/testbeds/planetlab/node.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/nepi/testbeds/planetlab/interfaces.py b/src/nepi/testbeds/planetlab/interfaces.py index dddc0057..24937db2 100644 --- a/src/nepi/testbeds/planetlab/interfaces.py +++ b/src/nepi/testbeds/planetlab/interfaces.py @@ -223,11 +223,11 @@ class TunIface(object): dest, destprefix, nexthop, metric = route - myNet = ipaddr.IPNetwork("%s/%d" % (addr, prefix)) - gwIp = ipaddr.IPNetwork(nexthop) + myNet = ipaddr.IPv4Network("%s/%d" % (addr, prefix)) + gwIp = ipaddr.IPv4Network(nexthop) if pointopoint: - peerIp = ipaddr.IPNetwork(pointopoint) + peerIp = ipaddr.IPv4Network(pointopoint) if gwIp == peerIp: return True diff --git a/src/nepi/testbeds/planetlab/node.py b/src/nepi/testbeds/planetlab/node.py index c4cb0166..e863f4ac 100644 --- a/src/nepi/testbeds/planetlab/node.py +++ b/src/nepi/testbeds/planetlab/node.py @@ -670,10 +670,10 @@ class Node(object): if len(routes) > MAX_VROUTE_ROUTES: return 'sliceip' - vsys_vnet = ipaddr.IPNetwork(vsys_vnet) + vsys_vnet = ipaddr.IPv4Network(vsys_vnet) for route in routes: dest, prefix, nexthop, metric = route - dest = ipaddr.IPNetwork("%s/%d" % (dest,prefix)) + dest = ipaddr.IPv4Network("%s/%d" % (dest,prefix)) nexthop = ipaddr.IPAddress(nexthop) if dest not in vsys_vnet or nexthop not in vsys_vnet: return 'sliceip' -- 2.45.2