Cleanup for using cord-tester logger over scapy logger which was an ugly hack.
Change-Id: I8af565f8eb4f69ddc6605e717a0c83772cc9417f
diff --git a/src/test/utils/EapMD5.py b/src/test/utils/EapMD5.py
index be71b18..8467a78 100644
--- a/src/test/utils/EapMD5.py
+++ b/src/test/utils/EapMD5.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.
@@ -54,58 +54,56 @@
self.nextEvent = None
def _eapSetup(self):
- print 'Inside EAP Setup'
+ print('Inside EAP Setup')
self.setup()
self.nextEvent = self.md5EventTable.EVT_EAP_START
-
+
def _eapStart(self):
- print 'Inside EAP Start'
+ print('Inside EAP Start')
self.eapol_start()
self.nextEvent = self.md5EventTable.EVT_EAP_ID_REQ
def _eapIdReq(self):
- print 'Inside EAP ID Req'
+ print('Inside EAP ID Req')
p = self.eapol_recv()
code, pkt_id, eaplen = unpack("!BBH", p[0:4])
- print "Code %d, id %d, len %d" %(code, pkt_id, eaplen)
+ print("Code %d, id %d, len %d" %(code, pkt_id, eaplen))
assert_equal(code, EAP_REQUEST)
reqtype = unpack("!B", p[4:5])[0]
reqdata = p[5:4+eaplen]
assert_equal(reqtype, EAP_TYPE_ID)
- print "<====== Send EAP Response with identity = %s ================>" % USER
+ print("<====== Send EAP Response with identity = %s ================>" % USER)
self.eapol_id_req(pkt_id, USER)
self.nextEvent = self.md5EventTable.EVT_EAP_MD5_CHALLENGE
def _eapMd5Challenge(self):
- print 'Inside EAP MD5 Challenge Exchange'
+ print('Inside EAP MD5 Challenge Exchange')
challenge,pkt_id =self.eap_md5_challenge_recv(self.passwd)
resp=md5(challenge).digest()
resp=chr(len(resp))+resp
length= 5+len(resp)
- print "Generated MD5 challenge is %s Length : %d" % (resp,length)
- print "--> Send EAP response with MD5 challenge"
+ print("Generated MD5 challenge is %s Length : %d" % (resp,length))
+ print("--> Send EAP response with MD5 challenge")
eap_payload = self.eap(EAP_RESPONSE, pkt_id, EAP_TYPE_MD5, str(resp))
self.eapol_send(EAPOL_EAPPACKET, eap_payload)
self.nextEvent = self.md5EventTable.EVT_EAP_STATUS
def _eapStatus(self):
- print 'Inside EAP Status -- Sucess/Failure'
+ print('Inside EAP Status -- Sucess/Failure')
if self.req_status == "EAP_SUCCESS":
status=self.eap_Status()
- print "<============EAP code received is = %d ====================>" % status
+ print("<============EAP code received is = %d ====================>" % status)
assert_equal(status, EAP_SUCCESS)
- print"Received EAP SUCCESS"
+ print("Received EAP SUCCESS")
else:
- print 'Inside EAP Status -- Sucess/Failure ===> SUCCESS should not be received , Since Negative Testcase'
+ print('Inside EAP Status -- Sucess/Failure ===> SUCCESS should not be received , Since Negative Testcase')
self.s.settimeout(10)
assert_equal(self.s.gettimeout(), 10)
- print "Check if the socket timed out ====> Since negative testcase socket should timeout because ONOS is not sending the EAP FAILURE Message"
+ print("Check if the socket timed out ====> Since negative testcase socket should timeout because ONOS is not sending the EAP FAILURE Message")
assert_raises(socket.error, self.s.recv, 1024)
self.nextEvent = self.md5EventTable.EVT_EAP_MD5_DONE
def _wrong_password(self):
- print 'Start Testcase for EAP-MD5 Wrong Password'
+ print('Start Testcase for EAP-MD5 Wrong Password')
#self._eap_md5_states()
self.__init__(intf = 'veth0', password = "wrong_password", required_status = "EAP_FAILURE")
-
-