the big merge

[nepi.git] / src / nepi / resources / ns3 / ns3netdevice.py

diff --git a/src/nepi/resources/ns3/ns3netdevice.py b/src/nepi/resources/ns3/ns3netdevice.py
index 946f01a..5c99cd1 100644 (file)
--- a/src/nepi/resources/ns3/ns3netdevice.py
+++ b/src/nepi/resources/ns3/ns3netdevice.py
@@ -21,7 +21,13 @@ from nepi.execution.resource import clsinit_copy
 from nepi.execution.trace import Trace
 from nepi.resources.ns3.ns3base import NS3Base
 
-import ipaddr
+import sys
+PY2 = sys.version_info[0] == 2
+
+if PY2:
+    import ipaddr
+else:
+    import ipaddress
 
 @clsinit_copy
 class NS3BaseNetDevice(NS3Base):
@@ -150,7 +156,10 @@ class NS3BaseNetDevice(NS3Base):
         ip = self.get("ip")
         prefix = self.get("prefix")
 
-        i = ipaddr.IPAddress(ip)
+        if PY2:
+            i = ipaddr.IPAddress(ip)
+        else:
+            i = ipaddress.ip_address(ip)
         if i.version == 4:
             # IPv4
             ipv4 = self.node.ipv4