<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17751">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move suites/ dir inside example/<br><br>example/paths.conf and documentation are updated accordingly.<br><br>Test suites should have been moved a long time ago, since the they are<br>user or setup-specific based on what needs to be tested.<br><br>Change-Id: I154b19979b545deba8b232b60172903f63fd9e28<br>---<br>M doc/manuals/chapters/config.adoc<br>M doc/manuals/chapters/install.adoc<br>M example/paths.conf<br>R example/suites/4g/iperf3_dl.py<br>R example/suites/4g/iperf3_ul.py<br>R example/suites/4g/ping.py<br>R example/suites/4g/suite.conf<br>R example/suites/debug/interactive.py<br>R example/suites/debug/suite.conf<br>R example/suites/dynts/suite.conf<br>R example/suites/dynts/switch_tch_pdch.py<br>R example/suites/encryption/lib/testlib.py<br>R example/suites/encryption/register_a5_0_authopt.py<br>R example/suites/encryption/register_a5_0_authreq.py<br>R example/suites/encryption/register_a5_1_authreq.py<br>R example/suites/encryption/register_a5_3_authreq.py<br>R example/suites/encryption/suite.conf<br>R example/suites/gprs/cs_paging_gprs_active.py<br>R example/suites/gprs/iperf3.py<br>R example/suites/gprs/iperf3m4.py<br>R example/suites/gprs/lib/testlib.py<br>R example/suites/gprs/ping.py<br>R example/suites/gprs/ping_idle_ping.py<br>R example/suites/gprs/suite.conf<br>R example/suites/nitb_debug/error.py<br>R example/suites/nitb_debug/fail.py<br>R example/suites/nitb_debug/fail_raise.py<br>R example/suites/nitb_debug/interactive.py<br>R example/suites/nitb_debug/pass.py<br>R example/suites/nitb_debug/suite.conf<br>R example/suites/nitb_netreg/register.py<br>R example/suites/nitb_netreg/register_default.py<br>R example/suites/nitb_netreg/suite.conf<br>R example/suites/nitb_netreg_mass/register_default_mass.py<br>R example/suites/nitb_netreg_mass/suite.conf<br>R example/suites/nitb_smpp/esme_connect_policy_acceptall.py<br>R example/suites/nitb_smpp/esme_connect_policy_closed.py<br>R example/suites/nitb_smpp/esme_ms_sms_storeforward.py<br>R example/suites/nitb_smpp/esme_ms_sms_transaction.py<br>R example/suites/nitb_smpp/suite.conf<br>R example/suites/nitb_sms/mo_mt_sms.py<br>R example/suites/nitb_sms/suite.conf<br>R example/suites/nitb_ussd/assert_extension.py<br>R example/suites/nitb_ussd/suite.conf<br>R example/suites/smpp/esme_connect_policy_acceptall.py<br>R example/suites/smpp/esme_connect_policy_closed.py<br>R example/suites/smpp/esme_ms_sms_storeforward.py<br>R example/suites/smpp/esme_ms_sms_transaction.py<br>R example/suites/smpp/suite.conf<br>R example/suites/sms/mo_mt_sms.py<br>R example/suites/sms/suite.conf<br>R example/suites/ussd/assert_extension.py<br>R example/suites/ussd/suite.conf<br>R example/suites/voice/lib/testlib.py<br>R example/suites/voice/mo_mt_call.py<br>R example/suites/voice/mo_mt_call_osmux.py<br>R example/suites/voice/suite.conf<br>57 files changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/51/17751/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/config.adoc b/doc/manuals/chapters/config.adoc</span><br><span>index f9b390d..e70b396 100644</span><br><span>--- a/doc/manuals/chapters/config.adoc</span><br><span>+++ b/doc/manuals/chapters/config.adoc</span><br><span>@@ -566,7 +566,7 @@</span><br><span> </span><br><span> - <<paths_conf,paths.conf>>: Available Available under 'example/', with its paths</span><br><span>   already configured to take required bits from inside the git repository.</span><br><span style="color: hsl(0, 100%, 40%);">-- <<suite_dir,suites_dir>>: Available under 'suites/'</span><br><span style="color: hsl(120, 100%, 40%);">+- <<suite_dir,suites_dir>>: Available under 'example/suites/'</span><br><span> - <<scenarios_dir,scenarios_dir>>: Available under 'example/scenarios/'</span><br><span> - <<resource_conf,resources.conf>>: Available under 'example/' as</span><br><span>   'resources.conf.prod' for Production setup and as 'resources.conf.rnd' for the</span><br><span>diff --git a/doc/manuals/chapters/install.adoc b/doc/manuals/chapters/install.adoc</span><br><span>index 30db8be..9ef654b 100644</span><br><span>--- a/doc/manuals/chapters/install.adoc</span><br><span>+++ b/doc/manuals/chapters/install.adoc</span><br><span>@@ -642,7 +642,7 @@</span><br><span> ----</span><br><span> cd /etc</span><br><span> cp -R /usr/local/src/osmo-gsm-tester/example osmo-gsm-tester</span><br><span style="color: hsl(0, 100%, 40%);">-sed -i 's#\.\./suites#/usr/local/src/osmo-gsm-tester/suites#' osmo-gsm-tester/paths.conf</span><br><span style="color: hsl(120, 100%, 40%);">+sed -i 's#\./suites#/usr/local/src/osmo-gsm-tester/suites#' osmo-gsm-tester/paths.conf</span><br><span> ----</span><br><span> </span><br><span> NOTE: The configuration will be looked up in various places, see</span><br><span>diff --git a/example/paths.conf b/example/paths.conf</span><br><span>index 554d942..27c5818 100644</span><br><span>--- a/example/paths.conf</span><br><span>+++ b/example/paths.conf</span><br><span>@@ -1,3 +1,3 @@</span><br><span> state_dir: '/var/tmp/osmo-gsm-tester/state'</span><br><span style="color: hsl(0, 100%, 40%);">-suites_dir: '../suites'</span><br><span style="color: hsl(120, 100%, 40%);">+suites_dir: './suites'</span><br><span> scenarios_dir: './scenarios'</span><br><span>diff --git a/suites/4g/iperf3_dl.py b/example/suites/4g/iperf3_dl.py</span><br><span>similarity index 100%</span><br><span>rename from suites/4g/iperf3_dl.py</span><br><span>rename to example/suites/4g/iperf3_dl.py</span><br><span>diff --git a/suites/4g/iperf3_ul.py b/example/suites/4g/iperf3_ul.py</span><br><span>similarity index 100%</span><br><span>rename from suites/4g/iperf3_ul.py</span><br><span>rename to example/suites/4g/iperf3_ul.py</span><br><span>diff --git a/suites/4g/ping.py b/example/suites/4g/ping.py</span><br><span>similarity index 100%</span><br><span>rename from suites/4g/ping.py</span><br><span>rename to example/suites/4g/ping.py</span><br><span>diff --git a/suites/4g/suite.conf b/example/suites/4g/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/4g/suite.conf</span><br><span>rename to example/suites/4g/suite.conf</span><br><span>diff --git a/suites/debug/interactive.py b/example/suites/debug/interactive.py</span><br><span>similarity index 100%</span><br><span>rename from suites/debug/interactive.py</span><br><span>rename to example/suites/debug/interactive.py</span><br><span>diff --git a/suites/debug/suite.conf b/example/suites/debug/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/debug/suite.conf</span><br><span>rename to example/suites/debug/suite.conf</span><br><span>diff --git a/suites/dynts/suite.conf b/example/suites/dynts/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/dynts/suite.conf</span><br><span>rename to example/suites/dynts/suite.conf</span><br><span>diff --git a/suites/dynts/switch_tch_pdch.py b/example/suites/dynts/switch_tch_pdch.py</span><br><span>similarity index 100%</span><br><span>rename from suites/dynts/switch_tch_pdch.py</span><br><span>rename to example/suites/dynts/switch_tch_pdch.py</span><br><span>diff --git a/suites/encryption/lib/testlib.py b/example/suites/encryption/lib/testlib.py</span><br><span>similarity index 100%</span><br><span>rename from suites/encryption/lib/testlib.py</span><br><span>rename to example/suites/encryption/lib/testlib.py</span><br><span>diff --git a/suites/encryption/register_a5_0_authopt.py b/example/suites/encryption/register_a5_0_authopt.py</span><br><span>similarity index 100%</span><br><span>rename from suites/encryption/register_a5_0_authopt.py</span><br><span>rename to example/suites/encryption/register_a5_0_authopt.py</span><br><span>diff --git a/suites/encryption/register_a5_0_authreq.py b/example/suites/encryption/register_a5_0_authreq.py</span><br><span>similarity index 100%</span><br><span>rename from suites/encryption/register_a5_0_authreq.py</span><br><span>rename to example/suites/encryption/register_a5_0_authreq.py</span><br><span>diff --git a/suites/encryption/register_a5_1_authreq.py b/example/suites/encryption/register_a5_1_authreq.py</span><br><span>similarity index 100%</span><br><span>rename from suites/encryption/register_a5_1_authreq.py</span><br><span>rename to example/suites/encryption/register_a5_1_authreq.py</span><br><span>diff --git a/suites/encryption/register_a5_3_authreq.py b/example/suites/encryption/register_a5_3_authreq.py</span><br><span>similarity index 100%</span><br><span>rename from suites/encryption/register_a5_3_authreq.py</span><br><span>rename to example/suites/encryption/register_a5_3_authreq.py</span><br><span>diff --git a/suites/encryption/suite.conf b/example/suites/encryption/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/encryption/suite.conf</span><br><span>rename to example/suites/encryption/suite.conf</span><br><span>diff --git a/suites/gprs/cs_paging_gprs_active.py b/example/suites/gprs/cs_paging_gprs_active.py</span><br><span>similarity index 100%</span><br><span>rename from suites/gprs/cs_paging_gprs_active.py</span><br><span>rename to example/suites/gprs/cs_paging_gprs_active.py</span><br><span>diff --git a/suites/gprs/iperf3.py b/example/suites/gprs/iperf3.py</span><br><span>similarity index 100%</span><br><span>rename from suites/gprs/iperf3.py</span><br><span>rename to example/suites/gprs/iperf3.py</span><br><span>diff --git a/suites/gprs/iperf3m4.py b/example/suites/gprs/iperf3m4.py</span><br><span>similarity index 100%</span><br><span>rename from suites/gprs/iperf3m4.py</span><br><span>rename to example/suites/gprs/iperf3m4.py</span><br><span>diff --git a/suites/gprs/lib/testlib.py b/example/suites/gprs/lib/testlib.py</span><br><span>similarity index 100%</span><br><span>rename from suites/gprs/lib/testlib.py</span><br><span>rename to example/suites/gprs/lib/testlib.py</span><br><span>diff --git a/suites/gprs/ping.py b/example/suites/gprs/ping.py</span><br><span>similarity index 100%</span><br><span>rename from suites/gprs/ping.py</span><br><span>rename to example/suites/gprs/ping.py</span><br><span>diff --git a/suites/gprs/ping_idle_ping.py b/example/suites/gprs/ping_idle_ping.py</span><br><span>similarity index 100%</span><br><span>rename from suites/gprs/ping_idle_ping.py</span><br><span>rename to example/suites/gprs/ping_idle_ping.py</span><br><span>diff --git a/suites/gprs/suite.conf b/example/suites/gprs/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/gprs/suite.conf</span><br><span>rename to example/suites/gprs/suite.conf</span><br><span>diff --git a/suites/nitb_debug/error.py b/example/suites/nitb_debug/error.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_debug/error.py</span><br><span>rename to example/suites/nitb_debug/error.py</span><br><span>diff --git a/suites/nitb_debug/fail.py b/example/suites/nitb_debug/fail.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_debug/fail.py</span><br><span>rename to example/suites/nitb_debug/fail.py</span><br><span>diff --git a/suites/nitb_debug/fail_raise.py b/example/suites/nitb_debug/fail_raise.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_debug/fail_raise.py</span><br><span>rename to example/suites/nitb_debug/fail_raise.py</span><br><span>diff --git a/suites/nitb_debug/interactive.py b/example/suites/nitb_debug/interactive.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_debug/interactive.py</span><br><span>rename to example/suites/nitb_debug/interactive.py</span><br><span>diff --git a/suites/nitb_debug/pass.py b/example/suites/nitb_debug/pass.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_debug/pass.py</span><br><span>rename to example/suites/nitb_debug/pass.py</span><br><span>diff --git a/suites/nitb_debug/suite.conf b/example/suites/nitb_debug/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_debug/suite.conf</span><br><span>rename to example/suites/nitb_debug/suite.conf</span><br><span>diff --git a/suites/nitb_netreg/register.py b/example/suites/nitb_netreg/register.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_netreg/register.py</span><br><span>rename to example/suites/nitb_netreg/register.py</span><br><span>diff --git a/suites/nitb_netreg/register_default.py b/example/suites/nitb_netreg/register_default.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_netreg/register_default.py</span><br><span>rename to example/suites/nitb_netreg/register_default.py</span><br><span>diff --git a/suites/nitb_netreg/suite.conf b/example/suites/nitb_netreg/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_netreg/suite.conf</span><br><span>rename to example/suites/nitb_netreg/suite.conf</span><br><span>diff --git a/suites/nitb_netreg_mass/register_default_mass.py b/example/suites/nitb_netreg_mass/register_default_mass.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_netreg_mass/register_default_mass.py</span><br><span>rename to example/suites/nitb_netreg_mass/register_default_mass.py</span><br><span>diff --git a/suites/nitb_netreg_mass/suite.conf b/example/suites/nitb_netreg_mass/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_netreg_mass/suite.conf</span><br><span>rename to example/suites/nitb_netreg_mass/suite.conf</span><br><span>diff --git a/suites/nitb_smpp/esme_connect_policy_acceptall.py b/example/suites/nitb_smpp/esme_connect_policy_acceptall.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_smpp/esme_connect_policy_acceptall.py</span><br><span>rename to example/suites/nitb_smpp/esme_connect_policy_acceptall.py</span><br><span>diff --git a/suites/nitb_smpp/esme_connect_policy_closed.py b/example/suites/nitb_smpp/esme_connect_policy_closed.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_smpp/esme_connect_policy_closed.py</span><br><span>rename to example/suites/nitb_smpp/esme_connect_policy_closed.py</span><br><span>diff --git a/suites/nitb_smpp/esme_ms_sms_storeforward.py b/example/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>rename to example/suites/nitb_smpp/esme_ms_sms_storeforward.py</span><br><span>diff --git a/suites/nitb_smpp/esme_ms_sms_transaction.py b/example/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>rename to example/suites/nitb_smpp/esme_ms_sms_transaction.py</span><br><span>diff --git a/suites/nitb_smpp/suite.conf b/example/suites/nitb_smpp/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_smpp/suite.conf</span><br><span>rename to example/suites/nitb_smpp/suite.conf</span><br><span>diff --git a/suites/nitb_sms/mo_mt_sms.py b/example/suites/nitb_sms/mo_mt_sms.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_sms/mo_mt_sms.py</span><br><span>rename to example/suites/nitb_sms/mo_mt_sms.py</span><br><span>diff --git a/suites/nitb_sms/suite.conf b/example/suites/nitb_sms/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_sms/suite.conf</span><br><span>rename to example/suites/nitb_sms/suite.conf</span><br><span>diff --git a/suites/nitb_ussd/assert_extension.py b/example/suites/nitb_ussd/assert_extension.py</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_ussd/assert_extension.py</span><br><span>rename to example/suites/nitb_ussd/assert_extension.py</span><br><span>diff --git a/suites/nitb_ussd/suite.conf b/example/suites/nitb_ussd/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/nitb_ussd/suite.conf</span><br><span>rename to example/suites/nitb_ussd/suite.conf</span><br><span>diff --git a/suites/smpp/esme_connect_policy_acceptall.py b/example/suites/smpp/esme_connect_policy_acceptall.py</span><br><span>similarity index 100%</span><br><span>rename from suites/smpp/esme_connect_policy_acceptall.py</span><br><span>rename to example/suites/smpp/esme_connect_policy_acceptall.py</span><br><span>diff --git a/suites/smpp/esme_connect_policy_closed.py b/example/suites/smpp/esme_connect_policy_closed.py</span><br><span>similarity index 100%</span><br><span>rename from suites/smpp/esme_connect_policy_closed.py</span><br><span>rename to example/suites/smpp/esme_connect_policy_closed.py</span><br><span>diff --git a/suites/smpp/esme_ms_sms_storeforward.py b/example/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>similarity index 100%</span><br><span>rename from suites/smpp/esme_ms_sms_storeforward.py</span><br><span>rename to example/suites/smpp/esme_ms_sms_storeforward.py</span><br><span>diff --git a/suites/smpp/esme_ms_sms_transaction.py b/example/suites/smpp/esme_ms_sms_transaction.py</span><br><span>similarity index 100%</span><br><span>rename from suites/smpp/esme_ms_sms_transaction.py</span><br><span>rename to example/suites/smpp/esme_ms_sms_transaction.py</span><br><span>diff --git a/suites/smpp/suite.conf b/example/suites/smpp/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/smpp/suite.conf</span><br><span>rename to example/suites/smpp/suite.conf</span><br><span>diff --git a/suites/sms/mo_mt_sms.py b/example/suites/sms/mo_mt_sms.py</span><br><span>similarity index 100%</span><br><span>rename from suites/sms/mo_mt_sms.py</span><br><span>rename to example/suites/sms/mo_mt_sms.py</span><br><span>diff --git a/suites/sms/suite.conf b/example/suites/sms/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/sms/suite.conf</span><br><span>rename to example/suites/sms/suite.conf</span><br><span>diff --git a/suites/ussd/assert_extension.py b/example/suites/ussd/assert_extension.py</span><br><span>similarity index 100%</span><br><span>rename from suites/ussd/assert_extension.py</span><br><span>rename to example/suites/ussd/assert_extension.py</span><br><span>diff --git a/suites/ussd/suite.conf b/example/suites/ussd/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/ussd/suite.conf</span><br><span>rename to example/suites/ussd/suite.conf</span><br><span>diff --git a/suites/voice/lib/testlib.py b/example/suites/voice/lib/testlib.py</span><br><span>similarity index 100%</span><br><span>rename from suites/voice/lib/testlib.py</span><br><span>rename to example/suites/voice/lib/testlib.py</span><br><span>diff --git a/suites/voice/mo_mt_call.py b/example/suites/voice/mo_mt_call.py</span><br><span>similarity index 100%</span><br><span>rename from suites/voice/mo_mt_call.py</span><br><span>rename to example/suites/voice/mo_mt_call.py</span><br><span>diff --git a/suites/voice/mo_mt_call_osmux.py b/example/suites/voice/mo_mt_call_osmux.py</span><br><span>similarity index 100%</span><br><span>rename from suites/voice/mo_mt_call_osmux.py</span><br><span>rename to example/suites/voice/mo_mt_call_osmux.py</span><br><span>diff --git a/suites/voice/suite.conf b/example/suites/voice/suite.conf</span><br><span>similarity index 100%</span><br><span>rename from suites/voice/suite.conf</span><br><span>rename to example/suites/voice/suite.conf</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17751">change 17751</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17751"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I154b19979b545deba8b232b60172903f63fd9e28 </div>
<div style="display:none"> Gerrit-Change-Number: 17751 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>