Cleanup for using cord-tester logger over scapy logger which was an ugly hack.
Change-Id: I8af565f8eb4f69ddc6605e717a0c83772cc9417f
diff --git a/src/test/utils/EapPAP.py b/src/test/utils/EapPAP.py
index a342132..accb660 100644
--- a/src/test/utils/EapPAP.py
+++ b/src/test/utils/EapPAP.py
@@ -1,12 +1,12 @@
-#
+#
# Copyright 2016-present Ciena Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,9 +22,10 @@
from scapy.all import *
from nose.tools import *
from CordTestBase import CordTester
+from CordTestUtils import log_test
PAP_USER = "raduser"
PAP_PASSWD = "radpass"
-log.setLevel('INFO')
+log_test.setLevel('INFO')
class PAPAuthTest(EapolPacket, CordTester):
@@ -58,18 +59,18 @@
print 'Inside EAP PAP Setup'
self.setup()
self.nextEvent = self.PAPEventTable.EVT_EAP_START
-
+
def _eapStart(self):
print 'Inside EAP PAP Start'
self.eapol_start()
self.nextEvent = self.PAPEventTable.EVT_EAP_ID_REQ
def _eapIdReq(self):
- log.info( 'Inside EAP ID Req' )
+ log_test.info( 'Inside EAP ID Req' )
def eapol_cb(pkt):
- log.info('Got EAPOL packet with type id and code request')
- log.info('Packet code: %d, type: %d, id: %s', pkt[EAP].code, pkt[EAP].type, pkt[EAP].id)
- log.info("<====== Send EAP Response with identity = %s ================>" % PAP_USER)
+ log_test.info('Got EAPOL packet with type id and code request')
+ log_test.info('Packet code: %d, type: %d, id: %s', pkt[EAP].code, pkt[EAP].type, pkt[EAP].id)
+ log_test.info("<====== Send EAP Response with identity = %s ================>" % PAP_USER)
self.eapol_id_req(pkt[EAP].id, PAP_USER)
self.eapol_scapy_recv(cb = eapol_cb,
@@ -77,11 +78,11 @@
self.nextEvent = self.PAPEventTable.EVT_EAP_PAP_USER_REQ
def _eapPAPUserReq(self):
- log.info('UserReq Inside Challenge')
+ log_test.info('UserReq Inside Challenge')
def eapol_cb(pkt):
- log.info('Got EAPOL packet with type id and code request')
- log.info('Packet code: %d, id: %s', pkt[EAP].code, pkt[EAP].id)
- log.info('Send EAP Response for id %s with Password = %s' %(pkt[EAP].id, PAP_PASSWD) )
+ log_test.info('Got EAPOL packet with type id and code request')
+ log_test.info('Packet code: %d, id: %s', pkt[EAP].code, pkt[EAP].id)
+ log_test.info('Send EAP Response for id %s with Password = %s' %(pkt[EAP].id, PAP_PASSWD) )
self.eapol_id_req(pkt[EAP].id, PAP_PASSWD)
self.eapol_scapy_recv(cb = eapol_cb,
@@ -90,12 +91,11 @@
self.nextEvent = None
def _eapPAPPassReq(self):
- log.info('PassReq Inside Challenge')
+ log_test.info('PassReq Inside Challenge')
def eapol_cb(pkt):
- log.info('Got EAPOL packet with type id and code request')
- log.info('Packet code: %d, type: %d', pkt[EAP].code, pkt[EAP].type)
+ log_test.info('Got EAPOL packet with type id and code request')
+ log_test.info('Packet code: %d, type: %d', pkt[EAP].code, pkt[EAP].type)
self.eapol_scapy_recv(cb = eapol_cb,
lfilter = lambda pkt: pkt[EAP].code == EAP.SUCCESS)
self.nextEvent = self.PAPEventTable.EVT_EAP_PAP_DONE
-