Change in osmo-gsm-tester[master]: Sanitize existing suite names
Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10931 ) Change subject: Sanitize existing suite names .. Sanitize existing suite names When first suites were added, osmo-nitb was used. Then new tests using regular split components were added with "aoip_" prefix. At some point it was clear that osmo-nitb was being deprecated so new tests for split components were added without any prefix, as they are expected to be the default one. Since most current and future development is going to be done for split components, as well as new tests added, it makes sense to move the few old testsuites using osmo-nitb to have all "nitb_" prefix, while keeping the split component tests without prefix as it's the regular network topology. Change-Id: Idea2e053d337548e0e9b1b47441dbb262124f909 --- M example/default-suites.conf D suites/aoip_sms/mo_mt_sms.py D suites/aoip_sms/suite.conf M suites/debug/interactive.py M suites/debug/suite.conf R suites/encryption/register_a5_0_authopt.py R suites/encryption/register_a5_0_authreq.py R suites/encryption/register_a5_1_authreq.py R suites/encryption/suite.conf R suites/nitb_debug/error.py R suites/nitb_debug/fail.py R suites/nitb_debug/fail_raise.py R suites/nitb_debug/interactive.py R suites/nitb_debug/pass.py R suites/nitb_debug/suite.conf R suites/nitb_netreg/register.py R suites/nitb_netreg/register_default.py R suites/nitb_netreg/suite.conf R suites/nitb_smpp/esme_connect_policy_acceptall.py R suites/nitb_smpp/esme_connect_policy_closed.py R suites/nitb_smpp/esme_ms_sms_storeforward.py R suites/nitb_smpp/esme_ms_sms_transaction.py C suites/nitb_smpp/suite.conf A suites/nitb_sms/mo_mt_sms.py R suites/nitb_sms/suite.conf R suites/nitb_ussd/assert_extension.py R suites/nitb_ussd/suite.conf M suites/smpp/esme_connect_policy_acceptall.py M suites/smpp/esme_connect_policy_closed.py M suites/smpp/esme_ms_sms_storeforward.py M suites/smpp/esme_ms_sms_transaction.py M suites/smpp/suite.conf M suites/sms/mo_mt_sms.py M suites/sms/suite.conf M suites/ussd/assert_extension.py M suites/ussd/suite.conf 36 files changed, 287 insertions(+), 299 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index 6b6e1d0..af7e8de 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -1,7 +1,7 @@ +- nitb_sms:sysmo - sms:sysmo -- aoip_sms:sysmo +- nitb_ussd:sysmo - ussd:sysmo -- aoip_ussd:sysmo - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr1 - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr3 @@ -12,10 +12,10 @@ - gprs:sysmo - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo +- nitb_sms:trx-b200 - sms:trx-b200 -- aoip_sms:trx-b200 +- nitb_ussd:trx-b200 - ussd:trx-b200 -- aoip_ussd:trx-b200 - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr1 - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr3 @@ -26,10 +26,10 @@ - gprs:trx-b200 - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo +- nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 -- aoip_sms:trx-sysmocell5000 +- nitb_ussd:trx-sysmocell5000 - ussd:trx-sysmocell5000 -- aoip_ussd:trx-sysmocell5000 - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr1 - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr3 @@ -40,10 +40,10 @@ - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo -- sms:nanobts -- aoip_sms:nanobts+band-1900 +- nitb_sms:nanobts +- sms:nanobts+band-1900 +- nitb_ussd:nanobts+band-1900 - ussd:nanobts+band-1900 -- aoip_ussd:nanobts+band-1900 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr1 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr3 @@ -52,9 +52,9 @@ - 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 +- sms:nanobts+band-900 +- nitb_ussd:nanobts+band-900 - ussd:nanobts+band-900 -- aoip_ussd:nanobts+band-900 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr1 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr3 @@ -65,6 +65,6 @@ - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- nitb_smpp - smpp -- aoip_smpp -- aoip_encryption +- encryption diff --git a/suites/aoip_sms/mo_mt_sms.py b/suites/aoip_sms/mo_mt_sms.py deleted file mode 100755 index 7654ea6..000 --- a/suites/aoip_sms/mo_mt_sms.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -hlr = suite.hlr() -bts =
Change in osmo-gsm-tester[master]: Sanitize existing suite names
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10931 ) Change subject: Sanitize existing suite names .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idea2e053d337548e0e9b1b47441dbb262124f909 Gerrit-Change-Number: 10931 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Sat, 15 Sep 2018 09:26:01 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-gsm-tester[master]: Sanitize existing suite names
Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10931 Change subject: Sanitize existing suite names .. Sanitize existing suite names When first suites were added, osmo-nitb was used. Then new tests using regular split components were added with "aoip_" prefix. At some point it was clear that osmo-nitb was being deprecated so new tests for split components were added without any prefix, as they are expected to be the default one. Since most current and future development is going to be done for split components, as well as new tests added, it makes sense to move the few old testsuites using osmo-nitb to have all "nitb_" prefix, while keeping the split component tests without prefix as it's the regular network topology. Change-Id: Idea2e053d337548e0e9b1b47441dbb262124f909 --- M example/default-suites.conf D suites/aoip_sms/mo_mt_sms.py D suites/aoip_sms/suite.conf M suites/debug/interactive.py M suites/debug/suite.conf R suites/encryption/register_a5_0_authopt.py R suites/encryption/register_a5_0_authreq.py R suites/encryption/register_a5_1_authreq.py R suites/encryption/suite.conf R suites/nitb_debug/error.py R suites/nitb_debug/fail.py R suites/nitb_debug/fail_raise.py R suites/nitb_debug/interactive.py R suites/nitb_debug/pass.py R suites/nitb_debug/suite.conf R suites/nitb_netreg/register.py R suites/nitb_netreg/register_default.py R suites/nitb_netreg/suite.conf R suites/nitb_smpp/esme_connect_policy_acceptall.py R suites/nitb_smpp/esme_connect_policy_closed.py R suites/nitb_smpp/esme_ms_sms_storeforward.py R suites/nitb_smpp/esme_ms_sms_transaction.py C suites/nitb_smpp/suite.conf A suites/nitb_sms/mo_mt_sms.py R suites/nitb_sms/suite.conf R suites/nitb_ussd/assert_extension.py R suites/nitb_ussd/suite.conf M suites/smpp/esme_connect_policy_acceptall.py M suites/smpp/esme_connect_policy_closed.py M suites/smpp/esme_ms_sms_storeforward.py M suites/smpp/esme_ms_sms_transaction.py M suites/smpp/suite.conf M suites/sms/mo_mt_sms.py M suites/sms/suite.conf M suites/ussd/assert_extension.py M suites/ussd/suite.conf 36 files changed, 287 insertions(+), 299 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/31/10931/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 6b6e1d0..af7e8de 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -1,7 +1,7 @@ +- nitb_sms:sysmo - sms:sysmo -- aoip_sms:sysmo +- nitb_ussd:sysmo - ussd:sysmo -- aoip_ussd:sysmo - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr1 - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr3 @@ -12,10 +12,10 @@ - gprs:sysmo - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo +- nitb_sms:trx-b200 - sms:trx-b200 -- aoip_sms:trx-b200 +- nitb_ussd:trx-b200 - ussd:trx-b200 -- aoip_ussd:trx-b200 - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr1 - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr3 @@ -26,10 +26,10 @@ - gprs:trx-b200 - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo +- nitb_sms:trx-sysmocell5000 - sms:trx-sysmocell5000 -- aoip_sms:trx-sysmocell5000 +- nitb_ussd:trx-sysmocell5000 - ussd:trx-sysmocell5000 -- aoip_ussd:trx-sysmocell5000 - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr1 - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr3 @@ -40,10 +40,10 @@ - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo -- sms:nanobts -- aoip_sms:nanobts+band-1900 +- nitb_sms:nanobts +- sms:nanobts+band-1900 +- nitb_ussd:nanobts+band-1900 - ussd:nanobts+band-1900 -- aoip_ussd:nanobts+band-1900 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr1 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr3 @@ -52,9 +52,9 @@ - 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 +- sms:nanobts+band-900 +- nitb_ussd:nanobts+band-900 - ussd:nanobts+band-900 -- aoip_ussd:nanobts+band-900 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr1 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr2 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr3 @@ -65,6 +65,6 @@ - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- nitb_smpp - smpp -- aoip_smpp -- aoip_encryption +- encryption diff --git a/suites/aoip_sms/mo_mt_sms.py b/suites/aoip_sms/mo_mt_sms.py deleted file mode 100755 index 7654ea6..000 --- a/suites/aoip_sms/mo_mt_sms.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -hlr = suite.hlr() -bts = suite.bts()
