add default node map configuration, to avoid the need to set this up every time

daemon/examples/netns/basicrange.py

@@ -13,8 +13,7 @@ import optparse
 import sys
 import time
 
-from core.misc import ipaddress, nodeutils
-from core.misc import nodemaps
+from core.misc import ipaddress
 from core.mobility import BasicRangeModel
 from core.netns.nodes import WlanNode
 from core.netns.vnet import EbtablesQueue
@@ -108,8 +107,4 @@ def main():
 
 
 if __name__ == "__main__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     main()

daemon/examples/netns/daemonnodes.py

@@ -25,7 +25,7 @@ from core.enumerations import LinkTlvs
 from core.enumerations import LinkTypes
 from core.enumerations import MessageFlags
 from core.enumerations import MessageTypes
-from core.misc import ipaddress, nodeutils, nodemaps
+from core.misc import ipaddress
 from core.netns import nodes
 
 # declare classes for use with Broker
@@ -187,8 +187,4 @@ def main():
 
 
 if __name__ == "__main__" or __name__ == "__builtin__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     main()

daemon/examples/netns/distributed.py

@@ -16,7 +16,7 @@ import sys
 from core import constants
 from core.api import coreapi, dataconversion
 from core.enumerations import CORE_API_PORT, EventTypes, EventTlvs, LinkTlvs, LinkTypes, MessageFlags
-from core.misc import ipaddress, nodeutils, nodemaps
+from core.misc import ipaddress
 from core.netns import nodes
 from core.session import Session
 
@@ -124,8 +124,4 @@ def main():
 
 
 if __name__ == "__main__" or __name__ == "__builtin__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     main()

daemon/examples/netns/emane80211.py

@@ -13,7 +13,7 @@ import sys
 from core import constants
 from core.emane.ieee80211abg import EmaneIeee80211abgModel
 from core.emane.nodes import EmaneNode
-from core.misc import ipaddress, nodeutils, nodemaps
+from core.misc import ipaddress
 from core.netns import nodes
 
 # node list (count from 1)
@@ -100,8 +100,4 @@ def main():
 
 
 if __name__ == "__main__" or __name__ == "__builtin__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     main()

daemon/examples/netns/howmanynodes.py

@@ -20,7 +20,7 @@ import sys
 import time
 
 from core import constants
-from core.misc import ipaddress, nodeutils, nodemaps
+from core.misc import ipaddress
 from core.netns import nodes
 from core.session import Session
 
@@ -206,8 +206,4 @@ def main():
 
 
 if __name__ == "__main__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     main()

daemon/examples/netns/iperf-performance-chain.py

@@ -19,7 +19,7 @@ import optparse
 import sys
 
 from core import constants
-from core.misc import ipaddress, nodeutils, nodemaps
+from core.misc import ipaddress 
 from core.netns import nodes
 
 # node list (count from 1)
@@ -100,8 +100,4 @@ def main():
 
 
 if __name__ == "__main__" or __name__ == "__builtin__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     main()

daemon/examples/netns/ospfmanetmdrtest.py

@@ -16,7 +16,7 @@ import time
 from string import Template
 
 from core.constants import QUAGGA_STATE_DIR
-from core.misc import ipaddress, nodeutils, nodemaps
+from core.misc import ipaddress
 from core.misc.utils import mutecall
 from core.netns import nodes
 
@@ -602,8 +602,4 @@ def main():
 
 
 if __name__ == "__main__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     me = main()

daemon/examples/netns/switch.py

@@ -10,7 +10,7 @@ import optparse
 import sys
 
 from core import constants
-from core.misc import ipaddress, nodeutils, nodemaps
+from core.misc import ipaddress
 from core.netns import nodes
 
 # node list (count from 1)
@@ -73,8 +73,4 @@ def main():
 
 
 if __name__ == "__main__" or __name__ == "__builtin__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     main()

daemon/examples/netns/switchtest.py

@@ -12,7 +12,7 @@ import datetime
 import optparse
 import sys
 
-from core.misc import ipaddress, nodeutils, nodemaps
+from core.misc import ipaddress
 from core.misc.utils import mutecall
 from core.netns import nodes
 from core.session import Session
@@ -101,8 +101,4 @@ def main():
 
 
 if __name__ == "__main__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     main()

daemon/examples/netns/wlanemanetests.py

@@ -41,7 +41,7 @@ from core import emane
 from core.emane.bypass import EmaneBypassModel
 from core.emane.nodes import EmaneNode
 from core.emane.rfpipe import EmaneRfPipeModel
-from core.misc import ipaddress, nodemaps, nodeutils
+from core.misc import ipaddress
 from core.netns import nodes
 from core.session import Session
 
@@ -851,8 +851,4 @@ def main():
 
 
 if __name__ == "__main__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     main()

daemon/examples/netns/wlantest.py

@@ -12,7 +12,7 @@ import datetime
 import optparse
 import sys
 
-from core.misc import ipaddress, nodeutils, nodemaps
+from core.misc import ipaddress
 from core.misc.utils import mutecall
 from core.netns import nodes
 from core.session import Session
@@ -99,8 +99,4 @@ def main():
 
 
 if __name__ == "__main__":
-    # configure nodes to use
-    node_map = nodemaps.NODES
-    nodeutils.set_node_map(node_map)
-
     main()