This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/16544 )
Change subject: osmoappdesc.py, tests, ipa.py: switch to python 3
......................................................................
osmoappdesc.py, tests, ipa.py: switch to python 3
Make build and external tests work with python3, so we can drop
the python2 dependency.
This should be merged shortly after osmo-python-tests was migrated to
python3, and the jenkins build slaves were (automatically) updated to
have the new osmo-python-tests installed.
Related: OS#2819
Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7
Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4
---
M openbsc/contrib/ipa.py
M openbsc/osmoappdesc.py
M openbsc/tests/ctrl_test_runner.py
M openbsc/tests/smpp_test_runner.py
M openbsc/tests/vty_test_runner.py
5 files changed, 452 insertions(+), 442 deletions(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/openbsc/contrib/ipa.py b/openbsc/contrib/ipa.py
index 71cbf45..cd1192c 100755
--- a/openbsc/contrib/ipa.py
+++ b/openbsc/contrib/ipa.py
@@ -56,7 +56,11 @@
"""
Create TAG as TLV data
"""
- return struct.pack(">HB", len(v) + 1, t) + v
+ if isinstance(v, str):
+ v = v.encode()
+ if isinstance(t, str):
+ t = t.encode()
+ return struct.pack(">HB".encode(), len(v) + 1, t) + v
def proto(self, p):
"""
@@ -96,9 +100,15 @@
"""
Add IPA header (with extension if necessary), data must be represented as bytes
"""
+ if isinstance(data, str):
+ data = data.encode()
+ if isinstance(proto, str):
+ proto = proto.encode()
+ if isinstance(ext, str):
+ ext = ext.encode()
if ext is None:
- return struct.pack(">HB", len(data) + 1, proto) + data
- return struct.pack(">HBB", len(data) + 1, proto, ext) + data
+ return struct.pack(">HB".encode(), len(data) + 1, proto) + data
+ return struct.pack(">HBB".encode(), len(data) + 1, proto, ext) + data
def del_header(self, data):
"""
diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py
index 5b01e4c..af949e8 100644
--- a/openbsc/osmoappdesc.py
+++ b/openbsc/osmoappdesc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# (C) 2013 by Katerina Barone-Adesi <kat.obsc at gmail.com>
# This program is free software: you can redistribute it and/or modify
diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py
index ad0a16b..a1d4195 100755
--- a/openbsc/tests/ctrl_test_runner.py
+++ b/openbsc/tests/ctrl_test_runner.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
# (C) 2013 by Jacob Erlbeck <jerlbeck at sysmocom.de>
# (C) 2014 by Holger Hans Peter Freyther
@@ -57,8 +57,8 @@
try:
self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd)
except OSError:
- print >> sys.stderr, "Current directory: %s" % os.getcwd()
- print >> sys.stderr, "Consider setting -b"
+ print("Current directory: %s" % os.getcwd(), file=sys.stderr)
+ print("Consider setting -b", file=sys.stderr)
time.sleep(2)
appstring = self.ctrl_app()[2]
@@ -76,7 +76,7 @@
def connect(self, host, port):
if verbose:
- print "Connecting to host %s:%i" % (host, port)
+ print("Connecting to host %s:%i" % (host, port))
retries = 30
while True:
@@ -96,7 +96,7 @@
def send(self, data):
if verbose:
- print "Sending \"%s\"" %(data)
+ print("Sending \"%s\"" %(data))
data = Ctrl().add_header(data)
return self.sock.send(data) == len(data)
@@ -125,9 +125,9 @@
data = self.sock.recv(4096)
while (len(data)>0):
(head, data) = IPA().split_combined(data)
- answer = Ctrl().rem_header(head)
+ answer = Ctrl().rem_header(head).decode()
if verbose:
- print "Got message:", answer
+ print("Got message:", answer)
(mtype, id, msg) = answer.split(None, 2)
id = int(id)
rsp = {'mtype': mtype, 'id': id}
@@ -143,7 +143,7 @@
responses[id] = rsp
if verbose:
- print "Decoded replies: ", responses
+ print("Decoded replies: ", responses)
return responses
@@ -163,80 +163,80 @@
def testCtrlErrs(self):
r = self.do_get('invalid')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Command not found')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Command not found')
r = self.do_set('rf_locked', '999')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Value failed verification.')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Value failed verification.')
r = self.do_get('bts')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Error while parsing the index.')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Error while parsing the index.')
r = self.do_get('bts.999')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Error while resolving object')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Error while resolving object')
def testBtsLac(self):
r = self.do_get('bts.0.location-area-code')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.location-area-code')
- self.assertEquals(r['value'], '1')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.location-area-code')
+ self.assertEqual(r['value'], '1')
r = self.do_set('bts.0.location-area-code', '23')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'bts.0.location-area-code')
- self.assertEquals(r['value'], '23')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.location-area-code')
+ self.assertEqual(r['value'], '23')
r = self.do_get('bts.0.location-area-code')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.location-area-code')
- self.assertEquals(r['value'], '23')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.location-area-code')
+ self.assertEqual(r['value'], '23')
r = self.do_set('bts.0.location-area-code', '-1')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Input not within the range')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Input not within the range')
def testBtsCi(self):
r = self.do_get('bts.0.cell-identity')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.cell-identity')
- self.assertEquals(r['value'], '0')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.cell-identity')
+ self.assertEqual(r['value'], '0')
r = self.do_set('bts.0.cell-identity', '23')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'bts.0.cell-identity')
- self.assertEquals(r['value'], '23')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.cell-identity')
+ self.assertEqual(r['value'], '23')
r = self.do_get('bts.0.cell-identity')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.cell-identity')
- self.assertEquals(r['value'], '23')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.cell-identity')
+ self.assertEqual(r['value'], '23')
r = self.do_set('bts.0.cell-identity', '-1')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Input not within the range')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Input not within the range')
def testBtsGenerateSystemInformation(self):
r = self.do_get('bts.0.send-new-system-informations')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Write Only attribute')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Write Only attribute')
# No RSL links so it will fail
r = self.do_set('bts.0.send-new-system-informations', '1')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Failed to generate SI')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Failed to generate SI')
def testBtsChannelLoad(self):
r = self.do_set('bts.0.channel-load', '1')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Read Only attribute')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Read Only attribute')
# No RSL link so everything is 0
r = self.do_get('bts.0.channel-load')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['value'],
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['value'],
'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0'
+ ' TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0'
+ ' SDCCH8+CBCH,0,0 TCH/F_TCH/H_PDCH,0,0')
@@ -244,221 +244,221 @@
def testBtsOmlConnectionState(self):
"""Check OML state. It will not be connected"""
r = self.do_set('bts.0.oml-connection-state', '1')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Read Only attribute')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Read Only attribute')
# No RSL link so everything is 0
r = self.do_get('bts.0.oml-connection-state')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['value'], 'disconnected')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['value'], 'disconnected')
def testTrxPowerRed(self):
r = self.do_get('bts.0.trx.0.max-power-reduction')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction')
- self.assertEquals(r['value'], '20')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction')
+ self.assertEqual(r['value'], '20')
r = self.do_set('bts.0.trx.0.max-power-reduction', '22')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction')
- self.assertEquals(r['value'], '22')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction')
+ self.assertEqual(r['value'], '22')
r = self.do_get('bts.0.trx.0.max-power-reduction')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction')
- self.assertEquals(r['value'], '22')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction')
+ self.assertEqual(r['value'], '22')
r = self.do_set('bts.0.trx.0.max-power-reduction', '1')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Value must be even')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Value must be even')
def testTrxArfcn(self):
r = self.do_get('bts.0.trx.0.arfcn')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.trx.0.arfcn')
- self.assertEquals(r['value'], '871')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.trx.0.arfcn')
+ self.assertEqual(r['value'], '871')
r = self.do_set('bts.0.trx.0.arfcn', '873')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'bts.0.trx.0.arfcn')
- self.assertEquals(r['value'], '873')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.trx.0.arfcn')
+ self.assertEqual(r['value'], '873')
r = self.do_get('bts.0.trx.0.arfcn')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.trx.0.arfcn')
- self.assertEquals(r['value'], '873')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.trx.0.arfcn')
+ self.assertEqual(r['value'], '873')
r = self.do_set('bts.0.trx.0.arfcn', '2000')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Input not within the range')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Input not within the range')
def testRfLock(self):
r = self.do_get('bts.0.rf_state')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.rf_state')
- self.assertEquals(r['value'], 'inoperational,unlocked,on')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.rf_state')
+ self.assertEqual(r['value'], 'inoperational,unlocked,on')
r = self.do_set('rf_locked', '1')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'rf_locked')
- self.assertEquals(r['value'], '1')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'rf_locked')
+ self.assertEqual(r['value'], '1')
time.sleep(1.5)
r = self.do_get('bts.0.rf_state')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.rf_state')
- self.assertEquals(r['value'], 'inoperational,locked,off')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.rf_state')
+ self.assertEqual(r['value'], 'inoperational,locked,off')
r = self.do_get('rf_locked')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'rf_locked')
- self.assertEquals(r['value'], 'state=off,policy=off')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'rf_locked')
+ self.assertEqual(r['value'], 'state=off,policy=off')
r = self.do_set('rf_locked', '0')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'rf_locked')
- self.assertEquals(r['value'], '0')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'rf_locked')
+ self.assertEqual(r['value'], '0')
time.sleep(1.5)
r = self.do_get('bts.0.rf_state')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.rf_state')
- self.assertEquals(r['value'], 'inoperational,unlocked,on')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.rf_state')
+ self.assertEqual(r['value'], 'inoperational,unlocked,on')
r = self.do_get('rf_locked')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'rf_locked')
- self.assertEquals(r['value'], 'state=off,policy=on')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'rf_locked')
+ self.assertEqual(r['value'], 'state=off,policy=on')
def testTimezone(self):
r = self.do_get('timezone')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'timezone')
- self.assertEquals(r['value'], 'off')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'timezone')
+ self.assertEqual(r['value'], 'off')
r = self.do_set('timezone', '-2,15,2')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'timezone')
- self.assertEquals(r['value'], '-2,15,2')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'timezone')
+ self.assertEqual(r['value'], '-2,15,2')
r = self.do_get('timezone')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'timezone')
- self.assertEquals(r['value'], '-2,15,2')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'timezone')
+ self.assertEqual(r['value'], '-2,15,2')
# Test invalid input
r = self.do_set('timezone', '-2,15,2,5,6,7')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'timezone')
- self.assertEquals(r['value'], '-2,15,2')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'timezone')
+ self.assertEqual(r['value'], '-2,15,2')
r = self.do_set('timezone', '-2,15')
- self.assertEquals(r['mtype'], 'ERROR')
+ self.assertEqual(r['mtype'], 'ERROR')
r = self.do_set('timezone', '-2')
- self.assertEquals(r['mtype'], 'ERROR')
+ self.assertEqual(r['mtype'], 'ERROR')
r = self.do_set('timezone', '1')
r = self.do_set('timezone', 'off')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'timezone')
- self.assertEquals(r['value'], 'off')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'timezone')
+ self.assertEqual(r['value'], 'off')
r = self.do_get('timezone')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'timezone')
- self.assertEquals(r['value'], 'off')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'timezone')
+ self.assertEqual(r['value'], 'off')
def testMcc(self):
r = self.do_set('mcc', '23')
r = self.do_get('mcc')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'mcc')
- self.assertEquals(r['value'], '023')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'mcc')
+ self.assertEqual(r['value'], '023')
r = self.do_set('mcc', '023')
r = self.do_get('mcc')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'mcc')
- self.assertEquals(r['value'], '023')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'mcc')
+ self.assertEqual(r['value'], '023')
def testMnc(self):
r = self.do_set('mnc', '9')
r = self.do_get('mnc')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'mnc')
- self.assertEquals(r['value'], '09')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'mnc')
+ self.assertEqual(r['value'], '09')
r = self.do_set('mnc', '09')
r = self.do_get('mnc')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'mnc')
- self.assertEquals(r['value'], '09')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'mnc')
+ self.assertEqual(r['value'], '09')
r = self.do_set('mnc', '009')
r = self.do_get('mnc')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'mnc')
- self.assertEquals(r['value'], '009')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'mnc')
+ self.assertEqual(r['value'], '009')
def testMccMncApply(self):
# Test some invalid input
r = self.do_set('mcc-mnc-apply', 'WRONG')
- self.assertEquals(r['mtype'], 'ERROR')
+ self.assertEqual(r['mtype'], 'ERROR')
r = self.do_set('mcc-mnc-apply', '1,')
- self.assertEquals(r['mtype'], 'ERROR')
+ self.assertEqual(r['mtype'], 'ERROR')
r = self.do_set('mcc-mnc-apply', '200,3')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'mcc-mnc-apply')
- self.assertEquals(r['value'], 'Tried to drop the BTS')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'mcc-mnc-apply')
+ self.assertEqual(r['value'], 'Tried to drop the BTS')
# Set it again
r = self.do_set('mcc-mnc-apply', '200,3')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'mcc-mnc-apply')
- self.assertEquals(r['value'], 'Nothing changed')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'mcc-mnc-apply')
+ self.assertEqual(r['value'], 'Nothing changed')
# Change it
r = self.do_set('mcc-mnc-apply', '200,4')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'mcc-mnc-apply')
- self.assertEquals(r['value'], 'Tried to drop the BTS')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'mcc-mnc-apply')
+ self.assertEqual(r['value'], 'Tried to drop the BTS')
# Change it
r = self.do_set('mcc-mnc-apply', '201,4')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'mcc-mnc-apply')
- self.assertEquals(r['value'], 'Tried to drop the BTS')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'mcc-mnc-apply')
+ self.assertEqual(r['value'], 'Tried to drop the BTS')
# Verify
r = self.do_get('mnc')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'mnc')
- self.assertEquals(r['value'], '04')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'mnc')
+ self.assertEqual(r['value'], '04')
r = self.do_get('mcc')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'mcc')
- self.assertEquals(r['value'], '201')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'mcc')
+ self.assertEqual(r['value'], '201')
# Change it
r = self.do_set('mcc-mnc-apply', '202,03')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'mcc-mnc-apply')
- self.assertEquals(r['value'], 'Tried to drop the BTS')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'mcc-mnc-apply')
+ self.assertEqual(r['value'], 'Tried to drop the BTS')
r = self.do_get('mnc')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'mnc')
- self.assertEquals(r['value'], '03')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'mnc')
+ self.assertEqual(r['value'], '03')
r = self.do_get('mcc')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'mcc')
- self.assertEquals(r['value'], '202')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'mcc')
+ self.assertEqual(r['value'], '202')
class TestCtrlNITB(TestCtrlBase):
@@ -475,103 +475,103 @@
def testNumberOfBTS(self):
r = self.do_get('number-of-bts')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'number-of-bts')
- self.assertEquals(r['value'], '1')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'number-of-bts')
+ self.assertEqual(r['value'], '1')
def testSubscriberAddWithKi(self):
"""Test that we can set the algorithm to none, xor, comp128v1"""
r = self.do_set('subscriber-modify-v1', '2620345,445566')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'subscriber-modify-v1')
- self.assertEquals(r['value'], 'OK')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'subscriber-modify-v1')
+ self.assertEqual(r['value'], 'OK')
r = self.do_set('subscriber-modify-v1', '2620345,445566,none')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'subscriber-modify-v1')
- self.assertEquals(r['value'], 'OK')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'subscriber-modify-v1')
+ self.assertEqual(r['value'], 'OK')
r = self.do_set('subscriber-modify-v1', '2620345,445566,xor')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Value failed verification.')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Value failed verification.')
r = self.do_set('subscriber-modify-v1', '2620345,445566,comp128v1,00112233445566778899AABBCCDDEEFF')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'subscriber-modify-v1')
- self.assertEquals(r['value'], 'OK')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'subscriber-modify-v1')
+ self.assertEqual(r['value'], 'OK')
r = self.do_set('subscriber-modify-v1', '2620345,445566,comp128v2,00112233445566778899AABBCCDDEEFF')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'subscriber-modify-v1')
- self.assertEquals(r['value'], 'OK')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'subscriber-modify-v1')
+ self.assertEqual(r['value'], 'OK')
r = self.do_set('subscriber-modify-v1', '2620345,445566,comp128v3,00112233445566778899AABBCCDDEEFF')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'subscriber-modify-v1')
- self.assertEquals(r['value'], 'OK')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'subscriber-modify-v1')
+ self.assertEqual(r['value'], 'OK')
r = self.do_set('subscriber-modify-v1', '2620345,445566,none')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'subscriber-modify-v1')
- self.assertEquals(r['value'], 'OK')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'subscriber-modify-v1')
+ self.assertEqual(r['value'], 'OK')
def testSubscriberAddRemove(self):
r = self.do_set('subscriber-modify-v1', '2620345,445566')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'subscriber-modify-v1')
- self.assertEquals(r['value'], 'OK')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'subscriber-modify-v1')
+ self.assertEqual(r['value'], 'OK')
r = self.do_set('subscriber-modify-v1', '2620345,445567')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'subscriber-modify-v1')
- self.assertEquals(r['value'], 'OK')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'subscriber-modify-v1')
+ self.assertEqual(r['value'], 'OK')
# TODO. verify that the entry has been created and modified? Invoke
# the sqlite3 CLI or do it through the DB libraries?
r = self.do_set('subscriber-delete-v1', '2620345')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['value'], 'Removed')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['value'], 'Removed')
r = self.do_set('subscriber-delete-v1', '2620345')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Failed to find subscriber')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Failed to find subscriber')
def testSubscriberList(self):
# TODO. Add command to mark a subscriber as active
r = self.do_get('subscriber-list-active-v1')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'subscriber-list-active-v1')
- self.assertEquals(r['value'], None)
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'subscriber-list-active-v1')
+ self.assertEqual(r['value'], None)
def testApplyConfiguration(self):
r = self.do_get('bts.0.apply-configuration')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Write Only attribute')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Write Only attribute')
r = self.do_set('bts.0.apply-configuration', '1')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['value'], 'Tried to drop the BTS')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['value'], 'Tried to drop the BTS')
def testGprsMode(self):
r = self.do_get('bts.0.gprs-mode')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.gprs-mode')
- self.assertEquals(r['value'], 'none')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.gprs-mode')
+ self.assertEqual(r['value'], 'none')
r = self.do_set('bts.0.gprs-mode', 'bla')
- self.assertEquals(r['mtype'], 'ERROR')
- self.assertEquals(r['error'], 'Mode is not known')
+ self.assertEqual(r['mtype'], 'ERROR')
+ self.assertEqual(r['error'], 'Mode is not known')
r = self.do_set('bts.0.gprs-mode', 'egprs')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['value'], 'egprs')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['value'], 'egprs')
r = self.do_get('bts.0.gprs-mode')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'bts.0.gprs-mode')
- self.assertEquals(r['value'], 'egprs')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'bts.0.gprs-mode')
+ self.assertEqual(r['value'], 'egprs')
class TestCtrlNAT(TestCtrlBase):
@@ -584,38 +584,38 @@
def testAccessList(self):
r = self.do_get('net.0.bsc_cfg.0.access-list-name')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'net')
- self.assertEquals(r['value'], None)
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'net')
+ self.assertEqual(r['value'], None)
r = self.do_set('net.0.bsc_cfg.0.access-list-name', 'bla')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'net')
- self.assertEquals(r['value'], 'bla')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'net')
+ self.assertEqual(r['value'], 'bla')
r = self.do_get('net.0.bsc_cfg.0.access-list-name')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'net')
- self.assertEquals(r['value'], 'bla')
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'net')
+ self.assertEqual(r['value'], 'bla')
r = self.do_set('net.0.bsc_cfg.0.no-access-list-name', '1')
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'net')
- self.assertEquals(r['value'], None)
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'net')
+ self.assertEqual(r['value'], None)
r = self.do_get('net.0.bsc_cfg.0.access-list-name')
- self.assertEquals(r['mtype'], 'GET_REPLY')
- self.assertEquals(r['var'], 'net')
- self.assertEquals(r['value'], None)
+ self.assertEqual(r['mtype'], 'GET_REPLY')
+ self.assertEqual(r['var'], 'net')
+ self.assertEqual(r['value'], None)
def testAccessListManagement(self):
r = self.do_set("net.0.add.allow.access-list.404", "abc")
- self.assertEquals(r['mtype'], 'ERROR')
+ self.assertEqual(r['mtype'], 'ERROR')
r = self.do_set("net.0.add.allow.access-list.bla", "^234$")
- self.assertEquals(r['mtype'], 'SET_REPLY')
- self.assertEquals(r['var'], 'net.0.add.allow.access-list.bla')
- self.assertEquals(r['value'], 'IMSI allow added to access list')
+ self.assertEqual(r['mtype'], 'SET_REPLY')
+ self.assertEqual(r['var'], 'net.0.add.allow.access-list.bla')
+ self.assertEqual(r['value'], 'IMSI allow added to access list')
# TODO.. find a way to actually see if this rule has been
# added. e.g. by implementing a get for the list.
@@ -664,9 +664,9 @@
if args.p:
confpath = args.p
- print "confpath %s, workdir %s" % (confpath, workdir)
+ print("confpath %s, workdir %s" % (confpath, workdir))
os.chdir(workdir)
- print "Running tests for specific control commands"
+ print("Running tests for specific control commands")
suite = unittest.TestSuite()
add_bsc_test(suite, workdir)
add_nitb_test(suite, workdir)
diff --git a/openbsc/tests/smpp_test_runner.py b/openbsc/tests/smpp_test_runner.py
index eccfa6b..a34d7ba 100755
--- a/openbsc/tests/smpp_test_runner.py
+++ b/openbsc/tests/smpp_test_runner.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
# (C) 2014 by Holger Hans Peter Freyther
# based on vty_test_runner.py:
@@ -46,8 +46,8 @@
try:
self.proc = osmoutil.popen_devnull(osmo_vty_cmd)
except OSError:
- print >> sys.stderr, "Current directory: %s" % os.getcwd()
- print >> sys.stderr, "Consider setting -b"
+ print("Current directory: %s" % os.getcwd(), file=sys.stderr)
+ print("Consider setting -b", file=sys.stderr)
appstring = self.vty_app()[2]
appport = self.vty_app()[0]
@@ -73,14 +73,14 @@
# Enable the configuration
self.vty.enable()
self.assertTrue(self.vty.verify("configure terminal", ['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.assertTrue(self.vty.verify('smpp', ['']))
- self.assertEquals(self.vty.node(), 'config-smpp')
+ self.assertEqual(self.vty.node(), 'config-smpp')
self.assertTrue(self.vty.verify('system-id test', ['']))
self.assertTrue(self.vty.verify('local-tcp-port 2775', ['']))
self.assertTrue(self.vty.verify('esme test', ['']))
- self.assertEquals(self.vty.node(), 'config-smpp-esme')
+ self.assertEqual(self.vty.node(), 'config-smpp-esme')
self.assertTrue(self.vty.verify('default-route', ['']))
self.assertTrue(self.vty.verify('end', ['']))
@@ -88,7 +88,7 @@
sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sck.setblocking(1)
sck.connect(('0.0.0.0', 2775))
- sck.sendall('\x00\x00\x00\x02\x00')
+ sck.sendall(b'\x00\x00\x00\x02\x00')
sck.close()
# Check if the VTY is still there
@@ -98,7 +98,7 @@
sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sck.setblocking(1)
sck.connect(('0.0.0.0', 2775))
- sck.sendall('\x00\x01\x00\x01\x01')
+ sck.sendall(b'\x00\x01\x00\x01\x01')
sck.close()
self.vty.verify('enable',[''])
@@ -128,9 +128,9 @@
if args.p:
confpath = args.p
- print "confpath %s, workdir %s" % (confpath, workdir)
+ print("confpath %s, workdir %s" % (confpath, workdir))
os.chdir(workdir)
- print "Running tests for specific SMPP"
+ print("Running tests for specific SMPP")
suite = unittest.TestSuite()
suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestSMPPNITB))
res = unittest.TextTestRunner(verbosity=verbose_level).run(suite)
diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py
index 67adb71..8044e61 100755
--- a/openbsc/tests/vty_test_runner.py
+++ b/openbsc/tests/vty_test_runner.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
# (C) 2013 by Katerina Barone-Adesi <kat.obsc at gmail.com>
# (C) 2013 by Holger Hans Peter Freyther
@@ -51,8 +51,8 @@
try:
self.proc = osmoutil.popen_devnull(osmo_vty_cmd)
except OSError:
- print >> sys.stderr, "Current directory: %s" % os.getcwd()
- print >> sys.stderr, "Consider setting -b"
+ print("Current directory: %s" % os.getcwd(), file=sys.stderr)
+ print("Consider setting -b", file=sys.stderr)
appstring = self.vty_app()[2]
appport = self.vty_app()[0]
@@ -75,28 +75,28 @@
def testForcePtime(self):
self.vty.enable()
res = self.vty.command("show running-config")
- self.assert_(res.find(' rtp force-ptime 20\r') > 0)
- self.assertEquals(res.find(' no rtp force-ptime\r'), -1)
+ self.assertTrue(res.find(' rtp force-ptime 20\r') > 0)
+ self.assertEqual(res.find(' no rtp force-ptime\r'), -1)
self.vty.command("configure terminal")
self.vty.command("mgcp")
self.vty.command("no rtp force-ptime")
res = self.vty.command("show running-config")
- self.assertEquals(res.find(' rtp force-ptime 20\r'), -1)
- self.assertEquals(res.find(' no rtp force-ptime\r'), -1)
+ self.assertEqual(res.find(' rtp force-ptime 20\r'), -1)
+ self.assertEqual(res.find(' no rtp force-ptime\r'), -1)
def testOmitAudio(self):
self.vty.enable()
res = self.vty.command("show running-config")
- self.assert_(res.find(' sdp audio-payload send-name\r') > 0)
- self.assertEquals(res.find(' no sdp audio-payload send-name\r'), -1)
+ self.assertTrue(res.find(' sdp audio-payload send-name\r') > 0)
+ self.assertEqual(res.find(' no sdp audio-payload send-name\r'), -1)
self.vty.command("configure terminal")
self.vty.command("mgcp")
self.vty.command("no sdp audio-payload send-name")
res = self.vty.command("show running-config")
- self.assertEquals(res.find(' rtp sdp audio-payload send-name\r'), -1)
- self.assert_(res.find(' no sdp audio-payload send-name\r') > 0)
+ self.assertEqual(res.find(' rtp sdp audio-payload send-name\r'), -1)
+ self.assertTrue(res.find(' no sdp audio-payload send-name\r') > 0)
# TODO: test it for the trunk!
@@ -109,18 +109,18 @@
# enable.. disable bts-bind-ip
self.vty.command("rtp bts-bind-ip 254.253.252.250")
res = self.vty.command("show running-config")
- self.assert_(res.find('rtp bts-bind-ip 254.253.252.250') > 0)
+ self.assertTrue(res.find('rtp bts-bind-ip 254.253.252.250') > 0)
self.vty.command("no rtp bts-bind-ip")
res = self.vty.command("show running-config")
- self.assertEquals(res.find(' rtp bts-bind-ip'), -1)
+ self.assertEqual(res.find(' rtp bts-bind-ip'), -1)
# enable.. disable net-bind-ip
self.vty.command("rtp net-bind-ip 254.253.252.250")
res = self.vty.command("show running-config")
- self.assert_(res.find('rtp net-bind-ip 254.253.252.250') > 0)
+ self.assertTrue(res.find('rtp net-bind-ip 254.253.252.250') > 0)
self.vty.command("no rtp net-bind-ip")
res = self.vty.command("show running-config")
- self.assertEquals(res.find(' rtp net-bind-ip'), -1)
+ self.assertEqual(res.find(' rtp net-bind-ip'), -1)
class TestVTYGenericBSC(TestVTYBase):
@@ -128,42 +128,42 @@
def checkForEndAndExit(self):
res = self.vty.command("list")
#print ('looking for "exit"\n')
- self.assert_(res.find(' exit\r') > 0)
+ self.assertTrue(res.find(' exit\r') > 0)
#print 'found "exit"\nlooking for "end"\n'
- self.assert_(res.find(' end\r') > 0)
+ self.assertTrue(res.find(' end\r') > 0)
#print 'found "end"\n'
def _testConfigNetworkTree(self):
self.vty.enable()
self.assertTrue(self.vty.verify("configure terminal",['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify("network",['']))
- self.assertEquals(self.vty.node(), 'config-net')
+ self.assertEqual(self.vty.node(), 'config-net')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify("bts 0",['']))
- self.assertEquals(self.vty.node(), 'config-net-bts')
+ self.assertEqual(self.vty.node(), 'config-net-bts')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify("trx 0",['']))
- self.assertEquals(self.vty.node(), 'config-net-bts-trx')
+ self.assertEqual(self.vty.node(), 'config-net-bts-trx')
self.checkForEndAndExit()
self.vty.command("write terminal")
self.assertTrue(self.vty.verify("exit",['']))
- self.assertEquals(self.vty.node(), 'config-net-bts')
+ self.assertEqual(self.vty.node(), 'config-net-bts')
self.assertTrue(self.vty.verify("exit",['']))
self.assertTrue(self.vty.verify("bts 1",['']))
- self.assertEquals(self.vty.node(), 'config-net-bts')
+ self.assertEqual(self.vty.node(), 'config-net-bts')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify("trx 1",['']))
- self.assertEquals(self.vty.node(), 'config-net-bts-trx')
+ self.assertEqual(self.vty.node(), 'config-net-bts-trx')
self.checkForEndAndExit()
self.vty.command("write terminal")
self.assertTrue(self.vty.verify("exit",['']))
- self.assertEquals(self.vty.node(), 'config-net-bts')
+ self.assertEqual(self.vty.node(), 'config-net-bts')
self.assertTrue(self.vty.verify("exit",['']))
- self.assertEquals(self.vty.node(), 'config-net')
+ self.assertEqual(self.vty.node(), 'config-net')
self.assertTrue(self.vty.verify("exit",['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.assertTrue(self.vty.verify("exit",['']))
self.assertTrue(self.vty.node() is None)
@@ -196,35 +196,35 @@
# check the default
res = self.vty.command("write terminal")
- self.assert_(res.find(' no smpp-first') > 0)
+ self.assertTrue(res.find(' no smpp-first') > 0)
self.vty.verify("smpp-first", [''])
res = self.vty.command("write terminal")
- self.assert_(res.find(' smpp-first') > 0)
- self.assertEquals(res.find('no smpp-first'), -1)
+ self.assertTrue(res.find(' smpp-first') > 0)
+ self.assertEqual(res.find('no smpp-first'), -1)
self.vty.verify("no smpp-first", [''])
res = self.vty.command("write terminal")
- self.assert_(res.find('no smpp-first') > 0)
+ self.assertTrue(res.find('no smpp-first') > 0)
def testVtyTree(self):
self.vty.enable()
self.assertTrue(self.vty.verify("configure terminal", ['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify('mncc-int', ['']))
- self.assertEquals(self.vty.node(), 'config-mncc-int')
+ self.assertEqual(self.vty.node(), 'config-mncc-int')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify('exit', ['']))
if self.checkForSmpp():
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.assertTrue(self.vty.verify('smpp', ['']))
- self.assertEquals(self.vty.node(), 'config-smpp')
+ self.assertEqual(self.vty.node(), 'config-smpp')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify("exit", ['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.assertTrue(self.vty.verify("exit", ['']))
self.assertTrue(self.vty.node() is None)
@@ -234,10 +234,10 @@
if self.checkForSmpp():
self.vty.command('smpp')
- self.assertEquals(self.vty.node(), 'config-smpp')
+ self.assertEqual(self.vty.node(), 'config-smpp')
self.vty.command('mncc-int')
- self.assertEquals(self.vty.node(), 'config-mncc-int')
+ self.assertEqual(self.vty.node(), 'config-mncc-int')
def testVtyAuthorization(self):
self.vty.enable()
@@ -267,7 +267,7 @@
self.vty.command("si2quater neighbor-list del earfcn 1911")
self.vty.command("si2quater neighbor-list del earfcn 1924")
self.vty.command("si2quater neighbor-list del earfcn 2111")
- self.assertEquals(before, self.vty.command("show running-config"))
+ self.assertEqual(before, self.vty.command("show running-config"))
self.vty.command("si2quater neighbor-list add uarfcn 1976 13 1")
self.vty.command("si2quater neighbor-list add uarfcn 1976 38 1")
self.vty.command("si2quater neighbor-list add uarfcn 1976 44 1")
@@ -290,7 +290,7 @@
self.vty.command("si2quater neighbor-list del uarfcn 1976 224")
self.vty.command("si2quater neighbor-list del uarfcn 1976 225")
self.vty.command("si2quater neighbor-list del uarfcn 1976 226")
- self.assertEquals(before, self.vty.command("show running-config"))
+ self.assertEqual(before, self.vty.command("show running-config"))
def testEnableDisablePeriodicLU(self):
self.vty.enable()
@@ -306,14 +306,14 @@
# Enable periodic lu..
self.vty.verify("periodic location update 60", [''])
res = self.vty.command("write terminal")
- self.assert_(res.find('periodic location update 60') > 0)
- self.assertEquals(res.find('no periodic location update'), -1)
+ self.assertTrue(res.find('periodic location update 60') > 0)
+ self.assertEqual(res.find('no periodic location update'), -1)
# Now disable it..
self.vty.verify("no periodic location update", [''])
res = self.vty.command("write terminal")
- self.assertEquals(res.find('periodic location update 60'), -1)
- self.assert_(res.find('no periodic location update') > 0)
+ self.assertEqual(res.find('periodic location update 60'), -1)
+ self.assertTrue(res.find('no periodic location update') > 0)
def testEnableDisableSiHacks(self):
self.vty.enable()
@@ -324,14 +324,14 @@
# Enable periodic lu..
self.vty.verify("force-combined-si", [''])
res = self.vty.command("write terminal")
- self.assert_(res.find(' force-combined-si') > 0)
- self.assertEquals(res.find('no force-combined-si'), -1)
+ self.assertTrue(res.find(' force-combined-si') > 0)
+ self.assertEqual(res.find('no force-combined-si'), -1)
# Now disable it..
self.vty.verify("no force-combined-si", [''])
res = self.vty.command("write terminal")
- self.assertEquals(res.find(' force-combined-si'), -1)
- self.assert_(res.find('no force-combined-si') > 0)
+ self.assertEqual(res.find(' force-combined-si'), -1)
+ self.assertTrue(res.find('no force-combined-si') > 0)
def testRachAccessControlClass(self):
self.vty.enable()
@@ -355,7 +355,7 @@
res = self.vty.command("write terminal")
for classNum in range(16):
if classNum != 10:
- self.assert_(res.find("rach access-control-class " + str(classNum) + " barred") > 0)
+ self.assertTrue(res.find("rach access-control-class " + str(classNum) + " barred") > 0)
# Allowed rach access control classes
for classNum in range(16):
@@ -366,7 +366,7 @@
res = self.vty.command("write terminal")
for classNum in range(16):
if classNum != 10:
- self.assertEquals(res.find("rach access-control-class " + str(classNum) + " barred"), -1)
+ self.assertEqual(res.find("rach access-control-class " + str(classNum) + " barred"), -1)
def testSubscriberCreateDeleteTwice(self):
"""
@@ -385,23 +385,23 @@
# Lets create one
res = self.vty.command('subscriber create imsi '+imsi)
- self.assert_(res.find(" IMSI: "+imsi) > 0)
+ self.assertTrue(res.find(" IMSI: "+imsi) > 0)
# And now create one again.
res2 = self.vty.command('subscriber create imsi '+imsi)
- self.assert_(res2.find(" IMSI: "+imsi) > 0)
+ self.assertTrue(res2.find(" IMSI: "+imsi) > 0)
self.assertEqual(res, res2)
# Verify it has been created
res = self.vty.command('show subscriber imsi '+imsi)
- self.assert_(res.find(" IMSI: "+imsi) > 0)
+ self.assertTrue(res.find(" IMSI: "+imsi) > 0)
# Delete it
res = self.vty.command('subscriber imsi ' + imsi + ' delete')
- self.assert_("" == res)
+ self.assertTrue("" == res)
# Now it should not be there anymore
res = self.vty.command('show subscriber imsi '+imsi)
- self.assert_(('% No subscriber found for imsi ' + imsi) == res)
+ self.assertTrue(('% No subscriber found for imsi ' + imsi) == res)
def testSubscriberCreateDelete(self):
@@ -417,12 +417,12 @@
# Lets create one
res = self.vty.command('subscriber create imsi '+imsi)
- self.assert_(res.find(" IMSI: "+imsi) > 0)
- self.assert_(res.find("Extension") > 0)
+ self.assertTrue(res.find(" IMSI: "+imsi) > 0)
+ self.assertTrue(res.find("Extension") > 0)
# Now we have it
res = self.vty.command('show subscriber imsi '+imsi)
- self.assert_(res.find(" IMSI: "+imsi) > 0)
+ self.assertTrue(res.find(" IMSI: "+imsi) > 0)
# With narrow random interval
self.vty.command("configure terminal")
@@ -431,16 +431,16 @@
# wrong interval
res = self.vty.command("subscriber-create-on-demand random 221 122")
# error string will contain arguments
- self.assert_(res.find("122") > 0)
- self.assert_(res.find("221") > 0)
+ self.assertTrue(res.find("122") > 0)
+ self.assertTrue(res.find("221") > 0)
# correct interval - silent ok
self.assertTrue(self.vty.verify("subscriber-create-on-demand random 221 222", ['']))
self.vty.command("end")
res = self.vty.command('subscriber create imsi ' + imsi2)
- self.assert_(res.find(" IMSI: " + imsi2) > 0)
- self.assert_(res.find("221") > 0 or res.find("222") > 0)
- self.assert_(res.find(" Extension: ") > 0)
+ self.assertTrue(res.find(" IMSI: " + imsi2) > 0)
+ self.assertTrue(res.find("221") > 0 or res.find("222") > 0)
+ self.assertTrue(res.find(" Extension: ") > 0)
# Without extension
self.vty.command("configure terminal")
@@ -448,8 +448,8 @@
self.assertTrue(self.vty.verify("subscriber-create-on-demand no-extension", ['']))
self.vty.command("end")
res = self.vty.command('subscriber create imsi ' + imsi3)
- self.assert_(res.find(" IMSI: " + imsi3) > 0)
- self.assertEquals(res.find("Extension"), -1)
+ self.assertTrue(res.find(" IMSI: " + imsi3) > 0)
+ self.assertEqual(res.find("Extension"), -1)
# With extension again
self.vty.command("configure terminal")
@@ -460,22 +460,22 @@
self.vty.command("end")
res = self.vty.command('subscriber create imsi ' + imsi4)
- self.assert_(res.find(" IMSI: " + imsi4) > 0)
- self.assert_(res.find(" Extension: ") > 0)
+ self.assertTrue(res.find(" IMSI: " + imsi4) > 0)
+ self.assertTrue(res.find(" Extension: ") > 0)
# Delete it
res = self.vty.command('subscriber imsi ' + imsi + ' delete')
- self.assert_("" == res)
+ self.assertTrue("" == res)
res = self.vty.command('subscriber imsi ' + imsi2 + ' delete')
- self.assert_("" == res)
+ self.assertTrue("" == res)
res = self.vty.command('subscriber imsi ' + imsi3 + ' delete')
- self.assert_("" == res)
+ self.assertTrue("" == res)
res = self.vty.command('subscriber imsi ' + imsi4 + ' delete')
- self.assert_("" == res)
+ self.assertTrue("" == res)
# Now it should not be there anymore
res = self.vty.command('show subscriber imsi '+imsi)
- self.assert_(('% No subscriber found for imsi ' + imsi) == res)
+ self.assertTrue(('% No subscriber found for imsi ' + imsi) == res)
# range
self.vty.command("end")
@@ -483,20 +483,20 @@
self.vty.command("nitb")
self.assertTrue(self.vty.verify("subscriber-create-on-demand random 9999999998 9999999999", ['']))
res = self.vty.command("show running-config")
- self.assert_(res.find("subscriber-create-on-demand random 9999999998 9999999999"))
+ self.assertTrue(res.find("subscriber-create-on-demand random 9999999998 9999999999"))
self.vty.command("end")
res = self.vty.command('subscriber create imsi ' + imsi)
print(res)
- self.assert_(res.find(" IMSI: " + imsi) > 0)
- self.assert_(res.find("9999999998") > 0 or res.find("9999999999") > 0)
- self.assert_(res.find(" Extension: ") > 0)
+ self.assertTrue(res.find(" IMSI: " + imsi) > 0)
+ self.assertTrue(res.find("9999999998") > 0 or res.find("9999999999") > 0)
+ self.assertTrue(res.find(" Extension: ") > 0)
res = self.vty.command('subscriber imsi ' + imsi + ' delete')
- self.assert_("" == res)
+ self.assertTrue("" == res)
res = self.vty.command('show subscriber imsi '+imsi)
- self.assert_(('% No subscriber found for imsi ' + imsi) == res)
+ self.assertTrue(('% No subscriber found for imsi ' + imsi) == res)
def testSubscriberSettings(self):
@@ -508,18 +508,18 @@
# Lets create one
res = self.vty.command('subscriber create imsi '+imsi)
- self.assert_(res.find(" IMSI: "+imsi) > 0)
- self.assert_(res.find("Extension") > 0)
+ self.assertTrue(res.find(" IMSI: "+imsi) > 0)
+ self.assertTrue(res.find("Extension") > 0)
self.vty.verify('subscriber imsi '+wrong_imsi+' name wrong', ['% No subscriber found for imsi '+wrong_imsi])
res = self.vty.command('subscriber imsi '+imsi+' name '+('X' * 160))
- self.assert_(res.find("NAME is too long") > 0)
+ self.assertTrue(res.find("NAME is too long") > 0)
self.vty.verify('subscriber imsi '+imsi+' name '+('G' * 159), [''])
self.vty.verify('subscriber imsi '+wrong_imsi+' extension 840', ['% No subscriber found for imsi '+wrong_imsi])
res = self.vty.command('subscriber imsi '+imsi+' extension '+('9' * 15))
- self.assert_(res.find("EXTENSION is too long") > 0)
+ self.assertTrue(res.find("EXTENSION is too long") > 0)
self.vty.verify('subscriber imsi '+imsi+' extension '+('1' * 14), [''])
@@ -529,34 +529,34 @@
self.assertTrue(self.vty.verify("subscriber-create-on-demand", ['']))
# wrong interval
res = self.vty.command("subscriber-create-on-demand random 221 122")
- self.assert_(res.find("122") > 0)
- self.assert_(res.find("221") > 0)
+ self.assertTrue(res.find("122") > 0)
+ self.assertTrue(res.find("221") > 0)
# correct interval
self.assertTrue(self.vty.verify("subscriber-create-on-demand random 221 222", ['']))
self.vty.command("end")
# create subscriber with extension in a configured interval
res = self.vty.command('subscriber create imsi ' + imsi2)
- self.assert_(res.find(" IMSI: " + imsi2) > 0)
- self.assert_(res.find("221") > 0 or res.find("222") > 0)
- self.assert_(res.find(" Extension: ") > 0)
+ self.assertTrue(res.find(" IMSI: " + imsi2) > 0)
+ self.assertTrue(res.find("221") > 0 or res.find("222") > 0)
+ self.assertTrue(res.find(" Extension: ") > 0)
# Delete it
res = self.vty.command('subscriber imsi ' + imsi + ' delete')
- self.assert_(res != "")
+ self.assertTrue(res != "")
# imsi2 is inactive so deletion should succeed
res = self.vty.command('subscriber imsi ' + imsi2 + ' delete')
- self.assert_("" == res)
+ self.assertTrue("" == res)
def testShowPagingGroup(self):
res = self.vty.command("show paging-group 255 1234567")
self.assertEqual(res, "% can't find BTS 255")
res = self.vty.command("show paging-group 0 1234567")
- self.assertEquals(res, "%Paging group for IMSI 1234567 on BTS #0 is 7")
+ self.assertEqual(res, "%Paging group for IMSI 1234567 on BTS #0 is 7")
def testShowNetwork(self):
res = self.vty.command("show network")
- self.assert_(res.startswith('BSC is on Country Code') >= 0)
+ self.assertTrue(res.startswith('BSC is on Country Code') >= 0)
def testMeasurementFeed(self):
self.vty.enable()
@@ -564,17 +564,17 @@
self.vty.command("mncc-int")
res = self.vty.command("write terminal")
- self.assertEquals(res.find('meas-feed scenario'), -1)
+ self.assertEqual(res.find('meas-feed scenario'), -1)
self.vty.command("meas-feed scenario bla")
res = self.vty.command("write terminal")
- self.assert_(res.find('meas-feed scenario bla') > 0)
+ self.assertTrue(res.find('meas-feed scenario bla') > 0)
self.vty.command("meas-feed scenario abcdefghijklmnopqrstuvwxyz01234567890")
res = self.vty.command("write terminal")
- self.assertEquals(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234567890'), -1)
- self.assertEquals(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz012345'), -1)
- self.assert_(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234') > 0)
+ self.assertEqual(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234567890'), -1)
+ self.assertEqual(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz012345'), -1)
+ self.assertTrue(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234') > 0)
class TestVTYBSC(TestVTYGenericBSC):
@@ -592,18 +592,18 @@
def testVtyTree(self):
self.vty.enable()
self.assertTrue(self.vty.verify("configure terminal", ['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify("msc 0", ['']))
- self.assertEquals(self.vty.node(), 'config-msc')
+ self.assertEqual(self.vty.node(), 'config-msc')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify("exit", ['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.assertTrue(self.vty.verify("bsc", ['']))
- self.assertEquals(self.vty.node(), 'config-bsc')
+ self.assertEqual(self.vty.node(), 'config-bsc')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify("exit", ['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.assertTrue(self.vty.verify("exit", ['']))
self.assertTrue(self.vty.node() is None)
@@ -624,12 +624,12 @@
# Verify settings
res = self.vty.command("write terminal")
- self.assert_(res.find('bsc-msc-lost-text MSC disconnected') > 0)
- self.assertEquals(res.find('no bsc-msc-lost-text'), -1)
- self.assert_(res.find('bsc-welcome-text Hello MS') > 0)
- self.assertEquals(res.find('no bsc-welcome-text'), -1)
- self.assert_(res.find('bsc-grace-text In grace period') > 0)
- self.assertEquals(res.find('no bsc-grace-text'), -1)
+ self.assertTrue(res.find('bsc-msc-lost-text MSC disconnected') > 0)
+ self.assertEqual(res.find('no bsc-msc-lost-text'), -1)
+ self.assertTrue(res.find('bsc-welcome-text Hello MS') > 0)
+ self.assertEqual(res.find('no bsc-welcome-text'), -1)
+ self.assertTrue(res.find('bsc-grace-text In grace period') > 0)
+ self.assertEqual(res.find('no bsc-grace-text'), -1)
# Now disable it..
self.vty.verify("no bsc-msc-lost-text", [''])
@@ -638,12 +638,12 @@
# Verify settings
res = self.vty.command("write terminal")
- self.assertEquals(res.find('bsc-msc-lost-text MSC disconnected'), -1)
- self.assert_(res.find('no bsc-msc-lost-text') > 0)
- self.assertEquals(res.find('bsc-welcome-text Hello MS'), -1)
- self.assert_(res.find('no bsc-welcome-text') > 0)
- self.assertEquals(res.find('bsc-grace-text In grace period'), -1)
- self.assert_(res.find('no bsc-grace-text') > 0)
+ self.assertEqual(res.find('bsc-msc-lost-text MSC disconnected'), -1)
+ self.assertTrue(res.find('no bsc-msc-lost-text') > 0)
+ self.assertEqual(res.find('bsc-welcome-text Hello MS'), -1)
+ self.assertTrue(res.find('no bsc-welcome-text') > 0)
+ self.assertEqual(res.find('bsc-grace-text In grace period'), -1)
+ self.assertTrue(res.find('no bsc-grace-text') > 0)
def testUssdNotificationsBsc(self):
self.vty.enable()
@@ -658,16 +658,16 @@
# Verify settings
res = self.vty.command("write terminal")
- self.assert_(res.find('missing-msc-text No MSC found') > 0)
- self.assertEquals(res.find('no missing-msc-text'), -1)
+ self.assertTrue(res.find('missing-msc-text No MSC found') > 0)
+ self.assertEqual(res.find('no missing-msc-text'), -1)
# Now disable it..
self.vty.verify("no missing-msc-text", [''])
# Verify settings
res = self.vty.command("write terminal")
- self.assertEquals(res.find('missing-msc-text No MSC found'), -1)
- self.assert_(res.find('no missing-msc-text') > 0)
+ self.assertEqual(res.find('missing-msc-text No MSC found'), -1)
+ self.assertTrue(res.find('no missing-msc-text') > 0)
def testNetworkTimezone(self):
self.vty.enable()
@@ -685,26 +685,26 @@
# Verify settings
res = self.vty.command("write terminal")
- self.assert_(res.find('timezone 2 30') > 0)
- self.assertEquals(res.find('timezone 2 30 '), -1)
+ self.assertTrue(res.find('timezone 2 30') > 0)
+ self.assertEqual(res.find('timezone 2 30 '), -1)
# Set time zone with DST
self.vty.verify("timezone 2 30 1", [''])
# Verify settings
res = self.vty.command("write terminal")
- self.assert_(res.find('timezone 2 30 1') > 0)
+ self.assertTrue(res.find('timezone 2 30 1') > 0)
# Now disable it..
self.vty.verify("no timezone", [''])
# Verify settings
res = self.vty.command("write terminal")
- self.assertEquals(res.find(' timezone'), -1)
+ self.assertEqual(res.find(' timezone'), -1)
def testShowNetwork(self):
res = self.vty.command("show network")
- self.assert_(res.startswith('BSC is on Country Code') >= 0)
+ self.assertTrue(res.startswith('BSC is on Country Code') >= 0)
def testPingPongConfiguration(self):
self.vty.enable()
@@ -714,28 +714,28 @@
self.vty.verify("timeout-ping 12", [''])
self.vty.verify("timeout-pong 14", [''])
res = self.vty.command("show running-config")
- self.assert_(res.find(" timeout-ping 12") > 0)
- self.assert_(res.find(" timeout-pong 14") > 0)
- self.assert_(res.find(" no timeout-ping advanced") > 0)
+ self.assertTrue(res.find(" timeout-ping 12") > 0)
+ self.assertTrue(res.find(" timeout-pong 14") > 0)
+ self.assertTrue(res.find(" no timeout-ping advanced") > 0)
self.vty.verify("timeout-ping advanced", [''])
res = self.vty.command("show running-config")
- self.assert_(res.find(" timeout-ping 12") > 0)
- self.assert_(res.find(" timeout-pong 14") > 0)
- self.assert_(res.find(" timeout-ping advanced") > 0)
+ self.assertTrue(res.find(" timeout-ping 12") > 0)
+ self.assertTrue(res.find(" timeout-pong 14") > 0)
+ self.assertTrue(res.find(" timeout-ping advanced") > 0)
self.vty.verify("no timeout-ping advanced", [''])
res = self.vty.command("show running-config")
- self.assert_(res.find(" timeout-ping 12") > 0)
- self.assert_(res.find(" timeout-pong 14") > 0)
- self.assert_(res.find(" no timeout-ping advanced") > 0)
+ self.assertTrue(res.find(" timeout-ping 12") > 0)
+ self.assertTrue(res.find(" timeout-pong 14") > 0)
+ self.assertTrue(res.find(" no timeout-ping advanced") > 0)
self.vty.verify("no timeout-ping", [''])
res = self.vty.command("show running-config")
- self.assertEquals(res.find(" timeout-ping 12"), -1)
- self.assertEquals(res.find(" timeout-pong 14"), -1)
- self.assertEquals(res.find(" no timeout-ping advanced"), -1)
- self.assert_(res.find(" no timeout-ping") > 0)
+ self.assertEqual(res.find(" timeout-ping 12"), -1)
+ self.assertEqual(res.find(" timeout-pong 14"), -1)
+ self.assertEqual(res.find(" no timeout-ping advanced"), -1)
+ self.assertTrue(res.find(" no timeout-ping") > 0)
self.vty.verify("timeout-ping advanced", ['%ping handling is disabled. Enable it first.'])
@@ -743,15 +743,15 @@
self.vty.verify("timeout-ping 12", [''])
self.vty.verify("timeout-pong 14", [''])
res = self.vty.command("show running-config")
- self.assert_(res.find(" timeout-ping 12") > 0)
- self.assert_(res.find(" timeout-pong 14") > 0)
- self.assert_(res.find(" timeout-ping advanced") > 0)
+ self.assertTrue(res.find(" timeout-ping 12") > 0)
+ self.assertTrue(res.find(" timeout-pong 14") > 0)
+ self.assertTrue(res.find(" timeout-ping advanced") > 0)
def testMscDataCoreLACCI(self):
self.vty.enable()
res = self.vty.command("show running-config")
- self.assertEquals(res.find("core-location-area-code"), -1)
- self.assertEquals(res.find("core-cell-identity"), -1)
+ self.assertEqual(res.find("core-location-area-code"), -1)
+ self.assertEqual(res.find("core-cell-identity"), -1)
self.vty.command("configure terminal")
self.vty.command("msc 0")
@@ -759,8 +759,8 @@
self.vty.command("core-cell-identity 333")
res = self.vty.command("show running-config")
- self.assert_(res.find("core-location-area-code 666") > 0)
- self.assert_(res.find("core-cell-identity 333") > 0)
+ self.assertTrue(res.find("core-location-area-code 666") > 0)
+ self.assertTrue(res.find("core-cell-identity 333") > 0)
class TestVTYNAT(TestVTYGenericBSC):
@@ -781,7 +781,7 @@
nat_bsc_reload(self)
bscs2 = self.vty.command("show bscs-config")
# check that multiple calls to bscs-config-file give the same result
- self.assertEquals(bscs1, bscs2)
+ self.assertEqual(bscs1, bscs2)
# add new bsc
self.vty.command("configure terminal")
@@ -805,23 +805,23 @@
b1 = nat_bsc_sock_test(1, "xyu", verbose=True, proc=self.proc)
b2 = nat_bsc_sock_test(5, "key", verbose=True, proc=self.proc)
- self.assertEquals("3 BSCs configured", self.vty.command("show nat num-bscs-configured"))
+ self.assertEqual("3 BSCs configured", self.vty.command("show nat num-bscs-configured"))
self.assertTrue(3 == nat_bsc_num_con(self))
- self.assertEquals("MSC is connected: 1", self.vty.command("show msc connection"))
+ self.assertEqual("MSC is connected: 1", self.vty.command("show msc connection"))
nat_bsc_reload(self)
bscs2 = self.vty.command("show bscs-config")
# check that the reset to initial config succeeded
- self.assertEquals(bscs1, bscs2)
+ self.assertEqual(bscs1, bscs2)
- self.assertEquals("2 BSCs configured", self.vty.command("show nat num-bscs-configured"))
+ self.assertEqual("2 BSCs configured", self.vty.command("show nat num-bscs-configured"))
self.assertTrue(1 == nat_bsc_num_con(self))
rem = self.vty.command("show bsc connections").split(' ')
# remaining connection is for BSC0
- self.assertEquals('0', rem[2])
+ self.assertEqual('0', rem[2])
# remaining connection is authorized
- self.assertEquals('1', rem[4])
- self.assertEquals("MSC is connected: 1", self.vty.command("show msc connection"))
+ self.assertEqual('1', rem[4])
+ self.assertEqual("MSC is connected: 1", self.vty.command("show msc connection"))
finally:
msc.close()
msc_socket.close()
@@ -829,23 +829,23 @@
def testVtyTree(self):
self.vty.enable()
self.assertTrue(self.vty.verify('configure terminal', ['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify('mgcp', ['']))
- self.assertEquals(self.vty.node(), 'config-mgcp')
+ self.assertEqual(self.vty.node(), 'config-mgcp')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify('exit', ['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.assertTrue(self.vty.verify('nat', ['']))
- self.assertEquals(self.vty.node(), 'config-nat')
+ self.assertEqual(self.vty.node(), 'config-nat')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify('bsc 0', ['']))
- self.assertEquals(self.vty.node(), 'config-nat-bsc')
+ self.assertEqual(self.vty.node(), 'config-nat-bsc')
self.checkForEndAndExit()
self.assertTrue(self.vty.verify('exit', ['']))
- self.assertEquals(self.vty.node(), 'config-nat')
+ self.assertEqual(self.vty.node(), 'config-nat')
self.assertTrue(self.vty.verify('exit', ['']))
- self.assertEquals(self.vty.node(), 'config')
+ self.assertEqual(self.vty.node(), 'config')
self.assertTrue(self.vty.verify('exit', ['']))
self.assertTrue(self.vty.node() is None)
@@ -863,15 +863,15 @@
# Ensure the default
res = self.vty.command("show running-config")
- self.assert_(res.find('\n sdp-ensure-amr-mode-set') > 0)
+ self.assertTrue(res.find('\n sdp-ensure-amr-mode-set') > 0)
self.vty.command("sdp-ensure-amr-mode-set")
res = self.vty.command("show running-config")
- self.assert_(res.find('\n sdp-ensure-amr-mode-set') > 0)
+ self.assertTrue(res.find('\n sdp-ensure-amr-mode-set') > 0)
self.vty.command("no sdp-ensure-amr-mode-set")
res = self.vty.command("show running-config")
- self.assert_(res.find('\n no sdp-ensure-amr-mode-set') > 0)
+ self.assertTrue(res.find('\n no sdp-ensure-amr-mode-set') > 0)
def testRewritePostNoRewrite(self):
self.vty.enable()
@@ -916,35 +916,35 @@
ussdSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
ussdSocket.connect(('127.0.0.1', 5001))
ussdSocket.settimeout(2.0)
- print "Connected to %s:%d" % ussdSocket.getpeername()
+ print("Connected to %s:%d" % ussdSocket.getpeername())
- print "Expecting ID_GET request"
+ print("Expecting ID_GET request")
data = ussdSocket.recv(4)
- self.assertEqual(data, "\x00\x01\xfe\x04")
+ self.assertEqual(data, b"\x00\x01\xfe\x04")
- print "Going to send ID_RESP response"
+ print("Going to send ID_RESP response")
res = ussdSocket.send(IPA().id_resp(IPA().tag_name('key'+'\0')))
self.assertEqual(res, 11)
# initiating PING/PONG cycle to know, that the ID_RESP message has been processed
- print "Going to send PING request"
+ print("Going to send PING request")
res = ussdSocket.send(IPA().ping())
self.assertEqual(res, 4)
- print "Expecting PONG response"
+ print("Expecting PONG response")
data = ussdSocket.recv(4)
- self.assertEqual(data, "\x00\x01\xfe\x01")
+ self.assertEqual(data, b"\x00\x01\xfe\x01")
res = self.vty.verify("show ussd-connection", ['The USSD side channel provider is connected and authorized.'])
self.assertTrue(res)
- print "Going to shut down connection"
+ print("Going to shut down connection")
ussdSocket.shutdown(socket.SHUT_WR)
- print "Expecting EOF"
+ print("Expecting EOF")
data = ussdSocket.recv(4)
- self.assertEqual(data, "")
+ self.assertEqual(data, b"")
ussdSocket.close()
@@ -967,7 +967,7 @@
if line.startswith(" access-list test-default"):
self.assertEqual(line, " access-list test-default imsi-deny ^123[0-9]*$ 11 11")
asserted = True
- self.assert_(asserted)
+ self.assertTrue(asserted)
# Check the optional CM Service Reject Cause
self.vty.command("access-list test-cm-deny imsi-deny ^123[0-9]*$ 42").split("\r\n")
@@ -977,7 +977,7 @@
if line.startswith(" access-list test-cm"):
self.assertEqual(line, " access-list test-cm-deny imsi-deny ^123[0-9]*$ 42 11")
asserted = True
- self.assert_(asserted)
+ self.assertTrue(asserted)
# Check the optional LU Reject Cause
self.vty.command("access-list test-lu-deny imsi-deny ^123[0-9]*$ 23 42").split("\r\n")
@@ -987,7 +987,7 @@
if line.startswith(" access-list test-lu"):
self.assertEqual(line, " access-list test-lu-deny imsi-deny ^123[0-9]*$ 23 42")
asserted = True
- self.assert_(asserted)
+ self.assertTrue(asserted)
def add_nat_test(suite, workdir):
if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc_nat/osmo-bsc_nat")):
@@ -1010,7 +1010,7 @@
x.vty.command("end")
def data2str(d):
- return d.encode('hex').lower()
+ return d.hex()
def nat_msc_test(x, ip, port, verbose = False):
msc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -1019,11 +1019,11 @@
msc.bind((ip, port))
msc.listen(5)
if (verbose):
- print "MSC is ready at " + ip
+ print("MSC is ready at " + ip)
conn = None
while True:
vty_response = x.vty.command("show msc connection")
- print "'show msc connection' says: %r" % vty_response
+ print("'show msc connection' says: %r" % vty_response)
if vty_response == "MSC is connected: 1":
# success
break;
@@ -1035,10 +1035,10 @@
while timeout_retries > 0:
try:
conn, addr = msc.accept()
- print "MSC got connection from ", addr
+ print("MSC got connection from ", addr)
break
except socket.timeout:
- print "socket timed out."
+ print("socket timed out.")
timeout_retries -= 1
continue
@@ -1053,52 +1053,52 @@
raise Exception("expected to receive 4 bytes, but got %d (%r)" % (len(s)/2, s))
if "0001fe00" == s:
if (verbose):
- print "\tBSC <- NAT: PING?"
+ print("\tBSC <- NAT: PING?")
x.send(IPA().pong())
elif "0001fe06" == s:
if (verbose):
- print "\tBSC <- NAT: IPA ID ACK"
+ print("\tBSC <- NAT: IPA ID ACK")
x.send(IPA().id_ack())
elif "0001fe00" == s:
if (verbose):
- print "\tBSC <- NAT: PONG!"
+ print("\tBSC <- NAT: PONG!")
else:
if (verbose):
- print "\tBSC <- NAT: ", s
+ print("\tBSC <- NAT: ", s)
def ipa_handle_resp(x, tk, verbose = False, proc=None):
s = data2str(x.recv(38))
if "0023fe040108010701020103010401050101010011" in s:
retries = 3
while True:
- print "\tsending IPA identity(%s) at %s" % (tk, time.strftime("%T"))
+ print("\tsending IPA identity(%s) at %s" % (tk, time.strftime("%T")))
try:
x.send(IPA().id_resp(IPA().identity(name = (tk+'\0').encode('utf-8'))))
- print "\tdone sending IPA identity(%s) at %s" % (tk,
- time.strftime("%T"))
+ print("\tdone sending IPA identity(%s) at %s" % (tk,
+ time.strftime("%T")))
break
except:
- print "\tfailed sending IPA identity at", time.strftime("%T")
+ print("\tfailed sending IPA identity at", time.strftime("%T"))
if proc:
- print "\tproc.poll() = %r" % proc.poll()
+ print("\tproc.poll() = %r" % proc.poll())
if retries < 1:
- print "\tgiving up"
+ print("\tgiving up")
raise
- print "\tretrying (%d attempts left)" % retries
+ print("\tretrying (%d attempts left)" % retries)
retries -= 1
else:
if (verbose):
- print "\tBSC <- NAT: ", s
+ print("\tBSC <- NAT: ", s)
def ipa_handle_mgcp(x, verbose = False):
data = x.recv(3)
s = data2str(data)
if s[4:] != "fc":
- print "expected IPA(MGCP) but received %r instead" % (s[4:])
+ print("expected IPA(MGCP) but received %r instead" % (s[4:]))
ipa_len, = struct.unpack('>H', data[:2])
mgcp_msg = x.recv(ipa_len) # MGCP msg
if (verbose):
- print "\tBSC <- NAT (MGCP[%d]): %s" % (ipa_len, mgcp_msg)
+ print("\tBSC <- NAT (MGCP[%d]): %s" % (ipa_len, mgcp_msg))
def nat_bsc_num_con(x):
return len(x.vty.command("show bsc connections").split('\n'))
@@ -1108,18 +1108,18 @@
bsc.bind(('127.0.0.1', 0))
bsc.connect(('127.0.0.1', 5000))
if (verbose):
- print "BSC%d " %nr
- print "\tconnected to %s:%d" % bsc.getpeername()
+ print("BSC%d " %nr)
+ print("\tconnected to %s:%d" % bsc.getpeername())
if proc:
- print "\tproc.poll() = %r" % proc.poll()
- print "\tproc.pid = %r" % proc.pid
+ print("\tproc.poll() = %r" % proc.poll())
+ print("\tproc.pid = %r" % proc.pid)
ipa_handle_small(bsc, verbose)
ipa_handle_resp(bsc, tk, verbose, proc=proc)
if proc:
- print "\tproc.poll() = %r" % proc.poll()
+ print("\tproc.poll() = %r" % proc.poll())
ipa_handle_mgcp(bsc, verbose)
if proc:
- print "\tproc.poll() = %r" % proc.poll()
+ print("\tproc.poll() = %r" % proc.poll())
ipa_handle_small(bsc, verbose)
return bsc
@@ -1156,9 +1156,9 @@
if args.p:
confpath = args.p
- print "confpath %s, workdir %s" % (confpath, workdir)
+ print("confpath %s, workdir %s" % (confpath, workdir))
os.chdir(workdir)
- print "Running tests for specific VTY commands"
+ print("Running tests for specific VTY commands")
suite = unittest.TestSuite()
suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYMGCP))
suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYNITB))
--
To view, visit https://gerrit.osmocom.org/c/openbsc/+/16544
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4
Gerrit-Change-Number: 16544
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191212/adfd02dc/attachment.htm>