octphy (untested); fix regression test expectations
Change-Id: Ie9986e0fe49171fb616ce92c3d8652002318f94f
diff --git a/selftest/real_suite/default-suites.conf b/selftest/real_suite/default-suites.conf
index 601076a..27a1eee 100644
--- a/selftest/real_suite/default-suites.conf
+++ b/selftest/real_suite/default-suites.conf
@@ -1 +1,3 @@
- sms:sysmo
+- sms:trx
+- sms:octphy
diff --git a/selftest/real_suite/default.conf b/selftest/real_suite/default.conf
index 251a7b8..8c7d1e5 100644
--- a/selftest/real_suite/default.conf
+++ b/selftest/real_suite/default.conf
@@ -23,9 +23,3 @@
- phys_chan_config: TCH/F_TCH/H_PDCH
- phys_chan_config: TCH/F_TCH/H_PDCH
- phys_chan_config: TCH/F_TCH/H_PDCH
-
-osmo_bts_sysmo:
- ipa_unit_id: 1123
-
-osmo_bts_trx:
- ipa_unit_id: 1124
diff --git a/selftest/real_suite/resources.conf b/selftest/real_suite/resources.conf
index 5fe4ca5..3a5b129 100644
--- a/selftest/real_suite/resources.conf
+++ b/selftest/real_suite/resources.conf
@@ -8,31 +8,32 @@
bts:
- label: sysmoBTS 1002
type: sysmo
- unit_id: 1
+ ipa_unit_id: 1
addr: 10.42.42.114
band: GSM-1800
- label: octBTS 3000
type: oct
- unit_id: 5
+ ipa_unit_id: 5
addr: 10.42.42.115
band: GSM-1800
trx:
- - hwaddr: 00:0c:90:32:b5:8a
+ - hw_addr: 00:0c:90:32:b5:8a
+ net_device: eth0.2342
- label: Ettus B210
type: osmotrx
- unit_id: 6
+ ipa_unit_id: 6
addr: 10.42.42.116
band: GSM-1800
- label: nanoBTS 1900
type: nanobts
- unit_id: 1902
+ ipa_unit_id: 1902
addr: 10.42.42.190
band: GSM-1900
trx:
- - hwaddr: 00:02:95:00:41:b3
+ - hw_addr: 00:02:95:00:41:b3
arfcn:
- arfcn: 512
diff --git a/selftest/real_suite/scenarios/octphy.conf b/selftest/real_suite/scenarios/octphy.conf
new file mode 100644
index 0000000..02eb48b
--- /dev/null
+++ b/selftest/real_suite/scenarios/octphy.conf
@@ -0,0 +1,3 @@
+resources:
+ bts:
+ - type: octphy