<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21511">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">configure fixed ARFCN per bts<br><br>Remove ARFCNs as a concept from resource pool, assign a fixed ARFCN to<br>each BTS and TRX in the resource pools.<br><br>Using ARFCNs on specific bands as resources was an idea that is hard to<br>implement, because specific BTS dictate selection of bands which<br>influences which ARFCNs can be picked. That means reserving ARFCN<br>resources is only possible after reserving specific BTS resources, but<br>the tester is currently not capable of such two-stage resolution.<br><br>Writing handover tests, I got the problem that both BTS in a scenario<br>attempt to use the same ARFCN.<br><br>The by far easiest solution is to assign one fixed ARFCN to each BTS and<br>TRX. If ever needed, a scenario modifier can still configure different<br>ARFCNs.<br><br>(Due to uncertainty about OC2G operation stability, I prefer to leave<br>OC2G on ARFCN 50, as it happened to end up being configured before this<br>patch.)<br><br>Change-Id: I0a6c60544226f4261f9106013478d6a27fc39f38<br>---<br>M selftest/resource_test/conf/resources.conf<br>M selftest/resource_test/resource_test.ok<br>M selftest/resource_test/resource_test.py<br>M selftest/suite_test/resources.conf<br>M src/osmo_gsm_tester/core/schema.py<br>M src/osmo_gsm_tester/obj/bts_nanobts.py<br>M src/osmo_gsm_tester/obj/bts_oc2g.py<br>M sysmocom/resources.conf.prod<br>M sysmocom/resources.conf.rnd<br>9 files changed, 27 insertions(+), 177 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/11/21511/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/selftest/resource_test/conf/resources.conf b/selftest/resource_test/conf/resources.conf</span><br><span>index 84d0ab9..71d8ee0 100644</span><br><span>--- a/selftest/resource_test/conf/resources.conf</span><br><span>+++ b/selftest/resource_test/conf/resources.conf</span><br><span>@@ -43,28 +43,6 @@</span><br><span> - 'a5_0'</span><br><span> - 'a5_1'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-arfcn:</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 512</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 514</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 516</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 518</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 520</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 540</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 542</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 544</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 546</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 548</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> modem:</span><br><span> - label: sierra_1</span><br><span> path: '/sierra_1'</span><br><span>diff --git a/selftest/resource_test/resource_test.ok b/selftest/resource_test/resource_test.ok</span><br><span>index 5f7d5f6..64cf39b 100644</span><br><span>--- a/selftest/resource_test/resource_test.ok</span><br><span>+++ b/selftest/resource_test/resource_test.ok</span><br><span>@@ -19,37 +19,7 @@</span><br><span> 'suites_dir': ['[PATH]/selftest/resource_test/conf/suite_test'],</span><br><span> 'trial_dir': '[PATH]/selftest/resource_test/conf/trial'}</span><br><span> *** all resources:</span><br><span style="color: hsl(0, 100%, 40%);">-{'arfcn': [{'_hash': 'e620569450f8259b3f0212ec19c285dd07df063c',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '512',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1800'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'_hash': '022621e513c5a5bf33b77430a1e9c886be676fa1',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '514',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1800'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'_hash': '3199abf375a1dd899e554e9d63a552e06d7f38bf',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '516',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1800'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'_hash': '57aa7bd1da62495f2857ae6b859193dd592a0a02',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '518',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1800'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'_hash': '53dd2e2682b736f427abd2ce59a9a50ca8130678',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '520',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1800'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'_hash': '31687a5e6d5140a4b3877606ca5f18244f11d706',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '540',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1900'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'_hash': '1def43a5c88a83cdb21279eacab0679ea08ffaf3',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '542',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1900'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'_hash': '1d6e3b08a3861fd4d748f111295ec5a93ecd3d23',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '544',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1900'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'_hash': '8fb36927de15466fcdbee01f7f65704c312cb36c',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '546',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1900'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'_hash': 'dc9ce027a257da087f31a5bc1ee6b4abd2637369',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '548',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1900'}],</span><br><span style="color: hsl(0, 100%, 40%);">- 'bts': [{'_hash': 'd2aa7c1124943de352351b650ca0c751784da6b6',</span><br><span style="color: hsl(120, 100%, 40%);">+{'bts': [{'_hash': 'd2aa7c1124943de352351b650ca0c751784da6b6',</span><br><span> 'addr': '10.42.42.114',</span><br><span> 'band': 'GSM-1800',</span><br><span> 'ciphers': ['a5_0', 'a5_1'],</span><br><span>@@ -116,13 +86,6 @@</span><br><span> *** end: all resources</span><br><span> </span><br><span> - request some resources</span><br><span>---- testowner: Verifying 2 x arfcn (candidates: 10)</span><br><span>---- testowner: DBG: Picked - _hash: e620569450f8259b3f0212ec19c285dd07df063c</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn: '512'</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">-- _hash: 022621e513c5a5bf33b77430a1e9c886be676fa1</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn: '514'</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span> --- testowner: Verifying 2 x bts (candidates: 3)</span><br><span> --- testowner: DBG: Picked - _hash: d2aa7c1124943de352351b650ca0c751784da6b6</span><br><span> addr: 10.42.42.114</span><br><span>@@ -169,13 +132,6 @@</span><br><span> label: sierra_2</span><br><span> path: /sierra_2</span><br><span> --- testowner: DBG: FileWatch: scheduling watch for directory [PATH]/selftest/resource_test/conf/test_work/state_dir</span><br><span>---- testowner: Reserving 2 x arfcn (candidates: 10)</span><br><span>---- testowner: DBG: Picked - _hash: e620569450f8259b3f0212ec19c285dd07df063c</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn: '512'</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">-- _hash: 022621e513c5a5bf33b77430a1e9c886be676fa1</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn: '514'</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span> --- testowner: Reserving 2 x bts (candidates: 3)</span><br><span> --- testowner: DBG: Picked - _hash: d2aa7c1124943de352351b650ca0c751784da6b6</span><br><span> addr: 10.42.42.114</span><br><span>@@ -223,15 +179,6 @@</span><br><span> path: /sierra_2</span><br><span> --- testowner: DBG: FileWatch: unscheduling watch <ObservedWatch: path=[PATH]/selftest/resource_test/conf/test_work/state_dir, is_recursive=False></span><br><span> ~~~ currently reserved:</span><br><span style="color: hsl(0, 100%, 40%);">-arfcn:</span><br><span style="color: hsl(0, 100%, 40%);">-- _hash: e620569450f8259b3f0212ec19c285dd07df063c</span><br><span style="color: hsl(0, 100%, 40%);">- _reserved_by: testowner-123-1490837279</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn: '512'</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">-- _hash: 022621e513c5a5bf33b77430a1e9c886be676fa1</span><br><span style="color: hsl(0, 100%, 40%);">- _reserved_by: testowner-123-1490837279</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn: '514'</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span> bts:</span><br><span> - _hash: d2aa7c1124943de352351b650ca0c751784da6b6</span><br><span> _reserved_by: testowner-123-1490837279</span><br><span>@@ -286,15 +233,7 @@</span><br><span> ~~~ end: currently reserved</span><br><span> </span><br><span> ~~~ with modifiers:</span><br><span style="color: hsl(0, 100%, 40%);">-resources(testowner)={'arfcn': [{'_hash': 'e620569450f8259b3f0212ec19c285dd07df063c',</span><br><span style="color: hsl(0, 100%, 40%);">- '_reserved_by': 'testowner-123-1490837279',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '512',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1800'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'_hash': '022621e513c5a5bf33b77430a1e9c886be676fa1',</span><br><span style="color: hsl(0, 100%, 40%);">- '_reserved_by': 'testowner-123-1490837279',</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': '514',</span><br><span style="color: hsl(0, 100%, 40%);">- 'band': 'GSM-1800'}],</span><br><span style="color: hsl(0, 100%, 40%);">- 'bts': [{'_hash': 'd2aa7c1124943de352351b650ca0c751784da6b6',</span><br><span style="color: hsl(120, 100%, 40%);">+resources(testowner)={'bts': [{'_hash': 'd2aa7c1124943de352351b650ca0c751784da6b6',</span><br><span> '_reserved_by': 'testowner-123-1490837279',</span><br><span> 'addr': '10.42.42.114',</span><br><span> 'band': 'GSM-1800',</span><br><span>@@ -345,24 +284,19 @@</span><br><span> 3rd subset should not match, pass</span><br><span> 4th subset should not match, pass</span><br><span> *** concurrent allocation:</span><br><span>---- testowner1: Verifying 2 x arfcn (candidates: 10)</span><br><span> --- testowner1: Verifying 2 x bts (candidates: 3)</span><br><span> --- testowner1: Verifying 1 x ip_address (candidates: 5)</span><br><span> --- testowner1: Verifying 2 x modem (candidates: 4)</span><br><span>---- testowner1: Reserving 2 x arfcn (candidates: 10)</span><br><span> --- testowner1: Reserving 2 x bts (candidates: 3)</span><br><span> --- testowner1: Reserving 1 x ip_address (candidates: 5)</span><br><span> --- testowner1: Reserving 2 x modem (candidates: 4)</span><br><span> - 2nd instance reserve() start</span><br><span>---- testowner2: Verifying 2 x arfcn (candidates: 10)</span><br><span> --- testowner2: Verifying 2 x bts (candidates: 3)</span><br><span> --- testowner2: Verifying 1 x ip_address (candidates: 5)</span><br><span> --- testowner2: Verifying 2 x modem (candidates: 4)</span><br><span>---- testowner2: Reserving 2 x arfcn (candidates: 8)</span><br><span> --- testowner2: Reserving 2 x bts (candidates: 1)</span><br><span> --- testowner2: Unable to reserve resources, too many currently reserved. Waiting until some are available again</span><br><span> - 1st instance free()</span><br><span>---- testowner2: Reserving 2 x arfcn (candidates: 10)</span><br><span> --- testowner2: Reserving 2 x bts (candidates: 3)</span><br><span> --- testowner2: Reserving 1 x ip_address (candidates: 5)</span><br><span> --- testowner2: Reserving 2 x modem (candidates: 4)</span><br><span>diff --git a/selftest/resource_test/resource_test.py b/selftest/resource_test/resource_test.py</span><br><span>index 13cce97..f793a42 100755</span><br><span>--- a/selftest/resource_test/resource_test.py</span><br><span>+++ b/selftest/resource_test/resource_test.py</span><br><span>@@ -81,7 +81,6 @@</span><br><span> want = {</span><br><span> 'ip_address': [ { 'times': 1 } ],</span><br><span> 'bts': [ { 'type': 'osmo-bts-sysmo', 'times': 1 , 'ciphers': ['a5_1']}, { 'type': 'osmo-bts-trx', 'times': 1 } ],</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn': [ { 'band': 'GSM-1800', 'times': 2 } ],</span><br><span> 'modem': [ { 'times': 2 , 'ciphers': ['a5_0', 'a5_1']} ],</span><br><span> }</span><br><span> modifiers = {</span><br><span>diff --git a/selftest/suite_test/resources.conf b/selftest/suite_test/resources.conf</span><br><span>index bd121cb..ff6fc9e 100644</span><br><span>--- a/selftest/suite_test/resources.conf</span><br><span>+++ b/selftest/suite_test/resources.conf</span><br><span>@@ -70,29 +70,6 @@</span><br><span> - nominal_power: 12</span><br><span> max_power_red: 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-arfcn:</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 512</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 514</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 516</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 518</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 520</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 540</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 542</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 544</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 546</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 548</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> modem:</span><br><span> - label: m7801</span><br><span> path: '/wavecom_0'</span><br><span>diff --git a/src/osmo_gsm_tester/core/schema.py b/src/osmo_gsm_tester/core/schema.py</span><br><span>index d56d6ec..89c4494 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>@@ -375,12 +375,10 @@</span><br><span> util.run_python_file_method(module_name, 'on_register_schemas', False)</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-_RESOURCE_TYPES = ['ip_address', 'arfcn']</span><br><span style="color: hsl(120, 100%, 40%);">+_RESOURCE_TYPES = ['ip_address',]</span><br><span> </span><br><span> _RESOURCES_SCHEMA = {</span><br><span> 'ip_address[].addr': IPV4,</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn[].arfcn': INT,</span><br><span style="color: hsl(0, 100%, 40%);">- 'arfcn[].band': BAND,</span><br><span> }</span><br><span> </span><br><span> _CONFIG_SCHEMA = {}</span><br><span>diff --git a/src/osmo_gsm_tester/obj/bts_nanobts.py b/src/osmo_gsm_tester/obj/bts_nanobts.py</span><br><span>index 03730a6..25efc7f 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bts_nanobts.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_nanobts.py</span><br><span>@@ -65,16 +65,6 @@</span><br><span> </span><br><span> def conf_for_bsc(self):</span><br><span> values = self.conf_for_bsc_prepare()</span><br><span style="color: hsl(0, 100%, 40%);">- # Hack until we have proper ARFCN resource allocation support (OS#2230)</span><br><span style="color: hsl(0, 100%, 40%);">- band = values.get('band')</span><br><span style="color: hsl(0, 100%, 40%);">- trx_list = values.get('trx_list')</span><br><span style="color: hsl(0, 100%, 40%);">- if band == 'GSM-1900':</span><br><span style="color: hsl(0, 100%, 40%);">- for trx_i in range(len(trx_list)):</span><br><span style="color: hsl(0, 100%, 40%);">- config.overlay(trx_list[trx_i], { 'arfcn' : str(531 + trx_i * 2) })</span><br><span style="color: hsl(0, 100%, 40%);">- elif band == 'GSM-900':</span><br><span style="color: hsl(0, 100%, 40%);">- for trx_i in range(len(trx_list)):</span><br><span style="color: hsl(0, 100%, 40%);">- config.overlay(trx_list[trx_i], { 'arfcn' : str(50 + trx_i * 2) })</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> config.overlay(values, { 'osmobsc_bts_type': 'nanobts' })</span><br><span> </span><br><span> self.dbg(conf=values)</span><br><span>diff --git a/src/osmo_gsm_tester/obj/bts_oc2g.py b/src/osmo_gsm_tester/obj/bts_oc2g.py</span><br><span>index 2d55637..7761ce3 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bts_oc2g.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_oc2g.py</span><br><span>@@ -78,12 +78,6 @@</span><br><span> </span><br><span> def conf_for_bsc(self):</span><br><span> values = self.conf_for_bsc_prepare()</span><br><span style="color: hsl(0, 100%, 40%);">- # Hack until we have proper ARFCN resource allocation support (OS#2230)</span><br><span style="color: hsl(0, 100%, 40%);">- band = values.get('band')</span><br><span style="color: hsl(0, 100%, 40%);">- trx_list = values.get('trx_list')</span><br><span style="color: hsl(0, 100%, 40%);">- if band == 'GSM-900':</span><br><span style="color: hsl(0, 100%, 40%);">- for trx_i in range(len(trx_list)):</span><br><span style="color: hsl(0, 100%, 40%);">- config.overlay(trx_list[trx_i], { 'arfcn' : str(50 + trx_i * 2) })</span><br><span> self.dbg(conf=values)</span><br><span> return values</span><br><span> </span><br><span>diff --git a/sysmocom/resources.conf.prod b/sysmocom/resources.conf.prod</span><br><span>index 01a03f1..a53d4ce 100644</span><br><span>--- a/sysmocom/resources.conf.prod</span><br><span>+++ b/sysmocom/resources.conf.prod</span><br><span>@@ -23,6 +23,8 @@</span><br><span> ipa_unit_id: 1</span><br><span> addr: 10.42.42.114</span><br><span> band: GSM-1800</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - arfcn: 868</span><br><span> direct_pcu: true</span><br><span> ciphers: [a5_0, a5_1, a5_3]</span><br><span> </span><br><span>@@ -31,6 +33,8 @@</span><br><span> ipa_unit_id: 6</span><br><span> addr: 10.42.42.50</span><br><span> band: GSM-1800</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - arfcn: 870</span><br><span> ciphers: [a5_0, a5_1, a5_3]</span><br><span> osmo_trx:</span><br><span> type: uhd</span><br><span>@@ -46,6 +50,8 @@</span><br><span> ipa_unit_id: 12</span><br><span> addr: 10.42.42.54</span><br><span> band: GSM-1800</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - arfcn: 872</span><br><span> ciphers: [a5_0, a5_1, a5_3]</span><br><span> osmo_trx:</span><br><span> type: uhd</span><br><span>@@ -60,6 +66,8 @@</span><br><span> ipa_unit_id: 11</span><br><span> addr: 10.42.42.53</span><br><span> band: GSM-1800</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - arfcn: 874</span><br><span> ciphers: [a5_0, a5_1, a5_3]</span><br><span> osmo_trx:</span><br><span> type: lms</span><br><span>@@ -76,6 +84,8 @@</span><br><span> ipa_unit_id: 15</span><br><span> addr: 10.42.42.53</span><br><span> band: GSM-1800</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - arfcn: 876</span><br><span> ciphers: [a5_0, a5_1]</span><br><span> osmo_trx:</span><br><span> type: lms</span><br><span>@@ -96,6 +106,7 @@</span><br><span> type: 'intellinet'</span><br><span> device: '10.42.42.250'</span><br><span> port: '5'</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn: 878</span><br><span> osmo_trx:</span><br><span> type: sc5</span><br><span> launch_trx: true</span><br><span>@@ -111,6 +122,7 @@</span><br><span> trx_list:</span><br><span> - hw_addr: 00:0c:90:2e:80:1e</span><br><span> net_device: enp2s0</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn: 880</span><br><span> </span><br><span> - label: NanoBTS-ONW-1900</span><br><span> type: nanobts</span><br><span>@@ -122,6 +134,7 @@</span><br><span> type: 'intellinet'</span><br><span> device: '10.42.42.250'</span><br><span> port: '1'</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn: 533</span><br><span> </span><br><span> - label: NanoBTS-ONW-900</span><br><span> type: nanobts</span><br><span>@@ -134,23 +147,29 @@</span><br><span> type: 'intellinet'</span><br><span> device: '10.42.42.250'</span><br><span> port: '2'</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn: 54</span><br><span> - addr: 10.42.42.122</span><br><span> power_supply:</span><br><span> type: 'intellinet'</span><br><span> device: '10.42.42.250'</span><br><span> port: '3'</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn: 52</span><br><span> </span><br><span> - label: OsmoBTS Virtual</span><br><span> type: osmo-bts-virtual</span><br><span> ipa_unit_id: 13</span><br><span> addr: 10.42.42.55</span><br><span> band: GSM-1800</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - arfcn: 882</span><br><span> </span><br><span> - label: OC-2G</span><br><span> type: osmo-bts-oc2g</span><br><span> ipa_unit_id: 14</span><br><span> addr: 10.42.42.100</span><br><span> band: GSM-900</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - arfcn: 50</span><br><span> direct_pcu: true</span><br><span> ciphers: [a5_0, a5_1, a5_3]</span><br><span> </span><br><span>@@ -175,28 +194,6 @@</span><br><span> ssh_user: jenkins</span><br><span> ssh_addr: 10.42.42.117</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-arfcn:</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 512</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 514</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 516</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 518</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 520</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 540</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 542</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 544</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 546</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 548</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> modem:</span><br><span> - label: sierra_1st</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.2/1-5.2.2'</span><br><span>diff --git a/sysmocom/resources.conf.rnd b/sysmocom/resources.conf.rnd</span><br><span>index 4ce39d1..d9a6720 100644</span><br><span>--- a/sysmocom/resources.conf.rnd</span><br><span>+++ b/sysmocom/resources.conf.rnd</span><br><span>@@ -19,6 +19,8 @@</span><br><span> band: GSM-1800</span><br><span> direct_pcu: true</span><br><span> ciphers: [a5_0, a5_1, a5_3]</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - arfcn: 868</span><br><span> </span><br><span> - label: Ettus B200</span><br><span> type: osmo-bts-trx</span><br><span>@@ -34,6 +36,8 @@</span><br><span> trx_ip: 127.0.0.1</span><br><span> dev_args: "type=b200,serial=30A9FFB"</span><br><span> ciphers: [a5_0, a5_1, a5_3]</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - arfcn: 870</span><br><span> </span><br><span> - label: NanoBTS-ONW-1900</span><br><span> type: nanobts</span><br><span>@@ -45,28 +49,7 @@</span><br><span> type: 'sispm'</span><br><span> device: '01:01:55:2e:b6'</span><br><span> port: '1'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-arfcn:</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 512</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 514</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 516</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 518</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 520</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 540</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 542</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 544</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 546</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(0, 100%, 40%);">- - arfcn: 548</span><br><span style="color: hsl(0, 100%, 40%);">- band: GSM-1900</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn: 533</span><br><span> </span><br><span> modem:</span><br><span> - label: sierra_1st</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21511">change 21511</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/+/21511"/><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: I0a6c60544226f4261f9106013478d6a27fc39f38 </div>
<div style="display:none"> Gerrit-Change-Number: 21511 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>