[MERGED] osmo-gsm-tester[master]: re-fix osmo-bts-trx config: 'osmotrx ip' must *not* be indented

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: re-fix osmo-bts-trx config: 'osmotrx ip' must *not* be indented
......................................................................


re-fix osmo-bts-trx config: 'osmotrx ip' must *not* be indented

The previous commit wrongly placed all of 'osmotrx' below 'instance 0', put the
'osmotrx ip' ones back in the parent (I3a48cda44b932b46f34f027ca88e3703b6f04bad
-- I should have known, the change Id ends in "bad").

The correct structure is:

	phy 0
	 osmotrx ip ...
	 instance 0
	  osmotrx rx-gain ...
	  osmotrx tx-attenuation ...

i.e. the 'osmotrx' command name exists on both the 'phy' parent level as well
as the 'instance' child level. (Argh, can this be more confusing? I assume we
will be seeing a continuous flow of users hitting this now.)

Change-Id: I7ef7ab3048266c1b2a4f6f33951f1305ec5f0ad6
---
M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved; Verified



diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
index f8c47d9..c316e62 100644
--- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
@@ -14,11 +14,11 @@
   logging level trx info
 !
 phy 0
+ osmotrx ip local ${osmo_bts_trx.trx_local_ip}
+ osmotrx ip remote ${osmo_bts_trx.trx_remote_ip}
  instance 0
   osmotrx rx-gain 25
   osmotrx tx-attenuation oml
-  osmotrx ip local ${osmo_bts_trx.trx_local_ip}
-  osmotrx ip remote ${osmo_bts_trx.trx_remote_ip}
 bts 0
  band ${osmo_bts_trx.band}
  ipa unit-id ${osmo_bts_trx.ipa_unit_id} 0

-- 
To view, visit https://gerrit.osmocom.org/3996
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ef7ab3048266c1b2a4f6f33951f1305ec5f0ad6
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>