This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17713 )
Change subject: Add modem resource features attributes: 2G, 3G, 4G
......................................................................
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
---
M example/resources.conf.prod
M src/osmo_gsm_tester/schema.py
M suites/4g/suite.conf
3 files changed, 13 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/13/17713/1
diff --git a/example/resources.conf.prod b/example/resources.conf.prod
index 2d9d0a8..72a5ca1 100644
--- a/example/resources.conf.prod
+++ b/example/resources.conf.prod
@@ -197,56 +197,56 @@
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 @@
imsi: '001010123456789'
ki: '00112233445566778899aabbccddeeff'
auth_algo: 'xor'
+ features: ['4G']
- label: srsUE-soapy-lms_1
type: srsue
@@ -267,6 +268,7 @@
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'
diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py
index 85c5fd6..775e8bc 100644
--- a/src/osmo_gsm_tester/schema.py
+++ b/src/osmo_gsm_tester/schema.py
@@ -95,7 +95,7 @@
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)
diff --git a/suites/4g/suite.conf b/suites/4g/suite.conf
index c1086bc..fa4d6e4 100644
--- a/suites/4g/suite.conf
+++ b/suites/4g/suite.conf
@@ -5,7 +5,8 @@
- times: 1
modem:
- times: 1
- type: srsue
+ features:
+ - 4G
defaults:
timeout: 180s
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17713
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I38bcf6abf789f52c3ed0bee7911567fa872e2491
Gerrit-Change-Number: 17713
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200403/0b373c8f/attachment.htm>