added future library to support python2/3, updated xrange calls to leverage builtins range

daemon/examples/api/emane80211.py

@@ -3,6 +3,7 @@
 # Example CORE Python script that attaches N nodes to an EMANE 802.11abg network.
 
 import datetime
+from builtins import range
 
 import parser
 from core import load_logging_config
@@ -33,7 +34,7 @@ def example(options):
     emane_network.setposition(x=80, y=50)
 
     # create nodes
-    for i in xrange(options.nodes):
+    for i in range(options.nodes):
         node = session.create_wireless_node()
         node.setposition(x=150 * (i + 1), y=150)
         interface = prefixes.create_interface(node)

daemon/examples/api/switch.py

@@ -6,6 +6,7 @@
 # nodestep
 
 import datetime
+from builtins import range
 
 import parser
 from core import load_logging_config
@@ -31,7 +32,7 @@ def example(options):
     switch = session.add_node(_type=NodeTypes.SWITCH)
 
     # create nodes
-    for _ in xrange(options.nodes):
+    for _ in range(options.nodes):
         node = session.add_node()
         interface = prefixes.create_interface(node)
         session.add_link(node.id, switch.id, interface_one=interface)

daemon/examples/api/switch_inject.py

@@ -4,6 +4,8 @@
 # n nodes are connected to a virtual wlan; run test for testsec
 # and repeat for minnodes <= n <= maxnodes with a step size of
 # nodestep
+from builtins import range
+
 from core import load_logging_config
 from core.emulator.emudata import IpPrefixes
 from core.emulator.enumerations import NodeTypes, EventTypes
@@ -26,7 +28,7 @@ def example(nodes):
     switch = session.add_node(_type=NodeTypes.SWITCH)
 
     # create nodes
-    for _ in xrange(nodes):
+    for _ in range(nodes):
         node = session.add_node()
         interface = prefixes.create_interface(node)
         session.add_link(node.id, switch.id, interface_one=interface)

daemon/examples/api/wlan.py

@@ -6,6 +6,7 @@
 # nodestep
 
 import datetime
+from builtins import range
 
 import parser
 from core import load_logging_config
@@ -35,7 +36,7 @@ def example(options):
     # create nodes, must set a position for wlan basic range model
     node_options = NodeOptions()
     node_options.set_position(0, 0)
-    for _ in xrange(options.nodes):
+    for _ in range(options.nodes):
         node = session.add_node(node_options=node_options)
         interface = prefixes.create_interface(node)
         session.add_link(node.id, wlan.id, interface_one=interface)