<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/16552">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmoappdesc.py, tests: switch to python 3<br><br>Make build and external tests work with python3, so we can drop<br>the python2 dependency.<br><br>This should be merged shortly after osmo-python-tests was migrated to<br>python3, and the jenkins build slaves were (automatically) updated to<br>have the new osmo-python-tests installed.<br><br>Related: OS#2819<br>Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7<br>Change-Id: I8c07d99c1bc9f0383e4bce17544e0998998cc54d<br>---<br>M osmoappdesc.py<br>M tests/ctrl_test_runner.py<br>M tests/vty_test_runner.py<br>3 files changed, 82 insertions(+), 82 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/52/16552/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmoappdesc.py b/osmoappdesc.py</span><br><span>index 08166a9..e91043f 100644</span><br><span>--- a/osmoappdesc.py</span><br><span>+++ b/osmoappdesc.py</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> </span><br><span> # (C) 2013 by Katerina Barone-Adesi <kat.obsc@gmail.com></span><br><span> # This program is free software: you can redistribute it and/or modify</span><br><span>diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py</span><br><span>index 9c253fc..69b2478 100755</span><br><span>--- a/tests/ctrl_test_runner.py</span><br><span>+++ b/tests/ctrl_test_runner.py</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python2</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> </span><br><span> # (C) 2013 by Jacob Erlbeck <jerlbeck@sysmocom.de></span><br><span> # (C) 2014 by Holger Hans Peter Freyther</span><br><span>@@ -53,8 +53,8 @@</span><br><span> try:</span><br><span> self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd)</span><br><span> except OSError:</span><br><span style="color: hsl(0, 100%, 40%);">- print >> sys.stderr, "Current directory: %s" % os.getcwd()</span><br><span style="color: hsl(0, 100%, 40%);">- print >> sys.stderr, "Consider setting -b"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Current directory: %s" % os.getcwd(), file=sys.stderr)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Consider setting -b", file=sys.stderr)</span><br><span> time.sleep(2)</span><br><span> </span><br><span> appstring = self.ctrl_app()[2]</span><br><span>@@ -72,7 +72,7 @@</span><br><span> </span><br><span> def connect(self, host, port):</span><br><span> if verbose:</span><br><span style="color: hsl(0, 100%, 40%);">- print "Connecting to host %s:%i" % (host, port)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Connecting to host %s:%i" % (host, port))</span><br><span> </span><br><span> retries = 30</span><br><span> while True:</span><br><span>@@ -92,7 +92,7 @@</span><br><span> </span><br><span> def send(self, data):</span><br><span> if verbose:</span><br><span style="color: hsl(0, 100%, 40%);">- print "Sending \"%s\"" %(data)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Sending \"%s\"" %(data))</span><br><span> data = Ctrl().add_header(data)</span><br><span> return self.sock.send(data) == len(data)</span><br><span> </span><br><span>@@ -121,9 +121,9 @@</span><br><span> data = self.sock.recv(4096)</span><br><span> while (len(data)>0):</span><br><span> (head, data) = IPA().split_combined(data)</span><br><span style="color: hsl(0, 100%, 40%);">- answer = Ctrl().rem_header(head)</span><br><span style="color: hsl(120, 100%, 40%);">+ answer = Ctrl().rem_header(head).decode()</span><br><span> if verbose:</span><br><span style="color: hsl(0, 100%, 40%);">- print "Got message:", answer</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Got message:", answer)</span><br><span> (mtype, id, msg) = answer.split(None, 2)</span><br><span> id = int(id)</span><br><span> rsp = {'mtype': mtype, 'id': id}</span><br><span>@@ -139,7 +139,7 @@</span><br><span> responses[id] = rsp</span><br><span> </span><br><span> if verbose:</span><br><span style="color: hsl(0, 100%, 40%);">- print "Decoded replies: ", responses</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Decoded replies: ", responses)</span><br><span> </span><br><span> return responses</span><br><span> </span><br><span>@@ -154,9 +154,9 @@</span><br><span> def testListSubscribers(self):</span><br><span> # TODO. Add command to mark a subscriber as active</span><br><span> r = self.do_get('subscriber-list-active-v1')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['mtype'], 'GET_REPLY')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['var'], 'subscriber-list-active-v1')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['value'], None)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(r['mtype'], 'GET_REPLY')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(r['var'], 'subscriber-list-active-v1')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(r['value'], None)</span><br><span> </span><br><span> def add_sgsn_test(suite, workdir):</span><br><span> if not os.path.isfile(os.path.join(workdir, "src/sgsn/osmo-sgsn")):</span><br><span>@@ -191,9 +191,9 @@</span><br><span> if args.p:</span><br><span> confpath = args.p</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print "confpath %s, workdir %s" % (confpath, workdir)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("confpath %s, workdir %s" % (confpath, workdir))</span><br><span> os.chdir(workdir)</span><br><span style="color: hsl(0, 100%, 40%);">- print "Running tests for specific control commands"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Running tests for specific control commands")</span><br><span> suite = unittest.TestSuite()</span><br><span> add_sgsn_test(suite, workdir)</span><br><span> res = unittest.TextTestRunner(verbosity=verbose_level).run(suite)</span><br><span>diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py</span><br><span>index a925b6b..ed52d5f 100755</span><br><span>--- a/tests/vty_test_runner.py</span><br><span>+++ b/tests/vty_test_runner.py</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python2</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> </span><br><span> # (C) 2013 by Katerina Barone-Adesi <kat.obsc@gmail.com></span><br><span> # (C) 2013 by Holger Hans Peter Freyther</span><br><span>@@ -33,9 +33,9 @@</span><br><span> def checkForEndAndExit(self):</span><br><span> res = self.vty.command("list")</span><br><span> #print ('looking for "exit"\n')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find(' exit\r') > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find(' exit\r') > 0)</span><br><span> #print 'found "exit"\nlooking for "end"\n'</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find(' end\r') > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find(' end\r') > 0)</span><br><span> #print 'found "end"\n'</span><br><span> </span><br><span> def vty_command(self):</span><br><span>@@ -54,8 +54,8 @@</span><br><span> try:</span><br><span> self.proc = osmoutil.popen_devnull(osmo_vty_cmd)</span><br><span> except OSError:</span><br><span style="color: hsl(0, 100%, 40%);">- print >> sys.stderr, "Current directory: %s" % os.getcwd()</span><br><span style="color: hsl(0, 100%, 40%);">- print >> sys.stderr, "Consider setting -b"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Current directory: %s" % os.getcwd(), file=sys.stderr)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Consider setting -b", file=sys.stderr)</span><br><span> </span><br><span> appstring = self.vty_app()[2]</span><br><span> appport = self.vty_app()[0]</span><br><span>@@ -80,41 +80,41 @@</span><br><span> def testVtyTree(self):</span><br><span> self.vty.enable()</span><br><span> self.assertTrue(self.vty.verify('configure terminal', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> self.checkForEndAndExit()</span><br><span> self.assertTrue(self.vty.verify('ns', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config-ns')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config-ns')</span><br><span> self.checkForEndAndExit()</span><br><span> self.assertTrue(self.vty.verify('exit', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> self.assertTrue(self.vty.verify('gbproxy', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config-gbproxy')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config-gbproxy')</span><br><span> self.checkForEndAndExit()</span><br><span> self.assertTrue(self.vty.verify('exit', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> </span><br><span> def testVtyShow(self):</span><br><span> res = self.vty.command("show ns")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Encapsulation NS-UDP-IP') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Encapsulation NS-UDP-IP') >= 0)</span><br><span> </span><br><span> res = self.vty.command("show gbproxy stats")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('GBProxy Global Statistics') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('GBProxy Global Statistics') >= 0)</span><br><span> </span><br><span> def testVtyDeletePeer(self):</span><br><span> self.vty.enable()</span><br><span> self.assertTrue(self.vty.verify('delete-gbproxy-peer 9999 bvci 7777', ['BVC not found']))</span><br><span> res = self.vty.command("delete-gbproxy-peer 9999 all dry-run")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Not Deleted 0 BVC') >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Not Deleted 0 NS-VC') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Not Deleted 0 BVC') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Not Deleted 0 NS-VC') >= 0)</span><br><span> res = self.vty.command("delete-gbproxy-peer 9999 only-bvc dry-run")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Not Deleted 0 BVC') >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Not Deleted 0 NS-VC') < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Not Deleted 0 BVC') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Not Deleted 0 NS-VC') < 0)</span><br><span> res = self.vty.command("delete-gbproxy-peer 9999 only-nsvc dry-run")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Not Deleted 0 BVC') < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Not Deleted 0 NS-VC') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Not Deleted 0 BVC') < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Not Deleted 0 NS-VC') >= 0)</span><br><span> res = self.vty.command("delete-gbproxy-peer 9999 all")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Deleted 0 BVC') >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Deleted 0 NS-VC') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Deleted 0 BVC') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Deleted 0 NS-VC') >= 0)</span><br><span> </span><br><span> class TestVTYSGSN(TestVTYBase):</span><br><span> </span><br><span>@@ -128,22 +128,22 @@</span><br><span> def testVtyTree(self):</span><br><span> self.vty.enable()</span><br><span> self.assertTrue(self.vty.verify('configure terminal', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> self.checkForEndAndExit()</span><br><span> self.assertTrue(self.vty.verify('ns', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config-ns')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config-ns')</span><br><span> self.checkForEndAndExit()</span><br><span> self.assertTrue(self.vty.verify('exit', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> self.assertTrue(self.vty.verify('sgsn', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config-sgsn')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config-sgsn')</span><br><span> self.checkForEndAndExit()</span><br><span> self.assertTrue(self.vty.verify('exit', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> </span><br><span> def testVtyShow(self):</span><br><span> res = self.vty.command("show ns")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Encapsulation NS-UDP-IP') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Encapsulation NS-UDP-IP') >= 0)</span><br><span> self.assertTrue(self.vty.verify('show bssgp', ['']))</span><br><span> self.assertTrue(self.vty.verify('show bssgp stats', ['']))</span><br><span> self.assertTrue(self.vty.verify('show bssgp nsei 123', ['']))</span><br><span>@@ -154,57 +154,57 @@</span><br><span> self.assertTrue(self.vty.verify('show pdp-context all', ['']))</span><br><span> </span><br><span> res = self.vty.command("show sndcp")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('State of SNDCP Entities') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('State of SNDCP Entities') >= 0)</span><br><span> </span><br><span> res = self.vty.command("show llc")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('State of LLC Entities') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('State of LLC Entities') >= 0)</span><br><span> </span><br><span> def testVtyAuth(self):</span><br><span> self.vty.enable()</span><br><span> self.assertTrue(self.vty.verify('configure terminal', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> self.assertTrue(self.vty.verify('sgsn', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config-sgsn')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config-sgsn')</span><br><span> self.assertTrue(self.vty.verify('auth-policy accept-all', ['']))</span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('auth-policy accept-all') > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('auth-policy accept-all') > 0)</span><br><span> self.assertTrue(self.vty.verify('auth-policy acl-only', ['']))</span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('auth-policy acl-only') > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('auth-policy acl-only') > 0)</span><br><span> self.assertTrue(self.vty.verify('auth-policy closed', ['']))</span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('auth-policy closed') > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('auth-policy closed') > 0)</span><br><span> self.assertTrue(self.vty.verify('gsup remote-ip 127.0.0.4', ['']))</span><br><span> self.assertTrue(self.vty.verify('gsup remote-port 2222', ['']))</span><br><span> self.assertTrue(self.vty.verify('auth-policy remote', ['']))</span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('auth-policy remote') > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('auth-policy remote') > 0)</span><br><span> </span><br><span> def testVtySubscriber(self):</span><br><span> self.vty.enable()</span><br><span> res = self.vty.command('show subscriber cache')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('1234567890') < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('1234567890') < 0)</span><br><span> self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 create', ['']))</span><br><span> res = self.vty.command('show subscriber cache')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('1234567890') >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Authorized: 0') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('1234567890') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Authorized: 0') >= 0)</span><br><span> self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 update-location-result ok', ['']))</span><br><span> res = self.vty.command('show subscriber cache')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('1234567890') >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('Authorized: 1') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('1234567890') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('Authorized: 1') >= 0)</span><br><span> self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 cancel update-procedure', ['']))</span><br><span> res = self.vty.command('show subscriber cache')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('1234567890') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('1234567890') >= 0)</span><br><span> self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 destroy', ['']))</span><br><span> res = self.vty.command('show subscriber cache')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('1234567890') < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('1234567890') < 0)</span><br><span> </span><br><span> def testVtyGgsn(self):</span><br><span> self.vty.enable()</span><br><span> self.assertTrue(self.vty.verify('configure terminal', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> self.assertTrue(self.vty.verify('sgsn', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config-sgsn')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config-sgsn')</span><br><span> self.assertTrue(self.vty.verify('ggsn 0 remote-ip 127.99.99.99', ['']))</span><br><span> self.assertTrue(self.vty.verify('ggsn 0 gtp-version 1', ['']))</span><br><span> self.assertTrue(self.vty.verify('apn * ggsn 0', ['']))</span><br><span>@@ -213,65 +213,65 @@</span><br><span> self.assertTrue(self.vty.verify('apn apn1.test imsi-prefix 123456 ggsn 0', ['']))</span><br><span> self.assertTrue(self.vty.verify('apn apn2.test imsi-prefix 123456 ggsn 0', ['']))</span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('ggsn 0 remote-ip 127.99.99.99') >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('ggsn 0 gtp-version 1') >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('apn * ggsn 0') >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('apn apn1.test ggsn 0') >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('apn apn1.test imsi-prefix 123456 ggsn 0') >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find('apn apn2.test imsi-prefix 123456 ggsn 0') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('ggsn 0 remote-ip 127.99.99.99') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('ggsn 0 gtp-version 1') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('apn * ggsn 0') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('apn apn1.test ggsn 0') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('apn apn1.test imsi-prefix 123456 ggsn 0') >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find('apn apn2.test imsi-prefix 123456 ggsn 0') >= 0)</span><br><span> </span><br><span> def testVtyEasyAPN(self):</span><br><span> self.vty.enable()</span><br><span> self.assertTrue(self.vty.verify('configure terminal', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> self.assertTrue(self.vty.verify('sgsn', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config-sgsn')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config-sgsn')</span><br><span> </span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(res.find("apn internet"), -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(res.find("apn internet"), -1)</span><br><span> </span><br><span> self.assertTrue(self.vty.verify("access-point-name internet.apn", ['']))</span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find("apn internet.apn ggsn 0") >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find("apn internet.apn ggsn 0") >= 0)</span><br><span> </span><br><span> self.assertTrue(self.vty.verify("no access-point-name internet.apn", ['']))</span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(res.find("apn internet"), -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(res.find("apn internet"), -1)</span><br><span> </span><br><span> def testVtyCDR(self):</span><br><span> self.vty.enable()</span><br><span> self.assertTrue(self.vty.verify('configure terminal', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> self.assertTrue(self.vty.verify('sgsn', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config-sgsn')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config-sgsn')</span><br><span> </span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find("no cdr filename") > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find("no cdr filename") > 0)</span><br><span> </span><br><span> self.vty.command("cdr filename bla.cdr")</span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(res.find("no cdr filename"), -1)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find(" cdr filename bla.cdr") > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(res.find("no cdr filename"), -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find(" cdr filename bla.cdr") > 0)</span><br><span> </span><br><span> self.vty.command("no cdr filename")</span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find("no cdr filename") > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(res.find(" cdr filename bla.cdr"), -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find("no cdr filename") > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(res.find(" cdr filename bla.cdr"), -1)</span><br><span> </span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find(" cdr interval 600") > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find(" cdr interval 600") > 0)</span><br><span> </span><br><span> self.vty.command("cdr interval 900")</span><br><span> res = self.vty.command("show running-config")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assert_(res.find(" cdr interval 900") > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(res.find(" cdr interval 600"), -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertTrue(res.find(" cdr interval 900") > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(res.find(" cdr interval 600"), -1)</span><br><span> </span><br><span> def testVtyTimers(self):</span><br><span> self.vty.enable()</span><br><span> self.assertTrue(self.vty.verify('configure terminal', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config')</span><br><span> self.assertTrue(self.vty.verify('sgsn', ['']))</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(self.vty.node(), 'config-sgsn')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.assertEqual(self.vty.node(), 'config-sgsn')</span><br><span> </span><br><span> for t in [3312, 3322, 3350, 3360, 3370, 3313, 3314, 3316, 3385, 3395, 3397]:</span><br><span> self.assertTrue(self.vty.verify('timer t%d 10' % t, ['']))</span><br><span>@@ -316,9 +316,9 @@</span><br><span> if args.p:</span><br><span> confpath = args.p</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print "confpath %s, workdir %s" % (confpath, workdir)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("confpath %s, workdir %s" % (confpath, workdir))</span><br><span> os.chdir(workdir)</span><br><span style="color: hsl(0, 100%, 40%);">- print "Running tests for specific VTY commands"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Running tests for specific VTY commands")</span><br><span> suite = unittest.TestSuite()</span><br><span> add_gbproxy_test(suite, workdir)</span><br><span> add_sgsn_test(suite, workdir)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/16552">change 16552</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-sgsn/+/16552"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8c07d99c1bc9f0383e4bce17544e0998998cc54d </div>
<div style="display:none"> Gerrit-Change-Number: 16552 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>