<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9527">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remove traces of osmo-bsc_nat in python test (osmoappdesc/test_runner)<br><br>Change-Id: I9127ddb7b29eb82defd3a8afac9c1dbfd424fb72<br>---<br>M osmoappdesc.py<br>M tests/ctrl_test_runner.py<br>2 files changed, 2 insertions(+), 82 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmoappdesc.py b/osmoappdesc.py</span><br><span>index 338239c..f5f18b2 100644</span><br><span>--- a/osmoappdesc.py</span><br><span>+++ b/osmoappdesc.py</span><br><span>@@ -16,12 +16,10 @@</span><br><span> </span><br><span> app_configs = {</span><br><span> "osmo-bsc": ["doc/examples/osmo-bsc/osmo-bsc.cfg",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg"],</span><br><span style="color: hsl(0, 100%, 40%);">- "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"],</span><br><span style="color: hsl(120, 100%, 40%);">+ "doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg"]</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-apps = [(4242, "src/osmo-bsc/osmo-bsc", "OsmoBSC", "osmo-bsc"),</span><br><span style="color: hsl(0, 100%, 40%);">- (4244, "src/osmo-bsc_nat/osmo-bsc_nat", "OsmoBSCNAT", "nat"),</span><br><span style="color: hsl(120, 100%, 40%);">+apps = [(4242, "src/osmo-bsc/osmo-bsc", "OsmoBSC", "osmo-bsc")</span><br><span> ]</span><br><span> </span><br><span> vty_command = ["./src/osmo-bsc/osmo-bsc", "-c",</span><br><span>diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py</span><br><span>index f43c09a..cc37c97 100755</span><br><span>--- a/tests/ctrl_test_runner.py</span><br><span>+++ b/tests/ctrl_test_runner.py</span><br><span>@@ -489,68 +489,6 @@</span><br><span> self.assertEquals(r['var'], 'mcc')</span><br><span> self.assertEquals(r['value'], '002')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class TestCtrlNAT(TestCtrlBase):</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def ctrl_command(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return ["./src/osmo-bsc_nat/osmo-bsc_nat", "-c",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def ctrl_app(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return (4250, "./src/osmo-bsc_nat/osmo-bsc_nat", "OsmoNAT", "nat")</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def testAccessList(self):</span><br><span style="color: hsl(0, 100%, 40%);">- r = self.do_get('net.0.bsc_cfg.0.access-list-name')</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'], 'net')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['value'], None)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- r = self.do_set('net.0.bsc_cfg.0.access-list-name', 'bla')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['mtype'], 'SET_REPLY')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['var'], 'net')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['value'], 'bla')</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- r = self.do_get('net.0.bsc_cfg.0.access-list-name')</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'], 'net')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['value'], 'bla')</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- r = self.do_set('net.0.bsc_cfg.0.no-access-list-name', '1')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['mtype'], 'SET_REPLY')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['var'], 'net')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['value'], None)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- r = self.do_get('net.0.bsc_cfg.0.access-list-name')</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'], 'net')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['value'], None)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def testAccessListManagement(self):</span><br><span style="color: hsl(0, 100%, 40%);">- r = self.do_set("net.0.add.allow.access-list.404", "abc")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['mtype'], 'ERROR')</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- r = self.do_set("net.0.add.allow.access-list.bla", "^234$")</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['mtype'], 'SET_REPLY')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['var'], 'net.0.add.allow.access-list.bla')</span><br><span style="color: hsl(0, 100%, 40%);">- self.assertEquals(r['value'], 'IMSI allow added to access list')</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # TODO.. find a way to actually see if this rule has been</span><br><span style="color: hsl(0, 100%, 40%);">- # added. e.g. by implementing a get for the list.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-class TestCtrlSGSN(TestCtrlBase):</span><br><span style="color: hsl(0, 100%, 40%);">- def ctrl_command(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return ["./src/gprs/osmo-sgsn", "-c",</span><br><span style="color: hsl(0, 100%, 40%);">- "doc/examples/osmo-sgsn/osmo-sgsn.cfg"]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def ctrl_app(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return (4251, "./src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn")</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def testListSubscribers(self):</span><br><span style="color: hsl(0, 100%, 40%);">- # TODO. Add command to mark a subscriber as active</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">-</span><br><span> def add_bsc_test(suite, workdir):</span><br><span> if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc")):</span><br><span> print("Skipping the BSC test")</span><br><span>@@ -558,20 +496,6 @@</span><br><span> test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlBSC)</span><br><span> suite.addTest(test)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def add_nat_test(suite, workdir):</span><br><span style="color: hsl(0, 100%, 40%);">- if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc_nat/osmo-bsc_nat")):</span><br><span style="color: hsl(0, 100%, 40%);">- print("Skipping the NAT test")</span><br><span style="color: hsl(0, 100%, 40%);">- return</span><br><span style="color: hsl(0, 100%, 40%);">- test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlNAT)</span><br><span style="color: hsl(0, 100%, 40%);">- suite.addTest(test)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def add_sgsn_test(suite, workdir):</span><br><span style="color: hsl(0, 100%, 40%);">- if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-sgsn")):</span><br><span style="color: hsl(0, 100%, 40%);">- print("Skipping the SGSN test")</span><br><span style="color: hsl(0, 100%, 40%);">- return</span><br><span style="color: hsl(0, 100%, 40%);">- test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlSGSN)</span><br><span style="color: hsl(0, 100%, 40%);">- suite.addTest(test)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if __name__ == '__main__':</span><br><span> import argparse</span><br><span> import sys</span><br><span>@@ -603,7 +527,5 @@</span><br><span> print "Running tests for specific control commands"</span><br><span> suite = unittest.TestSuite()</span><br><span> add_bsc_test(suite, workdir)</span><br><span style="color: hsl(0, 100%, 40%);">- add_nat_test(suite, workdir)</span><br><span style="color: hsl(0, 100%, 40%);">- add_sgsn_test(suite, workdir)</span><br><span> res = unittest.TextTestRunner(verbosity=verbose_level).run(suite)</span><br><span> sys.exit(len(res.errors) + len(res.failures))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9527">change 9527</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/9527"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I9127ddb7b29eb82defd3a8afac9c1dbfd424fb72 </div>
<div style="display:none"> Gerrit-Change-Number: 9527 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>