commit 76a497a7ce26df23593c928564511325b0133f34
author A R Karthick <kramanar@ciena.com> Wed Apr 12 10:59:39 2017 -0700
committer A R Karthick <kramanar@ciena.com> Wed Apr 12 10:59:39 2017 -0700
tree b7cf23d400e77b1503eaf400867b256e65c3c3d2
parent 2daa1afd145032d6d55f61c8343f60672b7f0214

Cleanup for using cord-tester logger over scapy logger which was an ugly hack.

Change-Id: I8af565f8eb4f69ddc6605e717a0c83772cc9417f

src/test/utils/Channels.py

diff --git a/src/test/utils/Channels.py b/src/test/utils/Channels.py
index 8266c7e..84d4921 100644
--- a/src/test/utils/Channels.py
+++ b/src/test/utils/Channels.py
@@ -25,8 +25,9 @@
 from McastTraffic import *
 from IGMP import *
 from OnosCtrl import OnosCtrl
+from CordTestUtils import log_test
 from nose.tools import *
-log.setLevel('DEBUG')
+log_test.setLevel('DEBUG')
 
 conf.verb = 0
 
@@ -85,7 +86,7 @@
     def onos_load_config(self, config):
         status, code = OnosCtrl.config(config,controller=self.controller)
         if status is False:
-            log.info('JSON config request returned status %d' %code)
+            log_test.info('JSON config request returned status %d' %code)
         time.sleep(2)
 
     def ssm_table_load(self, groups):
@@ -144,7 +145,7 @@
             for i in range(start, end):
                 if i&255:
                     g = '%s.%s.%s.%s' %((i>>24) &0xff, (i>>16)&0xff, (i>>8)&0xff, i&0xff)
-                    log.debug('Adding group %s' %g)
+                    log_test.debug('Adding group %s' %g)
                     group_addrs.append(g)
                     count += 1
             start = end
@@ -235,10 +236,10 @@
 
     def recv_cb(self, pkt):
         '''Default channel receive callback'''
-        log.debug('Received packet from source %s, destination %s' %(pkt[IP].src, pkt[IP].dst))
+        log_test.debug('Received packet from source %s, destination %s' %(pkt[IP].src, pkt[IP].dst))
         send_time = float(pkt[IP].payload.load)
         recv_time = monotonic.monotonic()
-        log.debug('Packet received in %.3f usecs' %(recv_time - send_time))
+        log_test.debug('Packet received in %.3f usecs' %(recv_time - send_time))
 
     def recv(self, chan, cb = None, count = 1, timeout = 5):
         if chan is None: