Replace suites dyn_ts_ipa* and voice using scenario modifiers

Now that we support modifiers in scenario files, we don't need to
duplicate tests and testsuites to dynamically set trx configuration at
run time. It can be done more easily with scenario modifiers.

Change-Id: I80c441bb5b98d5d2e95d4c6ae1efab3e5f3c40d9

5 files changed, 80 insertions, 14 deletions

diff --git a/example/default-suites.conf b/example/default-suites.conf
index fa95daa..7ff8470 100644
--- a/example/default-suites.conf
+++ b/example/default-suites.conf
@@ -2,45 +2,59 @@
 - aoip_sms:sysmo
 - ussd:sysmo
 - aoip_ussd:sysmo
-- voice:sysmo
-- dyn_ts_ipa:sysmo
-- dyn_ts_osmo:sysmo
+- voice:sysmo+mod-bts0-ts-tchf
+- voice:sysmo+mod-bts0-ts-tchh
+- voice:sysmo+mod-bts0-dynts-ipa
+- voice:sysmo+mod-bts0-dynts-osmo
 - gprs:sysmo
+- gprs:sysmo+mod-bts0-dynts-ipa
+- gprs:sysmo+mod-bts0-dynts-osmo
 - sms:trx-b200
 - aoip_sms:trx-b200
 - ussd:trx-b200
 - aoip_ussd:trx-b200
-- voice:trx-b200
-- dyn_ts_ipa:trx-b200
-- dyn_ts_osmo:trx-b200
+- voice:trx-b200+mod-bts0-ts-tchf
+- voice:trx-b200+mod-bts0-ts-tchh
+- voice:trx-b200+mod-bts0-dynts-ipa
+- voice:trx-b200+mod-bts0-dynts-osmo
 - gprs:trx-b200
+- gprs:trx-b200+mod-bts0-dynts-ipa
+- gprs:trx-b200+mod-bts0-dynts-osmo
 - sms:trx-sysmocell5000
 - aoip_sms:trx-sysmocell5000
 - ussd:trx-sysmocell5000
 - aoip_ussd:trx-sysmocell5000
-- voice:trx-sysmocell5000
-- dyn_ts_ipa:trx-sysmocell5000
-- dyn_ts_osmo:trx-sysmocell5000
+- voice:trx-sysmocell5000+mod-bts0-ts-tchf
+- voice:trx-sysmocell5000+mod-bts0-ts-tchh
+- voice:trx-sysmocell5000+mod-bts0-dynts-ipa
+- voice:trx-sysmocell5000+mod-bts0-dynts-osmo
 - gprs:trx-sysmocell5000
+- gprs:trx-sysmocell5000+mod-bts0-dynts-ipa
+- gprs:trx-sysmocell5000+mod-bts0-dynts-osmo
 - sms:octphy
 - aoip_sms:octphy
 - ussd:octphy
 - aoip_ussd:octphy
-- voice:octphy
+- voice:octphy+mod-bts0-ts-tchf
+- voice:octphy+mod-bts0-ts-tchh
 - gprs:octphy
 - sms:nanobts
 - aoip_sms:nanobts+band-1900
 - ussd:nanobts+band-1900
 - aoip_ussd:nanobts+band-1900
-- voice:nanobts+band-1900
-- dyn_ts_ipa:nanobts+band-1900
+- voice:nanobts+band-1900+mod-bts0-ts-tchf
+- voice:nanobts+band-1900+mod-bts0-ts-tchh
+- voice:nanobts+band-1900+mod-bts0-dynts-ipa
 - gprs:nanobts+band-1900
+- gprs:nanobts+band-1900+mod-bts0-dynts-ipa
 - aoip_sms:nanobts+band-900
 - ussd:nanobts+band-900
 - aoip_ussd:nanobts+band-900
-- voice:nanobts+band-900
-- dyn_ts_ipa:nanobts+band-900
+- voice:nanobts+band-900+mod-bts0-ts-tchf
+- voice:nanobts+band-900+mod-bts0-ts-tchh
+- voice:nanobts+band-900+mod-bts0-dynts-ipa
 - gprs:nanobts+band-900
+- gprs:nanobts+band-900+mod-bts0-dynts-ipa
 - smpp
 - aoip_smpp
 - aoip_encryption
diff --git a/example/scenarios/mod-bts0-dynts-ipa.conf b/example/scenarios/mod-bts0-dynts-ipa.conf
new file mode 100644
index 0000000..fcad2c7
--- /dev/null
+++ b/example/scenarios/mod-bts0-dynts-ipa.conf
@@ -0,0 +1,13 @@
+modifiers:
+  bts:
+  - num_trx: 1
+    trx_list:
+    - timeslot_list:
+      - phys_chan_config: 'CCCH+SDCCH4'
+      - phys_chan_config: 'SDCCH8'
+      - phys_chan_config: 'TCH/F_PDCH'
+      - phys_chan_config: 'TCH/F_PDCH'
+      - phys_chan_config: 'TCH/F_PDCH'
+      - phys_chan_config: 'TCH/F_PDCH'
+      - phys_chan_config: 'TCH/F_PDCH'
+      - phys_chan_config: 'TCH/F_PDCH'
diff --git a/example/scenarios/mod-bts0-dynts-osmo.conf b/example/scenarios/mod-bts0-dynts-osmo.conf
new file mode 100644
index 0000000..26345bd
--- /dev/null
+++ b/example/scenarios/mod-bts0-dynts-osmo.conf
@@ -0,0 +1,13 @@
+modifiers:
+  bts:
+  - num_trx: 1
+    trx_list:
+    - timeslot_list:
+      - phys_chan_config: 'CCCH+SDCCH4'
+      - phys_chan_config: 'SDCCH8'
+      - phys_chan_config: 'TCH/F_TCH/H_PDCH'
+      - phys_chan_config: 'TCH/F_TCH/H_PDCH'
+      - phys_chan_config: 'TCH/F_TCH/H_PDCH'
+      - phys_chan_config: 'TCH/F_TCH/H_PDCH'
+      - phys_chan_config: 'TCH/F_TCH/H_PDCH'
+      - phys_chan_config: 'TCH/F_TCH/H_PDCH'
diff --git a/example/scenarios/mod-bts0-ts-tchf.conf b/example/scenarios/mod-bts0-ts-tchf.conf
new file mode 100644
index 0000000..527b620
--- /dev/null
+++ b/example/scenarios/mod-bts0-ts-tchf.conf
@@ -0,0 +1,13 @@
+modifiers:
+  bts:
+  - num_trx: 1
+    trx_list:
+    - timeslot_list:
+      - phys_chan_config: 'CCCH+SDCCH4'
+      - phys_chan_config: 'SDCCH8'
+      - phys_chan_config: 'TCH/F'
+      - phys_chan_config: 'TCH/F'
+      - phys_chan_config: 'TCH/F'
+      - phys_chan_config: 'TCH/F'
+      - phys_chan_config: 'TCH/F'
+      - phys_chan_config: 'TCH/F'
diff --git a/example/scenarios/mod-bts0-ts-tchh.conf b/example/scenarios/mod-bts0-ts-tchh.conf
new file mode 100644
index 0000000..0709bc4
--- /dev/null
+++ b/example/scenarios/mod-bts0-ts-tchh.conf
@@ -0,0 +1,13 @@
+modifiers:
+  bts:
+  - num_trx: 1
+    trx_list:
+    - timeslot_list:
+      - phys_chan_config: 'CCCH+SDCCH4'
+      - phys_chan_config: 'SDCCH8'
+      - phys_chan_config: 'TCH/H'
+      - phys_chan_config: 'TCH/H'
+      - phys_chan_config: 'TCH/H'
+      - phys_chan_config: 'TCH/H'
+      - phys_chan_config: 'TCH/H'
+      - phys_chan_config: 'TCH/H'