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

ns3/examples/ns3lte.py

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

ns3/examples/ns3wifi.py

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

ns3/examples/ns3wifirandomwalk.py

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

ns3/examples/ns3wimax.py

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