Change in osmo-gsm-tester[master]: enb, ms: refactor base_rate selection for ZMQ

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18637 )

Change subject: enb,ms: refactor base_rate selection for ZMQ
......................................................................

enb,ms: refactor base_rate selection for ZMQ

Use tailored sample rate only use for 6, 50 and 75 PRB. For all other bandwidths,
we use the full LTE rate and downsample.
With 5.76e6 as base sample rate, for example, we had some issue during the tests like:

[zmq] Error: tx time is 0.178 ms in the past (7833600 < 7835648)
[zmq] Error: tx time is 0.011 ms in the past (7835520 < 7835648)

Using a higher sample rate seems to work better.

Change-Id: I53678587b2c5e0e5dccb1b55a328ad2f1a97fc4c
---
M src/osmo_gsm_tester/obj/enb.py
M src/osmo_gsm_tester/obj/ms_amarisoft.py
M src/osmo_gsm_tester/obj/ms_srs.py
3 files changed, 9 insertions(+), 21 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py
index 699b66f..b221cb9 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -142,18 +142,14 @@
 
     #reference: srsLTE.git srslte_symbol_sz()
     def num_prb2symbol_sz(self, num_prb):
-        if num_prb <= 6:
+        if num_prb == 6:
             return 128
-        if num_prb <= 15:
-            return 256
-        if num_prb <= 25:
-            return 384
-        if num_prb <= 50:
+        if num_prb == 50:
             return 768
-        if num_prb <= 75:
+        if num_prb == 75:
             return 1024
-        if num_prb <= 110:
-            return 1536
+        return 1536
+
         raise log.Error('invalid num_prb %r', num_prb)
 
     def num_prb2base_srate(self, num_prb):
diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py
index 432f759..b2dc9c7 100644
--- a/src/osmo_gsm_tester/obj/ms_amarisoft.py
+++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py
@@ -45,8 +45,6 @@
         return 128
     if num_prb <= 15:
         return 256
-    if num_prb <= 25:
-        return 384
     if num_prb <= 50:
         return 768
     if num_prb <= 75:
diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py
index 604d5c7..0aad954 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -52,19 +52,13 @@
 
 #reference: srsLTE.git srslte_symbol_sz()
 def num_prb2symbol_sz(num_prb):
-    if num_prb <= 6:
+    if num_prb == 6:
         return 128
-    if num_prb <= 15:
-        return 256
-    if num_prb <= 25:
-        return 384
-    if num_prb <= 50:
+    if num_prb == 50:
         return 768
-    if num_prb <= 75:
+    if num_prb == 75:
         return 1024
-    if num_prb <= 110:
-        return 1536
-    raise log.Error('invalid num_prb %r', num_prb)
+    return 1536
 
 def num_prb2base_srate(num_prb):
     return num_prb2symbol_sz(num_prb) * 15 * 1000

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18637
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: I53678587b2c5e0e5dccb1b55a328ad2f1a97fc4c
Gerrit-Change-Number: 18637
Gerrit-PatchSet: 5
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200610/a92c8503/attachment.htm>