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

quick cleanup for ns3 code

Browse source
This commit is contained in:
bharnden 2018-10-12 10:34:35 -07:00
parent b81cbf2a86
commit 660123c443
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ns3/corens3/obj.py
View file

@ -102,7 +102,7 @@ class CoreNs3Node(CoreNode, ns.network.Node):
mm = self.GetObject(ns.mobility.MobilityModel.GetTypeId()) mm = self.GetObject(ns.mobility.MobilityModel.GetTypeId())
if z is None: if z is None:
z = 0.0 z = 0.0
pos = mm.SetPosition(ns.core.Vector(x, y, z)) mm.SetPosition(ns.core.Vector(x, y, z))
except AttributeError: except AttributeError:
self.warn("ns-3 mobility model not found, not setting position") self.warn("ns-3 mobility model not found, not setting position")
@ -209,10 +209,10 @@ class Ns3LteNet(CoreNs3Net):
Register user equipment with a nodeb. Register user equipment with a nodeb.
Optionally install mobility model while we have the ns-3 devs handy. Optionally install mobility model while we have the ns-3 devs handy.
""" """
tmp, nodebdev = self.findns3dev(nodeb) _tmp, nodebdev = self.findns3dev(nodeb)
tmp, dev = self.findns3dev(node) _tmp, dev = self.findns3dev(node)
if nodebdev is None or dev is None: if nodebdev is None or dev is None:
raise KeyError, "ns-3 device for node not found" raise KeyError("ns-3 device for node not found")
self.lte.RegisterUeToTheEnb(dev, nodebdev) self.lte.RegisterUeToTheEnb(dev, nodebdev)
if mob: if mob:
self.lte.AddMobility(dev.GetPhy(), mob) self.lte.AddMobility(dev.GetPhy(), mob)
@ -364,7 +364,7 @@ class Ns3Session(Session):
self.duration = duration self.duration = duration
self.nodes = ns.network.NodeContainer() self.nodes = ns.network.NodeContainer()
self.mobhelper = ns.mobility.MobilityHelper() self.mobhelper = ns.mobility.MobilityHelper()
Session.__init__(self, session_id, persistent=persistent) Session.__init__(self, session_id)
def run(self, vis=False): def run(self, vis=False):
""" """
@ -488,7 +488,7 @@ class Ns3Session(Session):
Start a tracing thread using the ASCII output from the ns3 Start a tracing thread using the ASCII output from the ns3
mobility helper. mobility helper.
""" """
net.mobility = WayPointMobility(session=self, object_id=net.objid, config=None) net.mobility = WayPointMobility(session=self, object_id=net.objid)
net.mobility.setendtime() net.mobility.setendtime()
net.mobility.refresh_ms = 300 net.mobility.refresh_ms = 300
net.mobility.empty_queue_stop = False net.mobility.empty_queue_stop = False
@ -528,7 +528,7 @@ class Ns3Session(Session):
sleep += 0.001 sleep += 0.001
continue continue
sleep = 0.001 sleep = 0.001
items = dict(map(lambda x: x.split('='), line.split())) items = dict(x.split("=") for x in line.split())
logger.info("trace: %s %s %s", items['node'], items['pos'], items['vel']) logger.info("trace: %s %s %s", items['node'], items['pos'], items['vel'])
x, y, z = map(float, items['pos'].split(':')) x, y, z = map(float, items['pos'].split(':'))
vel = map(float, items['vel'].split(':')) vel = map(float, items['vel'].split(':'))
@ -544,7 +544,7 @@ class Ns3Session(Session):
net.mobility.state = net.mobility.STATE_RUNNING net.mobility.state = net.mobility.STATE_RUNNING
self.event_loop.add_event(0, net.mobility.runround) self.event_loop.add_event(0, net.mobility.runround)
except IOError: except IOError:
logger.exception("mobilitytrace error opening '%s': %s", filename) logger.exception("mobilitytrace error opening: %s", filename)
finally: finally:
if f: if f:
f.close() f.close()

9
ns3/examples/ns3lte.py
View file

@ -27,12 +27,9 @@ def ltesession(opt):
lte = session.add_object(cls=Ns3LteNet, name="wlan1") lte = session.add_object(cls=Ns3LteNet, name="wlan1")
lte.setsubchannels(range(25), range(50, 100)) lte.setsubchannels(range(25), range(50, 100))
if opt.verbose: if opt.verbose:
ascii = ns.network.AsciiTraceHelper() ascii_helper = ns.network.AsciiTraceHelper()
stream = ascii.CreateFileStream('/tmp/ns3lte.tr') stream = ascii_helper.CreateFileStream('/tmp/ns3lte.tr')
lte.lte.EnableAsciiAll(stream) lte.lte.EnableAsciiAll(stream)
# ns.core.LogComponentEnable("EnbNetDevice", ns.core.LOG_LEVEL_INFO)
# ns.core.LogComponentEnable("UeNetDevice", ns.core.LOG_LEVEL_INFO)
# lte.lte.EnableLogComponents()
prefix = ipaddress.Ipv4Prefix("10.0.0.0/16") prefix = ipaddress.Ipv4Prefix("10.0.0.0/16")
mobb = None mobb = None
@ -48,7 +45,7 @@ def ltesession(opt):
node.newnetif(lte, ["%s/%s" % (prefix.addr(i), prefix.prefixlen)]) node.newnetif(lte, ["%s/%s" % (prefix.addr(i), prefix.prefixlen)])
nodes.append(node) nodes.append(node)
if i == 1: if i == 1:
(tmp, ns3dev) = lte.findns3dev(node) _tmp, ns3dev = lte.findns3dev(node)
lte.lte.AddMobility(ns3dev.GetPhy(), mob) lte.lte.AddMobility(ns3dev.GetPhy(), mob)
if i > 1: if i > 1:
lte.linknodeb(node, nodes[0], mob, mobb) lte.linknodeb(node, nodes[0], mob, mobb)