cellular-infrastructure
/
osmo-gsm-tester
mirror of https://gerrit.osmocom.org/osmo-gsm-tester
9
0
Fork 0
Code Issues Releases Wiki Activity

Add modem resource features attributes: 2g, 3g, 4g 

This allows selecting modem by supported network type. It will allow
using 4G modems with type different than srsue in 4g suite in the future.

Change-Id: I38bcf6abf789f52c3ed0bee7911567fa872e2491
This commit is contained in:
Pau Espin 2020-03-31 11:12:39 +02:00
parent 64ad952de1
commit eae9c90d17
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
example/resources.conf.prod
View File

@ -197,56 +197,56 @@ modem:
ki: 'EBAB63D06C3F546A16C977CB40E57C68'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'sim']
- label: sierra_2nd
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.3'
ki: 'EBD2B5F6CF3374106D0A66C11F922001'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'sim']
- label: gobi2k
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5'
ki: '5752B3F43277C35D2D1D957007DF74E2'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sim']
features: ['2g', 'sim']
- label: ec20_1
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6'
ki: '07F35D0A9476646169669401215580E0'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'gprs', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']
- label: ec20_2
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.2'
ki: '278B899D126C31F3B24D21E3EB556530'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'gprs', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']
- label: ec20_3
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.3'
ki: 'B43BBCD8DE4D594F4146DE3D8ADC589D'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'gprs', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']
- label: ec20_4
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.5'
ki: 'A41F06F39DE3B0295C178A674D3E3636'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'gprs', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']
- label: ec20_5
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.6'
ki: '8CCBE85A62C6DC7AC2A9886F4BBC3146'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'gprs', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']
- label: srsUE-zmq_1
type: srsue
@ -257,6 +257,7 @@ modem:
imsi: '001010123456789'
ki: '00112233445566778899aabbccddeeff'
auth_algo: 'xor'
features: ['4g']
- label: srsUE-soapy-lms_1
type: srsue
@ -267,6 +268,7 @@ modem:
imsi: '001010123456789'
ki: '00112233445566778899aabbccddeeff'
auth_algo: 'xor'
features: ['4g']
osmocon_phone:
- serial_device: '/dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_00897B41-if00-port0'

8
example/resources.conf.rnd
View File

@ -74,28 +74,28 @@ modem:
ki: '80A37E6FDEA931EAC92FFA5F671EFEAD'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'sim']
- label: sierra_2nd
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.3'
ki: '00969E283349D354A8239E877F2E0866'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'sim']
- label: ec20_1
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.6'
ki: 'BB70807226393CDBAC8DD3439FF54252'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'gprs', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']
- label: ec20_2
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.5'
ki: '2F70DCA43C45ACB97E947FDD0C7CA30A'
auth_algo: 'comp128v1'
ciphers: [a5_0, a5_1]
features: ['sms', 'voice', 'ussd', 'gprs', 'sim']
features: ['2g', 'sms', 'voice', 'ussd', 'gprs', 'sim']
osmocon_phone:
- serial_device: '/dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_0089279D-if00-port0'

2
src/osmo_gsm_tester/schema.py
View File

@ -95,7 +95,7 @@ def cipher(val):
raise ValueError('Unknown Cipher value: %r' % val)
def modem_feature(val):
if val in ('sms', 'gprs', 'voice', 'ussd', 'sim'):
if val in ('sms', 'gprs', 'voice', 'ussd', 'sim', '2g', '3g', '4g'):
return
raise ValueError('Unknown Modem Feature: %r' % val)

3
suites/4g/suite.conf
View File

@ -5,7 +5,8 @@ resources:
- times: 1
modem:
- times: 1
type: srsue
features:
- 4g
defaults:
timeout: 180s