fix octphy, fix conf, improve logging
Clearly separate the kinds of BTS hardware the GSM tester knows ('type') from
the NITB's bts/type config item ('osmobsc_bts_type' -- not 'osmonitb_...' to
stay in tune with future developments: it is the libbsc that needs this).
For BTS hardware kinds, use the full name of the binary for osmo driven models:
osmo-bts-sysmo, osmo-bts-trx, osmo-bts-octphy.
Change-Id: I1aa9b48e74013a93f9db1a34730f17717fb3b36c
diff --git a/selftest/real_suite/default.conf b/selftest/real_suite/default.conf
index 8c7d1e5..626da4b 100644
--- a/selftest/real_suite/default.conf
+++ b/selftest/real_suite/default.conf
@@ -11,6 +11,7 @@
location_area_code: 23
base_station_id_code: 63
stream_id: 255
+ osmobsc_bts_type: sysmobts
trx_list:
- max_power_red: 22
arfcn: 868
diff --git a/selftest/real_suite/resources.conf b/selftest/real_suite/resources.conf
index 3a5b129..c6573ee 100644
--- a/selftest/real_suite/resources.conf
+++ b/selftest/real_suite/resources.conf
@@ -7,22 +7,22 @@
bts:
- label: sysmoBTS 1002
- type: sysmo
+ type: osmo-bts-sysmo
ipa_unit_id: 1
addr: 10.42.42.114
band: GSM-1800
- label: octBTS 3000
- type: oct
+ type: osmo-bts-octphy
ipa_unit_id: 5
addr: 10.42.42.115
band: GSM-1800
- trx:
+ trx_list:
- hw_addr: 00:0c:90:32:b5:8a
net_device: eth0.2342
- label: Ettus B210
- type: osmotrx
+ type: osmo-bts-trx
ipa_unit_id: 6
addr: 10.42.42.116
band: GSM-1800
@@ -32,7 +32,7 @@
ipa_unit_id: 1902
addr: 10.42.42.190
band: GSM-1900
- trx:
+ trx_list:
- hw_addr: 00:02:95:00:41:b3
arfcn:
diff --git a/selftest/real_suite/scenarios/octphy.conf b/selftest/real_suite/scenarios/octphy.conf
index 02eb48b..3a419e8 100644
--- a/selftest/real_suite/scenarios/octphy.conf
+++ b/selftest/real_suite/scenarios/octphy.conf
@@ -1,3 +1,3 @@
resources:
bts:
- - type: octphy
+ - type: osmo-bts-octphy
diff --git a/selftest/real_suite/scenarios/sysmo.conf b/selftest/real_suite/scenarios/sysmo.conf
index 5980c1a..624758b 100644
--- a/selftest/real_suite/scenarios/sysmo.conf
+++ b/selftest/real_suite/scenarios/sysmo.conf
@@ -1,3 +1,3 @@
resources:
bts:
- - type: sysmo
+ - type: osmo-bts-sysmo
diff --git a/selftest/real_suite/scenarios/trx.conf b/selftest/real_suite/scenarios/trx.conf
index 98065aa..f1d6d13 100644
--- a/selftest/real_suite/scenarios/trx.conf
+++ b/selftest/real_suite/scenarios/trx.conf
@@ -1,3 +1,3 @@
resources:
bts:
- - type: osmotrx
+ - type: osmo-bts-trx