<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11009">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">encryption: Reuse code using test lib features<br><br>Change-Id: I9b6944516c524a0c11a47aec6839f8ee9d571661<br>---<br>A suites/encryption/lib/testlib.py<br>M suites/encryption/register_a5_0_authopt.py<br>M suites/encryption/register_a5_0_authreq.py<br>M suites/encryption/register_a5_1_authreq.py<br>4 files changed, 66 insertions(+), 125 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/suites/encryption/lib/testlib.py b/suites/encryption/lib/testlib.py</span><br><span>new file mode 100644</span><br><span>index 0000000..3948941</span><br><span>--- /dev/null</span><br><span>+++ b/suites/encryption/lib/testlib.py</span><br><span>@@ -0,0 +1,54 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester.testenv import *</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def encryption_test_setup_run(enable_auth, algo):</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr = suite.hlr()</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = suite.bts()</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_msc = suite.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_bsc = suite.mgw()</span><br><span style="color: hsl(120, 100%, 40%);">+ stp = suite.stp()</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ print('start network...')</span><br><span style="color: hsl(120, 100%, 40%);">+ msc.set_authentication(enable_auth)</span><br><span style="color: hsl(120, 100%, 40%);">+ msc.set_encryption(algo)</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc.set_encryption(algo)</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr.start()</span><br><span style="color: hsl(120, 100%, 40%);">+ stp.start()</span><br><span style="color: hsl(120, 100%, 40%);">+ msc.start()</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_msc.start()</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_bsc.start()</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc.bts_add(bts)</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc.start()</span><br><span style="color: hsl(120, 100%, 40%);">+ bts.start()</span><br><span style="color: hsl(120, 100%, 40%);">+ wait(bsc.bts_is_connected, bts)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ms.log_info()</span><br><span style="color: hsl(120, 100%, 40%);">+ good_ki = ms.ki()</span><br><span style="color: hsl(120, 100%, 40%);">+ bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ print('KI changed: ' + good_ki + " => " + bad_ki)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms.set_ki(bad_ki)</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr.subscriber_add(ms)</span><br><span style="color: hsl(120, 100%, 40%);">+ if enable_auth:</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Attempt connection with wrong KI...')</span><br><span style="color: hsl(120, 100%, 40%);">+ ms.connect(msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Asserting modem did not register')</span><br><span style="color: hsl(120, 100%, 40%);">+ # FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458</span><br><span style="color: hsl(120, 100%, 40%);">+ # assert not ms.is_connected(msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+ assert not msc.subscriber_attached(ms)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr.subscriber_delete(ms)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('KI changed: ' + bad_ki + " => " + good_ki)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms.set_ki(good_ki)</span><br><span style="color: hsl(120, 100%, 40%);">+ hlr.subscriber_add(ms, ms.msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Attempt connection with correct KI...')</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Attempt connection with wrong KI, should work as it is not used...')</span><br><span style="color: hsl(120, 100%, 40%);">+ ms.connect(msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+ wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(120, 100%, 40%);">+ wait(msc.subscriber_attached, ms)</span><br><span>diff --git a/suites/encryption/register_a5_0_authopt.py b/suites/encryption/register_a5_0_authopt.py</span><br><span>index acbbb1f..1b7f471 100755</span><br><span>--- a/suites/encryption/register_a5_0_authopt.py</span><br><span>+++ b/suites/encryption/register_a5_0_authopt.py</span><br><span>@@ -1,37 +1,8 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+import testlib</span><br><span style="color: hsl(120, 100%, 40%);">+suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+from testlib import encryption_test_setup_run</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-print('start network...')</span><br><span style="color: hsl(0, 100%, 40%);">-msc.set_authentication(False)</span><br><span style="color: hsl(0, 100%, 40%);">-msc.set_encryption('a5_0')</span><br><span style="color: hsl(0, 100%, 40%);">-bsc.set_encryption('a5_0')</span><br><span style="color: hsl(0, 100%, 40%);">-hlr.start()</span><br><span style="color: hsl(0, 100%, 40%);">-stp.start()</span><br><span style="color: hsl(0, 100%, 40%);">-msc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-bsc.bts_add(bts)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-bts.start()</span><br><span style="color: hsl(0, 100%, 40%);">-wait(bsc.bts_is_connected, bts)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-ms.log_info()</span><br><span style="color: hsl(0, 100%, 40%);">-good_ki = ms.ki()</span><br><span style="color: hsl(0, 100%, 40%);">-bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-print('KI changed: ' + good_ki + " => " + bad_ki)</span><br><span style="color: hsl(0, 100%, 40%);">-ms.set_ki(bad_ki)</span><br><span style="color: hsl(0, 100%, 40%);">-hlr.subscriber_add(ms)</span><br><span style="color: hsl(0, 100%, 40%);">-print('Attempt connection with wrong KI, should work as it is not used...')</span><br><span style="color: hsl(0, 100%, 40%);">-ms.connect(msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(msc.subscriber_attached, ms)</span><br><span style="color: hsl(120, 100%, 40%);">+encryption_test_setup_run(False, 'a5_0')</span><br><span>diff --git a/suites/encryption/register_a5_0_authreq.py b/suites/encryption/register_a5_0_authreq.py</span><br><span>index 789ace5..feca525 100755</span><br><span>--- a/suites/encryption/register_a5_0_authreq.py</span><br><span>+++ b/suites/encryption/register_a5_0_authreq.py</span><br><span>@@ -1,50 +1,8 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+import testlib</span><br><span style="color: hsl(120, 100%, 40%);">+suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+from testlib import encryption_test_setup_run</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-print('start network...')</span><br><span style="color: hsl(0, 100%, 40%);">-msc.set_authentication(True)</span><br><span style="color: hsl(0, 100%, 40%);">-msc.set_encryption('a5_0')</span><br><span style="color: hsl(0, 100%, 40%);">-bsc.set_encryption('a5_0')</span><br><span style="color: hsl(0, 100%, 40%);">-hlr.start()</span><br><span style="color: hsl(0, 100%, 40%);">-stp.start()</span><br><span style="color: hsl(0, 100%, 40%);">-msc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-bsc.bts_add(bts)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-bts.start()</span><br><span style="color: hsl(0, 100%, 40%);">-wait(bsc.bts_is_connected, bts)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-ms.log_info()</span><br><span style="color: hsl(0, 100%, 40%);">-good_ki = ms.ki()</span><br><span style="color: hsl(0, 100%, 40%);">-bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-print('KI changed: ' + good_ki + " => " + bad_ki)</span><br><span style="color: hsl(0, 100%, 40%);">-ms.set_ki(bad_ki)</span><br><span style="color: hsl(0, 100%, 40%);">-hlr.subscriber_add(ms)</span><br><span style="color: hsl(0, 100%, 40%);">-print('Attempt connection with wrong KI...')</span><br><span style="color: hsl(0, 100%, 40%);">-ms.connect(msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04)</span><br><span style="color: hsl(0, 100%, 40%);">-print('Asserting modem did not register')</span><br><span style="color: hsl(0, 100%, 40%);">-# FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458</span><br><span style="color: hsl(0, 100%, 40%);">-# assert not ms.is_connected(msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-assert not msc.subscriber_attached(ms)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-hlr.subscriber_delete(ms)</span><br><span style="color: hsl(0, 100%, 40%);">-print('KI changed: ' + bad_ki + " => " + good_ki)</span><br><span style="color: hsl(0, 100%, 40%);">-ms.set_ki(good_ki)</span><br><span style="color: hsl(0, 100%, 40%);">-hlr.subscriber_add(ms, ms.msisdn)</span><br><span style="color: hsl(0, 100%, 40%);">-print('Attempt connection with correct KI...')</span><br><span style="color: hsl(0, 100%, 40%);">-ms.connect(msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(msc.subscriber_attached, ms)</span><br><span style="color: hsl(120, 100%, 40%);">+encryption_test_setup_run(True, 'a5_0')</span><br><span>diff --git a/suites/encryption/register_a5_1_authreq.py b/suites/encryption/register_a5_1_authreq.py</span><br><span>index e7aa76c..077819b 100755</span><br><span>--- a/suites/encryption/register_a5_1_authreq.py</span><br><span>+++ b/suites/encryption/register_a5_1_authreq.py</span><br><span>@@ -1,50 +1,8 @@</span><br><span> #!/usr/bin/env python3</span><br><span> from osmo_gsm_tester.testenv import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-hlr = suite.hlr()</span><br><span style="color: hsl(0, 100%, 40%);">-bts = suite.bts()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc = suite.mgw()</span><br><span style="color: hsl(0, 100%, 40%);">-stp = suite.stp()</span><br><span style="color: hsl(0, 100%, 40%);">-msc = suite.msc(hlr, mgw_msc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc = suite.bsc(msc, mgw_bsc, stp)</span><br><span style="color: hsl(0, 100%, 40%);">-ms = suite.modem()</span><br><span style="color: hsl(120, 100%, 40%);">+import testlib</span><br><span style="color: hsl(120, 100%, 40%);">+suite.test_import_modules_register_for_cleanup(testlib)</span><br><span style="color: hsl(120, 100%, 40%);">+from testlib import encryption_test_setup_run</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-print('start network...')</span><br><span style="color: hsl(0, 100%, 40%);">-msc.set_authentication(True)</span><br><span style="color: hsl(0, 100%, 40%);">-msc.set_encryption('a5_1')</span><br><span style="color: hsl(0, 100%, 40%);">-bsc.set_encryption('a5_1')</span><br><span style="color: hsl(0, 100%, 40%);">-hlr.start()</span><br><span style="color: hsl(0, 100%, 40%);">-stp.start()</span><br><span style="color: hsl(0, 100%, 40%);">-msc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_msc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-mgw_bsc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-bsc.bts_add(bts)</span><br><span style="color: hsl(0, 100%, 40%);">-bsc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-bts.start()</span><br><span style="color: hsl(0, 100%, 40%);">-wait(bsc.bts_is_connected, bts)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-ms.log_info()</span><br><span style="color: hsl(0, 100%, 40%);">-good_ki = ms.ki()</span><br><span style="color: hsl(0, 100%, 40%);">-bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-print('KI changed: ' + good_ki + " => " + bad_ki)</span><br><span style="color: hsl(0, 100%, 40%);">-ms.set_ki(bad_ki)</span><br><span style="color: hsl(0, 100%, 40%);">-hlr.subscriber_add(ms)</span><br><span style="color: hsl(0, 100%, 40%);">-print('Attempt connection with wrong KI...')</span><br><span style="color: hsl(0, 100%, 40%);">-ms.connect(msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04)</span><br><span style="color: hsl(0, 100%, 40%);">-print('Asserting modem did not register')</span><br><span style="color: hsl(0, 100%, 40%);">-# FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458</span><br><span style="color: hsl(0, 100%, 40%);">-# assert not ms.is_connected(msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-assert not msc.subscriber_attached(ms)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-hlr.subscriber_delete(ms)</span><br><span style="color: hsl(0, 100%, 40%);">-print('KI changed: ' + bad_ki + " => " + good_ki)</span><br><span style="color: hsl(0, 100%, 40%);">-ms.set_ki(good_ki)</span><br><span style="color: hsl(0, 100%, 40%);">-hlr.subscriber_add(ms, ms.msisdn)</span><br><span style="color: hsl(0, 100%, 40%);">-print('Attempt connection with correct KI...')</span><br><span style="color: hsl(0, 100%, 40%);">-ms.connect(msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms.is_connected, msc.mcc_mnc())</span><br><span style="color: hsl(0, 100%, 40%);">-wait(msc.subscriber_attached, ms)</span><br><span style="color: hsl(120, 100%, 40%);">+encryption_test_setup_run(True, 'a5_1')</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11009">change 11009</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/11009"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I9b6944516c524a0c11a47aec6839f8ee9d571661 </div>
<div style="display:none"> Gerrit-Change-Number: 11009 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>