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