# Alina Quereilhac <alina.quereilhac@inria.fr>\r
#\r
\r
-import ipaddr\r
+from six import PY2, next\r
+if PY2:\r
+ import ipaddr\r
+else:\r
+ import ipaddress\r
from optparse import OptionParser\r
import os\r
from random import randint\r
def build_ns3_topology(ec, simu, node_count, network, prefixlen, agent_ip):\r
channel = add_ns3_wifi_channel(ec)\r
\r
- net = ipaddr.IPv4Network("%s/%s" % (network, prefixlen)) \r
- itr = net.iterhosts()\r
+ if PY2:\r
+ net = ipaddr.IPv4Network("%s/%s" % (network, prefixlen)) \r
+ itr = net.iterhosts()\r
+ else:\r
+ net = ipaddress.IPv4Network("%s/%s" % (network, prefixlen)) \r
+ itr = net.hosts()\r
\r
- ap_ip = itr.next().exploded\r
+ ap_ip = next(itr).exploded\r
ap = add_ns3_node(ec, simu, ap_ip, prefixlen, channel, ap_mode=True)\r
\r
agent = None\r