afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
bharnden 2019-04-29 23:31:47 -07:00
parent 9517740704
commit 66e603906a
100 changed files with 10283 additions and 3489 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ns3/examples/ns3lte.py
View file

@ -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()

6
ns3/examples/ns3wifi.py
View file

@ -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))

6
ns3/examples/ns3wifirandomwalk.py
View file

@ -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))

6
ns3/examples/ns3wimax.py
View file

@ -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")