<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17713">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add modem resource features attributes: 2g, 3g, 4g<br><br>This allows selecting modem by supported network type. It will allow<br>using 4G modems with type different than srsue in 4g suite in the future.<br><br>Change-Id: I38bcf6abf789f52c3ed0bee7911567fa872e2491<br>---<br>M example/resources.conf.prod<br>M example/resources.conf.rnd<br>M src/osmo_gsm_tester/schema.py<br>M suites/4g/suite.conf<br>4 files changed, 17 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/resources.conf.prod b/example/resources.conf.prod</span><br><span>index 2d9d0a8..c66cafa 100644</span><br><span>--- a/example/resources.conf.prod</span><br><span>+++ b/example/resources.conf.prod</span><br><span>@@ -197,56 +197,56 @@</span><br><span> ki: 'EBAB63D06C3F546A16C977CB40E57C68'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'sim']</span><br><span> </span><br><span> - label: sierra_2nd</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.3'</span><br><span> ki: 'EBD2B5F6CF3374106D0A66C11F922001'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'sim']</span><br><span> </span><br><span> - label: gobi2k</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5'</span><br><span> ki: '5752B3F43277C35D2D1D957007DF74E2'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sim']</span><br><span> </span><br><span> - label: ec20_1</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6'</span><br><span> ki: '07F35D0A9476646169669401215580E0'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span> </span><br><span> - label: ec20_2</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.2'</span><br><span> ki: '278B899D126C31F3B24D21E3EB556530'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span> </span><br><span> - label: ec20_3</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.3'</span><br><span> ki: 'B43BBCD8DE4D594F4146DE3D8ADC589D'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span> </span><br><span> - label: ec20_4</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.5'</span><br><span> ki: 'A41F06F39DE3B0295C178A674D3E3636'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span> </span><br><span> - label: ec20_5</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.6'</span><br><span> ki: '8CCBE85A62C6DC7AC2A9886F4BBC3146'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span> </span><br><span> - label: srsUE-zmq_1</span><br><span> type: srsue</span><br><span>@@ -257,6 +257,7 @@</span><br><span> imsi: '001010123456789'</span><br><span> ki: '00112233445566778899aabbccddeeff'</span><br><span> auth_algo: 'xor'</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['4g']</span><br><span> </span><br><span> - label: srsUE-soapy-lms_1</span><br><span> type: srsue</span><br><span>@@ -267,6 +268,7 @@</span><br><span> imsi: '001010123456789'</span><br><span> ki: '00112233445566778899aabbccddeeff'</span><br><span> auth_algo: 'xor'</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['4g']</span><br><span> </span><br><span> osmocon_phone:</span><br><span> - serial_device: '/dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_00897B41-if00-port0'</span><br><span>diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd</span><br><span>index 5358a61..4ce39d1 100644</span><br><span>--- a/example/resources.conf.rnd</span><br><span>+++ b/example/resources.conf.rnd</span><br><span>@@ -74,28 +74,28 @@</span><br><span> ki: '80A37E6FDEA931EAC92FFA5F671EFEAD'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'sim']</span><br><span> </span><br><span> - label: sierra_2nd</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.3'</span><br><span> ki: '00969E283349D354A8239E877F2E0866'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'sim']</span><br><span> </span><br><span> - label: ec20_1</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.6'</span><br><span> ki: 'BB70807226393CDBAC8DD3439FF54252'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span> </span><br><span> - label: ec20_2</span><br><span> path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.5'</span><br><span> ki: '2F70DCA43C45ACB97E947FDD0C7CA30A'</span><br><span> auth_algo: 'comp128v1'</span><br><span> ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(0, 100%, 40%);">- features: ['sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span style="color: hsl(120, 100%, 40%);">+ features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']</span><br><span> </span><br><span> osmocon_phone:</span><br><span> - serial_device: '/dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_0089279D-if00-port0'</span><br><span>diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py</span><br><span>index 85c5fd6..e9d1411 100644</span><br><span>--- a/src/osmo_gsm_tester/schema.py</span><br><span>+++ b/src/osmo_gsm_tester/schema.py</span><br><span>@@ -95,7 +95,7 @@</span><br><span> raise ValueError('Unknown Cipher value: %r' % val)</span><br><span> </span><br><span> def modem_feature(val):</span><br><span style="color: hsl(0, 100%, 40%);">- if val in ('sms', 'gprs', 'voice', 'ussd', 'sim'):</span><br><span style="color: hsl(120, 100%, 40%);">+ if val in ('sms', 'gprs', 'voice', 'ussd', 'sim', '2g', '3g', '4g'):</span><br><span> return</span><br><span> raise ValueError('Unknown Modem Feature: %r' % val)</span><br><span> </span><br><span>diff --git a/suites/4g/suite.conf b/suites/4g/suite.conf</span><br><span>index c1086bc..e439e99 100644</span><br><span>--- a/suites/4g/suite.conf</span><br><span>+++ b/suites/4g/suite.conf</span><br><span>@@ -5,7 +5,8 @@</span><br><span> - times: 1</span><br><span> modem:</span><br><span> - times: 1</span><br><span style="color: hsl(0, 100%, 40%);">- type: srsue</span><br><span style="color: hsl(120, 100%, 40%);">+ features:</span><br><span style="color: hsl(120, 100%, 40%);">+ - 4g</span><br><span> </span><br><span> defaults:</span><br><span> timeout: 180s</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17713">change 17713</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/+/17713"/><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: I38bcf6abf789f52c3ed0bee7911567fa872e2491 </div>
<div style="display:none"> Gerrit-Change-Number: 17713 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>