updates to layout core module packages in a more logical way, including renaming methods from objects to nodes and nodes.objid to nodes.id

ns3/corens3/obj.py

@@ -17,14 +17,13 @@ import ns.wifi
 import ns.wimax
 
 from core import constants
-from core.coreobj import PyCoreNet
-from core.enumerations import EventTypes
-from core.enumerations import LinkTypes
-from core.enumerations import NodeTypes
-from core.misc.utils import make_tuple
-from core.mobility import WayPointMobility
-from core.netns.nodes import CoreNode
-from core.session import Session
+from core.emulator.enumerations import EventTypes
+from core.emulator.enumerations import LinkTypes
+from core.emulator.enumerations import NodeTypes
+from core.utils import make_tuple
+from core.location.mobility import WayPointMobility
+from core.nodes.base import CoreNode, CoreNetworkBase
+from core.emulator.session import Session
 
 ns.core.GlobalValue.Bind(
     "SimulatorImplementationType",
@@ -107,7 +106,7 @@ class CoreNs3Node(CoreNode, ns.network.Node):
             self.warn("ns-3 mobility model not found, not setting position")
 
 
-class CoreNs3Net(PyCoreNet):
+class CoreNs3Net(CoreNetworkBase):
     """
     The CoreNs3Net is a helper PyCoreNet object. Networks are represented
     entirely in simulation with the TunTap device bridging the emulated and
@@ -119,7 +118,7 @@ class CoreNs3Net(PyCoreNet):
     type = "wlan"
 
     def __init__(self, session, _id=None, name=None, start=True, policy=None):
-        PyCoreNet.__init__(self, session, _id, name)
+        CoreNetworkBase.__init__(self, session, _id, name)
         self.tapbridge = ns.tap_bridge.TapBridgeHelper()
         self._ns3devs = {}
         self._tapdevs = {}
@@ -402,7 +401,7 @@ class Ns3Session(Session):
         A convenience helper for Session.addobj(), for adding CoreNs3Nodes
         to this session. Keeps a NodeContainer for later use.
         """
-        n = self.add_object(cls=CoreNs3Node, name=name)
+        n = self.create_node(cls=CoreNs3Node, name=name)
         self.nodes.Add(n)
         return n
 
@@ -488,7 +487,7 @@ class Ns3Session(Session):
         Start a tracing thread using the ASCII output from the ns3
         mobility helper.
         """
-        net.mobility = WayPointMobility(session=self, object_id=net.id)
+        net.mobility = WayPointMobility(session=self, _id=net.id)
         net.mobility.setendtime()
         net.mobility.refresh_ms = 300
         net.mobility.empty_queue_stop = False

ns3/examples/ns3lte.py

@@ -11,9 +11,7 @@ import sys
 import ns.core
 import ns.mobility
 
-from core.misc import ipaddress
-from core.misc import nodemaps
-from core.misc import nodeutils
+from core.nodes import nodeutils, nodemaps, ipaddress
 from corens3.obj import Ns3LteNet
 from corens3.obj import Ns3Session
 
@@ -24,7 +22,7 @@ def ltesession(opt):
     """
     nodeutils.set_node_map(nodemaps.NODES)
     session = Ns3Session(1, persistent=True, duration=opt.duration)
-    lte = session.add_object(cls=Ns3LteNet, name="wlan1")
+    lte = session.create_node(cls=Ns3LteNet, name="wlan1")
     lte.setsubchannels(range(25), range(50, 100))
     if opt.verbose:
         ascii_helper = ns.network.AsciiTraceHelper()

ns3/examples/ns3wifi.py

@@ -28,9 +28,7 @@ import sys
 
 import ns.core
 
-from core.misc import ipaddress
-from core.misc import nodeutils
-from core.misc import nodemaps
+from core.nodes import nodeutils, nodemaps, ipaddress
 from corens3.obj import Ns3Session
 from corens3.obj import Ns3WifiNet
 
@@ -59,7 +57,7 @@ def wifisession(opt):
     session.node_count = str(opt.numnodes + 1)
     add_to_server(session)
 
-    wifi = session.add_object(cls=Ns3WifiNet, name="wlan1")
+    wifi = session.create_node(cls=Ns3WifiNet, name="wlan1")
     wifi.setposition(30, 30, 0)
     wifi.phy.Set("RxGain", ns.core.DoubleValue(18.0))
 

ns3/examples/ns3wifirandomwalk.py

@@ -20,9 +20,7 @@ import ns.network
 from corens3.obj import Ns3Session
 from corens3.obj import Ns3WifiNet
 
-from core.misc import ipaddress
-from core.misc import nodemaps
-from core.misc import nodeutils
+from core.nodes import nodeutils, nodemaps, ipaddress
 
 
 def add_to_server(session):
@@ -48,7 +46,7 @@ def wifisession(opt):
     session.filename = session.name + ".py"
     session.node_count = str(opt.numnodes + 1)
     add_to_server(session)
-    wifi = session.add_object(cls=Ns3WifiNet, name="wlan1", rate="OfdmRate12Mbps")
+    wifi = session.create_node(cls=Ns3WifiNet, name="wlan1", rate="OfdmRate12Mbps")
     wifi.setposition(30, 30, 0)
     # for improved connectivity
     wifi.phy.Set("RxGain", ns.core.DoubleValue(18.0))

ns3/examples/ns3wimax.py

@@ -13,9 +13,7 @@ import logging
 import optparse
 import sys
 
-from core.misc import ipaddress
-from core.misc import nodemaps
-from core.misc import nodeutils
+from core.nodes import nodeutils, nodemaps, ipaddress
 from corens3.obj import Ns3Session
 from corens3.obj import Ns3WimaxNet
 
@@ -26,7 +24,7 @@ def wimaxsession(opt):
     """
     nodeutils.set_node_map(nodemaps.NODES)
     session = Ns3Session(1, persistent=True, duration=opt.duration)
-    wimax = session.add_object(cls=Ns3WimaxNet, name="wlan1")
+    wimax = session.create_node(cls=Ns3WimaxNet, name="wlan1")
     # wimax.wimax.EnableLogComponents()
 
     prefix = ipaddress.Ipv4Prefix("10.0.0.0/16")