Change in osmo-gsm-tester[master]: srs/amarisoft{ue, enb}: Fix b200 specific rf_dev_args

[pespin]

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

Change subject: srs/amarisoft{ue,enb}: Fix b200 specific rf_dev_args
......................................................................

srs/amarisoft{ue,enb}: Fix b200 specific rf_dev_args

Commit 12ae6d79a5b53a213f619999ef0230c1dae88bb7 switched the rf_dev_type
to be in lowercase but forgot to change these conditions.

Change-Id: I91d3877381b4e6343dc4aa0465e699341ed6648d
---
M doc/manuals/chapters/config.adoc
M doc/manuals/chapters/config_mangling.adoc
M src/osmo_gsm_tester/amarisoft_enb.py
M src/osmo_gsm_tester/srs_enb.py
M src/osmo_gsm_tester/srs_ue.py
5 files changed, 8 insertions(+), 7 deletions(-)

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



diff --git a/doc/manuals/chapters/config.adoc b/doc/manuals/chapters/config.adoc
index e70b396..4dd90ff 100644
--- a/doc/manuals/chapters/config.adoc
+++ b/doc/manuals/chapters/config.adoc
@@ -416,14 +416,15 @@
     - num_prb: ${param2}
 ----
 
-Finally, it can be referenced during {app-name} execution this wya, for instance when running a suite named '4g':
+Finally, it can be referenced during {app-name} execution this way, for instance
+when running a suite named '4g':
 ----
-- 4g:my-parametrized-scenario at UHD,6
+- 4g:my-parametrized-scenario at uhd,6
 ----
 This way {app-name} when parsing the scenarios and combining them with the suite will::
 . Find out it is parametrized (name contains '@').
 . Split the name
-  ('my-parametrized-scenario') from the parameter list (param1='UHD', param2='6')
+  ('my-parametrized-scenario') from the parameter list (param1='uhd', param2='6')
 . Attempt to match a '.conf' file fully matching name and parameters (hence
   specific content can be set for specific values while still using parameters
   for general values), and otherwise match only by name.
diff --git a/doc/manuals/chapters/config_mangling.adoc b/doc/manuals/chapters/config_mangling.adoc
index 310b15f..e579732 100644
--- a/doc/manuals/chapters/config_mangling.adoc
+++ b/doc/manuals/chapters/config_mangling.adoc
@@ -188,7 +188,7 @@
 
 - label: srsENB-B200
   type: srsenb
-  rf_dev_type: UHD
+  rf_dev_type: uhd
   rf_dev_args: "type=b200,serial=317B9FE"
   remote_user: jenkins
   addr: 10.12.1.206
diff --git a/src/osmo_gsm_tester/amarisoft_enb.py b/src/osmo_gsm_tester/amarisoft_enb.py
index df8e0db..c92bf50 100644
--- a/src/osmo_gsm_tester/amarisoft_enb.py
+++ b/src/osmo_gsm_tester/amarisoft_enb.py
@@ -185,7 +185,7 @@
                                                  rf_dev_args=rf_dev_args)))
 
         # Set UHD frame size as a function of the cell bandwidth on B2XX
-        if self._conf.get('rf_dev_type') == 'UHD' and values['enb'].get('rf_dev_args', None) is not None:
+        if self._conf.get('rf_dev_type') == 'uhd' and values['enb'].get('rf_dev_args', None) is not None:
             if 'b200' in values['enb'].get('rf_dev_args'):
                 rf_dev_args = values['enb'].get('rf_dev_args', '')
                 rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index fe0e550..372848d 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -214,7 +214,7 @@
             config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))
 
         # Set UHD frame size as a function of the cell bandwidth on B2XX
-        if self._conf.get('rf_dev_type') == 'UHD' and values['enb'].get('rf_dev_args', None) is not None:
+        if self._conf.get('rf_dev_type') == 'uhd' and values['enb'].get('rf_dev_args', None) is not None:
             if 'b200' in values['enb'].get('rf_dev_args'):
                 rf_dev_args = values['enb'].get('rf_dev_args', '')
                 rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''
diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index 00f729f..119a477 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -242,7 +242,7 @@
                                                 )))
 
         # Set UHD frame size as a function of the cell bandwidth on B2XX
-        if self._conf.get('rf_dev_type') == 'UHD' and values['ue'].get('rf_dev_args', None) is not None:
+        if self._conf.get('rf_dev_type') == 'uhd' and values['ue'].get('rf_dev_args', None) is not None:
             if 'b200' in values['ue'].get('rf_dev_args'):
                 rf_dev_args = values['ue'].get('rf_dev_args', '')
                 rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17753
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: I91d3877381b4e6343dc4aa0465e699341ed6648d
Gerrit-Change-Number: 17753
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
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/20200407/09551d7f/attachment.htm>