osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41218?usp=email ) Change subject: hlr: don't test OsmoHLR-only features with PyHSS ...................................................................... hlr: don't test OsmoHLR-only features with PyHSS Proxy, mslookup and creating subscriber on demand are not implemented in PyHSS, so don't test these features when testing PyHSS. Related: OS#6862 Change-Id: I0c4905dd3f73abfe9f7cc77fc045368b9499aade --- M hlr/HLR_Tests.ttcn 1 file changed, 18 insertions(+), 13 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index f86a6bc..806f45e 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -2115,11 +2115,9 @@ execute( TC_gsup_sai_num_auth_vectors() ); execute( TC_gsup_sai_eps() ); execute( TC_gsup_ul_unknown_imsi() ); - execute( TC_gsup_ul_unknown_imsi_via_proxy() ); execute( TC_gsup_ul_unknown_imsi_roaming_not_allowed() ); execute( TC_gsup_sai_err_unknown_imsi() ); execute( TC_gsup_ul() ); - execute( TC_gsup_ul_via_proxy() ); execute( TC_gsup_ul_subscriber_data() ); execute( TC_vty() ); execute( TC_vty_msisdn_isd() ); @@ -2130,9 +2128,7 @@ execute( TC_mo_ussd_unknown() ); execute( TC_mo_ussd_euse_disc() ); execute( TC_mo_ussd_iuse_imsi() ); - execute( TC_mo_ussd_iuse_imsi_via_proxy() ); execute( TC_mo_ussd_iuse_msisdn() ); - execute( TC_mo_ussd_iuse_msisdn_via_proxy() ); execute( TC_mo_ussd_euse() ); execute( TC_mo_ussd_euse_continue() ); execute( TC_mo_ussd_euse_defaultroute() ); @@ -2141,18 +2137,27 @@ execute( TC_mo_sss_reject() ); execute( TC_gsup_check_imei() ); - execute( TC_gsup_check_imei_via_proxy() ); execute( TC_gsup_check_imei_invalid_len() ); execute( TC_gsup_check_imei_unknown_imsi() ); - execute( TC_subscr_create_on_demand_check_imei_early() ); - execute( TC_subscr_create_on_demand_ul() ); - execute( TC_subscr_create_on_demand_sai() ); - execute( TC_MSLookup_mDNS_service_other_home() ); - execute( TC_MSLookup_GSUP_proxy() ); - execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); - execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() ); - execute( TC_MSLookup_mDNS_service_other_proxy() ); + /* Test features that are only implemented in OsmoHLR */ + if (m_hlr_impl == HLR_IMPL_OSMOCOM) { + execute( TC_gsup_ul_unknown_imsi_via_proxy() ); + execute( TC_gsup_ul_via_proxy() ); + execute( TC_mo_ussd_iuse_imsi_via_proxy() ); + execute( TC_mo_ussd_iuse_msisdn_via_proxy() ); + execute( TC_gsup_check_imei_via_proxy() ); + + execute( TC_subscr_create_on_demand_check_imei_early() ); + execute( TC_subscr_create_on_demand_ul() ); + execute( TC_subscr_create_on_demand_sai() ); + + execute( TC_MSLookup_mDNS_service_other_home() ); + execute( TC_MSLookup_GSUP_proxy() ); + execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); + execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() ); + execute( TC_MSLookup_mDNS_service_other_proxy() ); + } }; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41218?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0c4905dd3f73abfe9f7cc77fc045368b9499aade Gerrit-Change-Number: 41218 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>