Move suites/ dir inside example/
example/paths.conf and documentation are updated accordingly.
Test suites should have been moved a long time ago, since the they are
user or setup-specific based on what needs to be tested.
Change-Id: I154b19979b545deba8b232b60172903f63fd9e28
diff --git a/doc/manuals/chapters/config.adoc b/doc/manuals/chapters/config.adoc
index f9b390d..e70b396 100644
--- a/doc/manuals/chapters/config.adoc
+++ b/doc/manuals/chapters/config.adoc
@@ -566,7 +566,7 @@
- <<paths_conf,paths.conf>>: Available Available under 'example/', with its paths
already configured to take required bits from inside the git repository.
-- <<suite_dir,suites_dir>>: Available under 'suites/'
+- <<suite_dir,suites_dir>>: Available under 'example/suites/'
- <<scenarios_dir,scenarios_dir>>: Available under 'example/scenarios/'
- <<resource_conf,resources.conf>>: Available under 'example/' as
'resources.conf.prod' for Production setup and as 'resources.conf.rnd' for the
diff --git a/doc/manuals/chapters/install.adoc b/doc/manuals/chapters/install.adoc
index 30db8be..9ef654b 100644
--- a/doc/manuals/chapters/install.adoc
+++ b/doc/manuals/chapters/install.adoc
@@ -642,7 +642,7 @@
----
cd /etc
cp -R /usr/local/src/osmo-gsm-tester/example osmo-gsm-tester
-sed -i 's#\.\./suites#/usr/local/src/osmo-gsm-tester/suites#' osmo-gsm-tester/paths.conf
+sed -i 's#\./suites#/usr/local/src/osmo-gsm-tester/suites#' osmo-gsm-tester/paths.conf
----
NOTE: The configuration will be looked up in various places, see
diff --git a/example/paths.conf b/example/paths.conf
index 554d942..27c5818 100644
--- a/example/paths.conf
+++ b/example/paths.conf
@@ -1,3 +1,3 @@
state_dir: '/var/tmp/osmo-gsm-tester/state'
-suites_dir: '../suites'
+suites_dir: './suites'
scenarios_dir: './scenarios'
diff --git a/suites/4g/iperf3_dl.py b/example/suites/4g/iperf3_dl.py
similarity index 100%
rename from suites/4g/iperf3_dl.py
rename to example/suites/4g/iperf3_dl.py
diff --git a/suites/4g/iperf3_ul.py b/example/suites/4g/iperf3_ul.py
similarity index 100%
rename from suites/4g/iperf3_ul.py
rename to example/suites/4g/iperf3_ul.py
diff --git a/suites/4g/ping.py b/example/suites/4g/ping.py
similarity index 100%
rename from suites/4g/ping.py
rename to example/suites/4g/ping.py
diff --git a/suites/4g/suite.conf b/example/suites/4g/suite.conf
similarity index 100%
rename from suites/4g/suite.conf
rename to example/suites/4g/suite.conf
diff --git a/suites/debug/interactive.py b/example/suites/debug/interactive.py
similarity index 100%
rename from suites/debug/interactive.py
rename to example/suites/debug/interactive.py
diff --git a/suites/debug/suite.conf b/example/suites/debug/suite.conf
similarity index 100%
rename from suites/debug/suite.conf
rename to example/suites/debug/suite.conf
diff --git a/suites/dynts/suite.conf b/example/suites/dynts/suite.conf
similarity index 100%
rename from suites/dynts/suite.conf
rename to example/suites/dynts/suite.conf
diff --git a/suites/dynts/switch_tch_pdch.py b/example/suites/dynts/switch_tch_pdch.py
similarity index 100%
rename from suites/dynts/switch_tch_pdch.py
rename to example/suites/dynts/switch_tch_pdch.py
diff --git a/suites/encryption/lib/testlib.py b/example/suites/encryption/lib/testlib.py
similarity index 100%
rename from suites/encryption/lib/testlib.py
rename to example/suites/encryption/lib/testlib.py
diff --git a/suites/encryption/register_a5_0_authopt.py b/example/suites/encryption/register_a5_0_authopt.py
similarity index 100%
rename from suites/encryption/register_a5_0_authopt.py
rename to example/suites/encryption/register_a5_0_authopt.py
diff --git a/suites/encryption/register_a5_0_authreq.py b/example/suites/encryption/register_a5_0_authreq.py
similarity index 100%
rename from suites/encryption/register_a5_0_authreq.py
rename to example/suites/encryption/register_a5_0_authreq.py
diff --git a/suites/encryption/register_a5_1_authreq.py b/example/suites/encryption/register_a5_1_authreq.py
similarity index 100%
rename from suites/encryption/register_a5_1_authreq.py
rename to example/suites/encryption/register_a5_1_authreq.py
diff --git a/suites/encryption/register_a5_3_authreq.py b/example/suites/encryption/register_a5_3_authreq.py
similarity index 100%
rename from suites/encryption/register_a5_3_authreq.py
rename to example/suites/encryption/register_a5_3_authreq.py
diff --git a/suites/encryption/suite.conf b/example/suites/encryption/suite.conf
similarity index 100%
rename from suites/encryption/suite.conf
rename to example/suites/encryption/suite.conf
diff --git a/suites/gprs/cs_paging_gprs_active.py b/example/suites/gprs/cs_paging_gprs_active.py
similarity index 100%
rename from suites/gprs/cs_paging_gprs_active.py
rename to example/suites/gprs/cs_paging_gprs_active.py
diff --git a/suites/gprs/iperf3.py b/example/suites/gprs/iperf3.py
similarity index 100%
rename from suites/gprs/iperf3.py
rename to example/suites/gprs/iperf3.py
diff --git a/suites/gprs/iperf3m4.py b/example/suites/gprs/iperf3m4.py
similarity index 100%
rename from suites/gprs/iperf3m4.py
rename to example/suites/gprs/iperf3m4.py
diff --git a/suites/gprs/lib/testlib.py b/example/suites/gprs/lib/testlib.py
similarity index 100%
rename from suites/gprs/lib/testlib.py
rename to example/suites/gprs/lib/testlib.py
diff --git a/suites/gprs/ping.py b/example/suites/gprs/ping.py
similarity index 100%
rename from suites/gprs/ping.py
rename to example/suites/gprs/ping.py
diff --git a/suites/gprs/ping_idle_ping.py b/example/suites/gprs/ping_idle_ping.py
similarity index 100%
rename from suites/gprs/ping_idle_ping.py
rename to example/suites/gprs/ping_idle_ping.py
diff --git a/suites/gprs/suite.conf b/example/suites/gprs/suite.conf
similarity index 100%
rename from suites/gprs/suite.conf
rename to example/suites/gprs/suite.conf
diff --git a/suites/nitb_debug/error.py b/example/suites/nitb_debug/error.py
similarity index 100%
rename from suites/nitb_debug/error.py
rename to example/suites/nitb_debug/error.py
diff --git a/suites/nitb_debug/fail.py b/example/suites/nitb_debug/fail.py
similarity index 100%
rename from suites/nitb_debug/fail.py
rename to example/suites/nitb_debug/fail.py
diff --git a/suites/nitb_debug/fail_raise.py b/example/suites/nitb_debug/fail_raise.py
similarity index 100%
rename from suites/nitb_debug/fail_raise.py
rename to example/suites/nitb_debug/fail_raise.py
diff --git a/suites/nitb_debug/interactive.py b/example/suites/nitb_debug/interactive.py
similarity index 100%
rename from suites/nitb_debug/interactive.py
rename to example/suites/nitb_debug/interactive.py
diff --git a/suites/nitb_debug/pass.py b/example/suites/nitb_debug/pass.py
similarity index 100%
rename from suites/nitb_debug/pass.py
rename to example/suites/nitb_debug/pass.py
diff --git a/suites/nitb_debug/suite.conf b/example/suites/nitb_debug/suite.conf
similarity index 100%
rename from suites/nitb_debug/suite.conf
rename to example/suites/nitb_debug/suite.conf
diff --git a/suites/nitb_netreg/register.py b/example/suites/nitb_netreg/register.py
similarity index 100%
rename from suites/nitb_netreg/register.py
rename to example/suites/nitb_netreg/register.py
diff --git a/suites/nitb_netreg/register_default.py b/example/suites/nitb_netreg/register_default.py
similarity index 100%
rename from suites/nitb_netreg/register_default.py
rename to example/suites/nitb_netreg/register_default.py
diff --git a/suites/nitb_netreg/suite.conf b/example/suites/nitb_netreg/suite.conf
similarity index 100%
rename from suites/nitb_netreg/suite.conf
rename to example/suites/nitb_netreg/suite.conf
diff --git a/suites/nitb_netreg_mass/register_default_mass.py b/example/suites/nitb_netreg_mass/register_default_mass.py
similarity index 100%
rename from suites/nitb_netreg_mass/register_default_mass.py
rename to example/suites/nitb_netreg_mass/register_default_mass.py
diff --git a/suites/nitb_netreg_mass/suite.conf b/example/suites/nitb_netreg_mass/suite.conf
similarity index 100%
rename from suites/nitb_netreg_mass/suite.conf
rename to example/suites/nitb_netreg_mass/suite.conf
diff --git a/suites/nitb_smpp/esme_connect_policy_acceptall.py b/example/suites/nitb_smpp/esme_connect_policy_acceptall.py
similarity index 100%
rename from suites/nitb_smpp/esme_connect_policy_acceptall.py
rename to example/suites/nitb_smpp/esme_connect_policy_acceptall.py
diff --git a/suites/nitb_smpp/esme_connect_policy_closed.py b/example/suites/nitb_smpp/esme_connect_policy_closed.py
similarity index 100%
rename from suites/nitb_smpp/esme_connect_policy_closed.py
rename to example/suites/nitb_smpp/esme_connect_policy_closed.py
diff --git a/suites/nitb_smpp/esme_ms_sms_storeforward.py b/example/suites/nitb_smpp/esme_ms_sms_storeforward.py
similarity index 100%
rename from suites/nitb_smpp/esme_ms_sms_storeforward.py
rename to example/suites/nitb_smpp/esme_ms_sms_storeforward.py
diff --git a/suites/nitb_smpp/esme_ms_sms_transaction.py b/example/suites/nitb_smpp/esme_ms_sms_transaction.py
similarity index 100%
rename from suites/nitb_smpp/esme_ms_sms_transaction.py
rename to example/suites/nitb_smpp/esme_ms_sms_transaction.py
diff --git a/suites/nitb_smpp/suite.conf b/example/suites/nitb_smpp/suite.conf
similarity index 100%
rename from suites/nitb_smpp/suite.conf
rename to example/suites/nitb_smpp/suite.conf
diff --git a/suites/nitb_sms/mo_mt_sms.py b/example/suites/nitb_sms/mo_mt_sms.py
similarity index 100%
rename from suites/nitb_sms/mo_mt_sms.py
rename to example/suites/nitb_sms/mo_mt_sms.py
diff --git a/suites/nitb_sms/suite.conf b/example/suites/nitb_sms/suite.conf
similarity index 100%
rename from suites/nitb_sms/suite.conf
rename to example/suites/nitb_sms/suite.conf
diff --git a/suites/nitb_ussd/assert_extension.py b/example/suites/nitb_ussd/assert_extension.py
similarity index 100%
rename from suites/nitb_ussd/assert_extension.py
rename to example/suites/nitb_ussd/assert_extension.py
diff --git a/suites/nitb_ussd/suite.conf b/example/suites/nitb_ussd/suite.conf
similarity index 100%
rename from suites/nitb_ussd/suite.conf
rename to example/suites/nitb_ussd/suite.conf
diff --git a/suites/smpp/esme_connect_policy_acceptall.py b/example/suites/smpp/esme_connect_policy_acceptall.py
similarity index 100%
rename from suites/smpp/esme_connect_policy_acceptall.py
rename to example/suites/smpp/esme_connect_policy_acceptall.py
diff --git a/suites/smpp/esme_connect_policy_closed.py b/example/suites/smpp/esme_connect_policy_closed.py
similarity index 100%
rename from suites/smpp/esme_connect_policy_closed.py
rename to example/suites/smpp/esme_connect_policy_closed.py
diff --git a/suites/smpp/esme_ms_sms_storeforward.py b/example/suites/smpp/esme_ms_sms_storeforward.py
similarity index 100%
rename from suites/smpp/esme_ms_sms_storeforward.py
rename to example/suites/smpp/esme_ms_sms_storeforward.py
diff --git a/suites/smpp/esme_ms_sms_transaction.py b/example/suites/smpp/esme_ms_sms_transaction.py
similarity index 100%
rename from suites/smpp/esme_ms_sms_transaction.py
rename to example/suites/smpp/esme_ms_sms_transaction.py
diff --git a/suites/smpp/suite.conf b/example/suites/smpp/suite.conf
similarity index 100%
rename from suites/smpp/suite.conf
rename to example/suites/smpp/suite.conf
diff --git a/suites/sms/mo_mt_sms.py b/example/suites/sms/mo_mt_sms.py
similarity index 100%
rename from suites/sms/mo_mt_sms.py
rename to example/suites/sms/mo_mt_sms.py
diff --git a/suites/sms/suite.conf b/example/suites/sms/suite.conf
similarity index 100%
rename from suites/sms/suite.conf
rename to example/suites/sms/suite.conf
diff --git a/suites/ussd/assert_extension.py b/example/suites/ussd/assert_extension.py
similarity index 100%
rename from suites/ussd/assert_extension.py
rename to example/suites/ussd/assert_extension.py
diff --git a/suites/ussd/suite.conf b/example/suites/ussd/suite.conf
similarity index 100%
rename from suites/ussd/suite.conf
rename to example/suites/ussd/suite.conf
diff --git a/suites/voice/lib/testlib.py b/example/suites/voice/lib/testlib.py
similarity index 100%
rename from suites/voice/lib/testlib.py
rename to example/suites/voice/lib/testlib.py
diff --git a/suites/voice/mo_mt_call.py b/example/suites/voice/mo_mt_call.py
similarity index 100%
rename from suites/voice/mo_mt_call.py
rename to example/suites/voice/mo_mt_call.py
diff --git a/suites/voice/mo_mt_call_osmux.py b/example/suites/voice/mo_mt_call_osmux.py
similarity index 100%
rename from suites/voice/mo_mt_call_osmux.py
rename to example/suites/voice/mo_mt_call_osmux.py
diff --git a/suites/voice/suite.conf b/example/suites/voice/suite.conf
similarity index 100%
rename from suites/voice/suite.conf
rename to example/suites/voice/suite.conf