Change in osmo-gsm-tester[master]: bts: Recreate resources.conf trx_list with len based on num_trx

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10194


Change subject: bts: Recreate resources.conf trx_list with len based on num_trx
......................................................................

bts: Recreate resources.conf trx_list with len based on num_trx

We are already doing this for defaults.cfg, but not for resources.conf.
As a result, if we have a trx_list with 2 trx but we have set num_trx=1
(default), parsing will fail later in bsc.cfg.tmpl because
conf_for_bsc_prepare() will pass a trx_list with 2 trx.

Change-Id: I28ed34abeedaa0ee2e7862ced45a46042192d831
---
M src/osmo_gsm_tester/bts.py
1 file changed, 7 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/94/10194/1

diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py
index ca33eb4..0f3ef1c 100644
--- a/src/osmo_gsm_tester/bts.py
+++ b/src/osmo_gsm_tester/bts.py
@@ -20,6 +20,7 @@
 import os
 import pprint
 import tempfile
+import copy
 from abc import ABCMeta, abstractmethod
 from . import log, config, util, template, process, schema, pcu_osmo
 
@@ -112,7 +113,12 @@
             config.overlay(values, { 'cell_identity': self.cellid })
         if self.bvci is not None:
             config.overlay(values, { 'bvci': self.bvci })
-        config.overlay(values, self.conf)
+
+        conf = copy.deepcopy(self.conf)
+        trx_list = conf.get('trx_list')
+        if trx_list and len(trx_list) != self.num_trx():
+            conf['trx_list'] = Bts._trx_list_recreate(trx_list, self.num_trx())
+        config.overlay(values, conf)
 
         sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client()
         config.overlay(values, sgsn_conf)

-- 
To view, visit https://gerrit.osmocom.org/10194
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28ed34abeedaa0ee2e7862ced45a46042192d831
Gerrit-Change-Number: 10194
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180727/79a4a062/attachment.htm>