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/+/17725 ) Change subject: epc: Replace rlc_drb_mode wtth qci attribute ...................................................................... epc: Replace rlc_drb_mode wtth qci attribute Change-Id: I21b7d7009f9b0df8ec4f59189a65cfc26f164f04 --- M example/defaults.conf A example/scenarios/cfg-epc-qci at .conf D example/scenarios/cfg-epc-rlcmode at .conf M src/osmo_gsm_tester/amarisoft_epc.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py M src/osmo_gsm_tester/srs_epc.py M src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl 8 files changed, 10 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/25/17725/1 diff --git a/example/defaults.conf b/example/defaults.conf index 0b9136d..5cda132 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -97,8 +97,9 @@ type: srsepc mcc: 901 mnc: 70 + qci: 9 + srsepc: - rlc_drb_mode: UM enable_pcap: false amarisoft: diff --git a/example/scenarios/cfg-epc-qci at .conf b/example/scenarios/cfg-epc-qci at .conf new file mode 100644 index 0000000..8f9c937 --- /dev/null +++ b/example/scenarios/cfg-epc-qci at .conf @@ -0,0 +1,3 @@ +config: + epc: + qci: ${param1} diff --git a/example/scenarios/cfg-epc-rlcmode at .conf b/example/scenarios/cfg-epc-rlcmode at .conf deleted file mode 100644 index 2ddb044..0000000 --- a/example/scenarios/cfg-epc-rlcmode at .conf +++ /dev/null @@ -1,3 +0,0 @@ -config: - epc: - rlc_drb_mode: ${param1} diff --git a/src/osmo_gsm_tester/amarisoft_epc.py b/src/osmo_gsm_tester/amarisoft_epc.py index c1f341c..a117a9e 100644 --- a/src/osmo_gsm_tester/amarisoft_epc.py +++ b/src/osmo_gsm_tester/amarisoft_epc.py @@ -23,13 +23,6 @@ from . import log, util, config, template, process, remote from . import epc -#def rlc_drb_mode2qci(rlc_drb_mode): -# if rlc_drb_mode.upper() == "UM": -# return 7; -# elif rlc_drb_mode.upper() == "AM": -# return 9; -# raise log.Error('Unexpected rlc_drb_mode', rlc_drb_mode=rlc_drb_mode) - class AmarisoftEPC(epc.EPC): REMOTE_DIR = '/osmo-gsm-tester-amarisoftepc' @@ -150,11 +143,6 @@ config.overlay(values, dict(epc=dict(log_filename=logfile, ifup_filename=ifupfile))) - # Set qci for each subscriber: - #rlc_drb_mode = values['epc'].get('rlc_drb_mode', None) - #assert rlc_drb_mode is not None - #for i in range(len(self.subscriber_list)): - # self.subscriber_list[i]['qci'] = rlc_drb_mode2qci(rlc_drb_mode) config.overlay(values, dict(epc=dict(hss=dict(subscribers=self.subscriber_list)))) self.dbg('SRSEPC CONFIG:\n' + pprint.pformat(values)) diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index c69617c..ad8f4b2 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -125,7 +125,7 @@ 'config.bsc.net.codec_list[]': schema.CODEC, 'config.enb.enable_pcap': schema.BOOL_STR, 'config.epc.type': schema.STR, - 'config.epc.rlc_drb_mode': schema.LTE_RLC_DRB_MODE, + 'config.epc.qci': schema.UINT, 'config.epc.enable_pcap': schema.BOOL_STR, 'config.modem.enable_pcap': schema.BOOL_STR, 'config.amarisoft.license_server_addr': schema.IPV4, diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index e9d1411..d343bef 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -131,11 +131,6 @@ return raise ValueError('LTE Transmission Mode %d not in expected range' % n) -def lte_rlc_drb_mode(val): - if val.upper() in ('UM', 'AM'): - return - raise ValueError('Unknown LTE RLC DRB Mode value: %r' % val) - def duration(val): if val.isdecimal() or val.endswith('m') or val.endswith('h'): return @@ -161,7 +156,6 @@ CODEC = 'codec' OSMO_TRX_CLOCK_REF = 'osmo_trx_clock_ref' LTE_TRANSMISSION_MODE = 'lte_transmission_mode' -LTE_RLC_DRB_MODE = 'lte_rlc_drb_mode' DURATION = 'duration' SCHEMA_TYPES = { @@ -185,7 +179,6 @@ CODEC: codec, OSMO_TRX_CLOCK_REF: osmo_trx_clock_ref, LTE_TRANSMISSION_MODE: lte_transmission_mode, - LTE_RLC_DRB_MODE: lte_rlc_drb_mode, DURATION: duration, } diff --git a/src/osmo_gsm_tester/srs_epc.py b/src/osmo_gsm_tester/srs_epc.py index b2d728a..7c32486 100644 --- a/src/osmo_gsm_tester/srs_epc.py +++ b/src/osmo_gsm_tester/srs_epc.py @@ -23,13 +23,6 @@ from . import log, util, config, template, process, remote from . import epc -def rlc_drb_mode2qci(rlc_drb_mode): - if rlc_drb_mode.upper() == "UM": - return 7; - elif rlc_drb_mode.upper() == "AM": - return 9; - raise log.Error('Unexpected rlc_drb_mode', rlc_drb_mode=rlc_drb_mode) - class srsEPC(epc.EPC): REMOTE_DIR = '/osmo-gsm-tester-srsepc' @@ -165,10 +158,10 @@ config.overlay(values, dict(epc={'enable_pcap': self.enable_pcap})) # Set qci for each subscriber: - rlc_drb_mode = values['epc'].get('rlc_drb_mode', None) - assert rlc_drb_mode is not None + qci = values['epc'].get('qci', None) + assert qci is not None for i in range(len(self.subscriber_list)): - self.subscriber_list[i]['qci'] = rlc_drb_mode2qci(rlc_drb_mode) + self.subscriber_list[i]['qci'] = qci config.overlay(values, dict(epc=dict(hss=dict(subscribers=self.subscriber_list)))) self.dbg('SRSEPC CONFIG:\n' + pprint.pformat(values)) diff --git a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl index f17248e..ce7200f 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl @@ -63,7 +63,7 @@ dns_addr: "8.8.8.8", /* Google DNS address */ erabs: [ { - qci: 9, + qci: ${epc.qci}, priority_level: 15, pre_emption_capability: "shall_not_trigger_pre_emption", pre_emption_vulnerability: "not_pre_emptable", -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17725 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: I21b7d7009f9b0df8ec4f59189a65cfc26f164f04 Gerrit-Change-Number: 17725 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/20200406/83d272fe/attachment.htm>