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

updated logging usage, to use the library directly and avoid imposing a core config by default, allowing users of the core library to configure logging as desired

Browse source
This commit is contained in:
bharnden 2019-02-16 09:50:19 -08:00
parent 37f747c212
commit 7aee2b2ba7
44 changed files with 552 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ns3/corens3/obj.py
View file

@ -2,6 +2,7 @@
ns3.py: defines classes for running emulations with ns-3 simulated networks.
"""
import logging
import subprocess
import threading
import time
@ -16,7 +17,6 @@ import ns.wifi
import ns.wimax
from core import constants
from core import logger
from core.coreobj import PyCoreNet
from core.enumerations import EventTypes
from core.enumerations import LinkTypes
@ -174,7 +174,7 @@ class CoreNs3Net(PyCoreNet):
netif.poshook = self.setns3position
def setns3position(self, netif, x, y, z):
logger.info("setns3position: %s (%s, %s, %s)", netif.node.name, x, y, z)
logging.info("setns3position: %s (%s, %s, %s)", netif.node.name, x, y, z)
netif.node.setns3position(x, y, z)
@ -246,7 +246,7 @@ class Ns3LteNet(CoreNs3Net):
# ns.core.IntegerValue(ns.tap_bridge.TapBridge.USE_LOCAL))
tap = self.tapbridge.Install(netif.node, ns3dev)
# tap.SetMode(ns.tap_bridge.TapBridge.USE_LOCAL)
logger.info("using TAP device %s for %s/%s", netif.localname, netif.node.name, netif.name)
logging.info("using TAP device %s for %s/%s", netif.localname, netif.node.name, netif.name)
subprocess.check_call(['tunctl', '-t', netif.localname, '-n'])
# check_call([IP_BIN, 'link', 'set', 'dev', netif.localname, \
# 'address', '%s' % netif.hwaddr])
@ -373,12 +373,12 @@ class Ns3Session(Session):
def runthread():
ns.core.Simulator.Stop(ns.core.Seconds(self.duration))
logger.info("running ns-3 simulation for %d seconds", self.duration)
logging.info("running ns-3 simulation for %d seconds", self.duration)
if vis:
try:
import visualizer
except ImportError:
logger.exception("visualizer is not available")
logging.exception("visualizer is not available")
ns.core.Simulator.Run()
else:
visualizer.start()
@ -509,7 +509,7 @@ class Ns3Session(Session):
net.mobility.setnodeposition(node, x, y, z)
nodemap[node.GetId()] = node
logger.info("mobilitytrace opening '%s'", filename)
logging.info("mobilitytrace opening '%s'", filename)
f = None
try:
@ -529,7 +529,7 @@ class Ns3Session(Session):
continue
sleep = 0.001
items = dict(x.split("=") for x in line.split())
logger.info("trace: %s %s %s", items['node'], items['pos'], items['vel'])
logging.info("trace: %s %s %s", items['node'], items['pos'], items['vel'])
x, y, z = map(float, items['pos'].split(':'))
vel = map(float, items['vel'].split(':'))
node = nodemap[int(items['node'])]
@ -544,7 +544,7 @@ class Ns3Session(Session):
net.mobility.state = net.mobility.STATE_RUNNING
self.event_loop.add_event(0, net.mobility.runround)
except IOError:
logger.exception("mobilitytrace error opening: %s", filename)
logging.exception("mobilitytrace error opening: %s", filename)
finally:
if f:
f.close()

6
ns3/examples/ns3lte.py
View file

@ -4,13 +4,13 @@ ns3lte.py - This script demonstrates using CORE with the ns-3 LTE model.
- issues connecting TapBridge with LteNetDevice
"""
import logging
import optparse
import sys
import ns.core
import ns.mobility
from core import logger
from core.misc import ipaddress
from core.misc import nodemaps
from core.misc import nodeutils
@ -84,13 +84,13 @@ def main():
usage("invalid numnodes: %s" % opt.numnodes)
for a in args:
logger.warn("ignoring command line argument: '%s'", a)
logging.warn("ignoring command line argument: '%s'", a)
return ltesession(opt)
def cleanup():
logger.info("shutting down session")
logging.info("shutting down session")
session.shutdown()

6
ns3/examples/ns3wifi.py
View file

@ -22,12 +22,12 @@ To run with the CORE GUI:
"""
import logging
import optparse
import sys
import ns.core
from core import logger
from core.misc import ipaddress
from core.misc import nodeutils
from core.misc import nodemaps
@ -105,11 +105,11 @@ def main():
usage("invalid numnodes: %s" % opt.numnodes)
for a in args:
logger.warn("ignoring command line argument: '%s'", a)
logging.warn("ignoring command line argument: '%s'", a)
return wifisession(opt)
if __name__ == "__main__" or __name__ == "__builtin__":
session = main()
logger.info("\nsession =%s", session)
logging.info("\nsession =%s", session)

6
ns3/examples/ns3wifirandomwalk.py
View file

@ -11,6 +11,7 @@ How to run this:
python -i ns3wifirandomwalk.py
"""
import logging
import optparse
import sys
@ -19,7 +20,6 @@ import ns.network
from corens3.obj import Ns3Session
from corens3.obj import Ns3WifiNet
from core import logger
from core.misc import ipaddress
from core.misc import nodemaps
from core.misc import nodeutils
@ -109,11 +109,11 @@ def main():
usage("invalid numnodes: %s" % opt.numnodes)
for a in args:
logger.warn("ignoring command line argument: '%s'", a)
logging.warn("ignoring command line argument: '%s'", a)
return wifisession(opt)
if __name__ == "__main__" or __name__ == "__builtin__":
session = main()
logger.info("\nsession =%s", session)
logging.info("\nsession =%s", session)

4
ns3/examples/ns3wimax.py
View file

@ -9,10 +9,10 @@ Current issues:
- no packets are sent between nodes - no connection?
"""
import logging
import optparse
import sys
from core import logger
from core.misc import ipaddress
from core.misc import nodemaps
from core.misc import nodeutils
@ -76,7 +76,7 @@ def main():
usage("invalid numnodes: %s" % opt.numnodes)
for a in args:
logger.warn("ignoring command line argument: '%s'", a)
logging.warn("ignoring command line argument: '%s'", a)
return wimaxsession(opt)