<p>ninjab3s has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21533">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enb: Set cipher and integrity algos via scenario file<br><br>This patch enables setting cipher and integrity algorithms<br>in Amarisoft eNB and srsENB via scenario files. If no<br>settings are defined following defaults are applied:<br>- Cipher algorithm: EEA0, EEA2, EEA1<br>- Integrity algorithm: EIA2, EIA1, EIA0<br><br>Example of setting integrity and chipger algorithms:<br>- 4g:srsue-rftype@uhd+srsenb-rftype@uhd+cfg-enb-cipher@EEA1+cfg-enb-cipher@EEA0+cfg-enb-integ@EIA2+mod-enb-nprb@6<br><br>Change-Id: Id1fbf31c71967d67de11a23d52d32e44c0925061<br>---<br>M src/osmo_gsm_tester/core/schema.py<br>M src/osmo_gsm_tester/obj/enb.py<br>M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl<br>M src/osmo_gsm_tester/templates/srsenb.conf.tmpl<br>M sysmocom/defaults.conf<br>A sysmocom/scenarios/cfg-enb-cipher@.conf<br>A sysmocom/scenarios/cfg-enb-integ@.conf<br>7 files changed, 34 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/33/21533/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/core/schema.py b/src/osmo_gsm_tester/core/schema.py</span><br><span>index d56d6ec..adcbe3c 100644</span><br><span>--- a/src/osmo_gsm_tester/core/schema.py</span><br><span>+++ b/src/osmo_gsm_tester/core/schema.py</span><br><span>@@ -106,7 +106,7 @@</span><br><span> return True</span><br><span> </span><br><span> def cipher(val):</span><br><span style="color: hsl(0, 100%, 40%);">- if val in ('a5_0', 'a5_1', 'a5_2', 'a5_3', 'a5_4', 'a5_5', 'a5_6', 'a5_7'):</span><br><span style="color: hsl(120, 100%, 40%);">+ if val in ('a5_0', 'a5_1', 'a5_2', 'a5_3', 'a5_4', 'a5_5', 'a5_6', 'a5_7', 'EEA0', 'EEA1', 'EEA2'):</span><br><span> return True</span><br><span> raise ValueError('Unknown Cipher value: %r' % val)</span><br><span> </span><br><span>@@ -152,6 +152,11 @@</span><br><span> return True</span><br><span> raise ValueError('Invalid duration value: %r' % val)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def integrity_algo(val):</span><br><span style="color: hsl(120, 100%, 40%);">+ if val in ('EIA0', 'EIA1', 'EIA2'):</span><br><span style="color: hsl(120, 100%, 40%);">+ return True</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError('Unknown integrity algorithm')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> INT = 'int'</span><br><span> STR = 'str'</span><br><span> UINT = 'uint'</span><br><span>@@ -174,6 +179,7 @@</span><br><span> OSMO_TRX_CLOCK_REF = 'osmo_trx_clock_ref'</span><br><span> LTE_TRANSMISSION_MODE = 'lte_transmission_mode'</span><br><span> DURATION = 'duration'</span><br><span style="color: hsl(120, 100%, 40%);">+INTEGRITY_ALGO = 'integrity_algo'</span><br><span> </span><br><span> SCHEMA_TYPES = {</span><br><span> INT: int,</span><br><span>@@ -198,6 +204,7 @@</span><br><span> OSMO_TRX_CLOCK_REF: osmo_trx_clock_ref,</span><br><span> LTE_TRANSMISSION_MODE: lte_transmission_mode,</span><br><span> DURATION: duration,</span><br><span style="color: hsl(120, 100%, 40%);">+ INTEGRITY_ALGO: integrity_algo,</span><br><span> }</span><br><span> </span><br><span> def add(dest, src):</span><br><span>diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py</span><br><span>index cdf9505..1031662 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb.py</span><br><span>@@ -24,6 +24,12 @@</span><br><span> from .gnuradio_zmq_broker import GrBroker</span><br><span> </span><br><span> def on_register_schemas():</span><br><span style="color: hsl(120, 100%, 40%);">+ config_schema = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'cipher_algo_list[]': schema.CIPHER,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'integrity_algo_list[]': schema.INTEGRITY_ALGO,</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ schema.register_config_schema('enb', config_schema)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> resource_schema = {</span><br><span> 'label': schema.STR,</span><br><span> 'type': schema.STR,</span><br><span>diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl</span><br><span>index 4c7aa33..a7fdc63 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl</span><br><span>@@ -224,9 +224,9 @@</span><br><span> dpc_pucch_snr_target: 10,</span><br><span> </span><br><span> /* RRC/UP ciphering algorithm preference. EEA0 is always the last. */</span><br><span style="color: hsl(0, 100%, 40%);">- cipher_algo_pref: [],</span><br><span style="color: hsl(120, 100%, 40%);">+ cipher_algo_pref: [${(', '.join(list(dict.fromkeys(enb.cipher_algo)))).replace('EEA', '')}],</span><br><span> /* RRC integrity algorithm preference. EIA0 is always the last. */</span><br><span style="color: hsl(0, 100%, 40%);">- integ_algo_pref: [2, 1],</span><br><span style="color: hsl(120, 100%, 40%);">+ integ_algo_pref: [${(', '.join(list(dict.fromkeys(enb.integrity_algo)))).replace('EIA', '')}],</span><br><span> </span><br><span> /* (in ms) send RRC connection release after this time of network</span><br><span> inactivity */</span><br><span>diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>index 5df432b..8ebfee9 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>@@ -282,5 +282,5 @@</span><br><span> #link_failure_nof_err = 50</span><br><span> rrc_inactivity_timer = ${enb.inactivity_timer}</span><br><span> #max_prach_offset_us = 30</span><br><span style="color: hsl(0, 100%, 40%);">-#eea_pref_list = EEA0, EEA2, EEA1</span><br><span style="color: hsl(0, 100%, 40%);">-#eia_pref_list = EIA2, EIA1, EIA0</span><br><span style="color: hsl(120, 100%, 40%);">+eea_pref_list = ${', '.join(list(dict.fromkeys(enb.cipher_algo_list)))}</span><br><span style="color: hsl(120, 100%, 40%);">+eia_pref_list = ${', '.join(list(dict.fromkeys(enb.integrity_algo_list)))}</span><br><span>diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf</span><br><span>index 7704857..384535b 100644</span><br><span>--- a/sysmocom/defaults.conf</span><br><span>+++ b/sysmocom/defaults.conf</span><br><span>@@ -130,6 +130,14 @@</span><br><span> a3_hysteresis: 0</span><br><span> a3_time_to_trigger: 480</span><br><span> cell_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ cipher_algo_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - eea_0</span><br><span style="color: hsl(120, 100%, 40%);">+ - eea_2</span><br><span style="color: hsl(120, 100%, 40%);">+ - eea_1</span><br><span style="color: hsl(120, 100%, 40%);">+ integrity_algo_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - eia_2</span><br><span style="color: hsl(120, 100%, 40%);">+ - eia_1</span><br><span style="color: hsl(120, 100%, 40%);">+ - eia_0</span><br><span> - cell_id: 0x01</span><br><span> pci: 0x01</span><br><span> dl_earfcn: 2850</span><br><span>diff --git a/sysmocom/scenarios/cfg-enb-cipher@.conf b/sysmocom/scenarios/cfg-enb-cipher@.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..b4d64ed</span><br><span>--- /dev/null</span><br><span>+++ b/sysmocom/scenarios/cfg-enb-cipher@.conf</span><br><span>@@ -0,0 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+config:</span><br><span style="color: hsl(120, 100%, 40%);">+ enb:</span><br><span style="color: hsl(120, 100%, 40%);">+ cipher_algo_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - ${param1}</span><br><span>\ No newline at end of file</span><br><span>diff --git a/sysmocom/scenarios/cfg-enb-integ@.conf b/sysmocom/scenarios/cfg-enb-integ@.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..2b6c9f9</span><br><span>--- /dev/null</span><br><span>+++ b/sysmocom/scenarios/cfg-enb-integ@.conf</span><br><span>@@ -0,0 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+config:</span><br><span style="color: hsl(120, 100%, 40%);">+ enb:</span><br><span style="color: hsl(120, 100%, 40%);">+ integrity_algo_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - ${param1}</span><br><span>\ No newline at end of file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21533">change 21533</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-gsm-tester/+/21533"/><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-Change-Id: Id1fbf31c71967d67de11a23d52d32e44c0925061 </div>
<div style="display:none"> Gerrit-Change-Number: 21533 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: ninjab3s <nils.fuerste@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>