lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

November 2026

  • 1 participants
  • 714 discussions
[S] Change in osmo-ci[master]: jobs/ttcn3: add sepp
by pespin 11 Nov '26

11 Nov '26
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/44061?usp=email ) Change subject: jobs/ttcn3: add sepp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/44061?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If31d52515f9deb2f6b759ff99e50f0c8ad8a60cb Gerrit-Change-Number: 44061 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Nov 2026 11:23:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
[S] Change in osmo-ci[master]: jobs/ttcn3: add sepp
by osmith 11 Nov '26

11 Nov '26
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/44061?usp=email ) Change subject: jobs/ttcn3: add sepp ...................................................................... jobs/ttcn3: add sepp Change-Id: If31d52515f9deb2f6b759ff99e50f0c8ad8a60cb --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/44061/1 diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index 8c1a105..f12cd9b 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -281,6 +281,12 @@ timer: H 11 * * * email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com + - ttcn3-sepp-test-ogs: + testsuite: sepp + args: -b osmocom:nightly + timer: H 11 * * * + email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com + # --------------------------------------------- # Debian latest # --------------------------------------------- @@ -527,6 +533,11 @@ args: -b osmocom:latest timer: H 13 * * * + - ttcn3-sepp-test-ogs-latest: + testsuite: sepp + args: -b osmocom:latest + timer: H 13 * * * + # --------------------------------------------- # Debian nightly + io_uring (OS#6357) # --------------------------------------------- @@ -781,6 +792,12 @@ timer: H 18 * * * email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com + - ttcn3-sepp-test-ogs-asan: + testsuite: sepp + args: -b osmocom:nightly:asan + timer: H 18 * * * + email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com + # --------------------------------------------- # Build from source with osmo-dev (for programs # where we don't have binary packages in OBS) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/44061?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If31d52515f9deb2f6b759ff99e50f0c8ad8a60cb Gerrit-Change-Number: 44061 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>
1 0
0 0
[XL] Change in osmo-ttcn3-hacks[master]: Introduce sepp testsuite
by pespin 11 Nov '26

11 Nov '26
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/44048?usp=email ) Change subject: Introduce sepp testsuite ...................................................................... Introduce sepp testsuite Related: SYS#7073 Change-Id: I985f5f7e10d3f687e6a700f7c0dd9923bf995f97 --- M Makefile A library/TS29510_Nnrf_NFManagement_Templates.ttcn A library/TS29573_JOSEProtectedMessageForwarding_Templates.ttcn A library/TS29573_N32_Handshake_Templates.ttcn A sepp/ConnHdlr.ttcn A sepp/README.md A sepp/SEPP_Tests.cfg A sepp/SEPP_Tests.default A sepp/SEPP_Tests.ttcn A sepp/expected-results.xml A sepp/gen_links.sh A sepp/open5gs-sepp.yaml A sepp/open5gs_prepare.sh A sepp/regen_makefile.sh A sepp/testenv.cfg A sepp/testsrcdir.cfg 16 files changed, 1,556 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/Makefile b/Makefile index 565fb33..df8319e 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,7 @@ s1gw \ sccp \ selftest \ + sepp \ sgsn \ simtrace \ sip \ diff --git a/library/TS29510_Nnrf_NFManagement_Templates.ttcn b/library/TS29510_Nnrf_NFManagement_Templates.ttcn new file mode 100644 index 0000000..4175f77 --- /dev/null +++ b/library/TS29510_Nnrf_NFManagement_Templates.ttcn @@ -0,0 +1,305 @@ +module TS29510_Nnrf_NFManagement_Templates { + +import from JSON_Generic all; +import from TS29510_Nnrf_NFManagement all; + +/* 6.1 Nnrf_NFManagement Service API */ +const charstring c_Nnrf_NFM_path_api_prefix := "/nnrf-nfm/v1"; + +const charstring c_Nnrf_NFM_path_nf_instances +:= c_Nnrf_NFM_path_api_prefix & "/nf-instances"; + +template (present) charstring tr_Nnrf_NFM_path_nf_instance(template (present) charstring nf_instance_id := pattern "?+") +:= pattern c_Nnrf_NFM_path_nf_instances & "/" & nf_instance_id; +template (value) charstring ts_Nnrf_NFM_path_nf_instance(template (value) charstring nf_instance_id) +:= c_Nnrf_NFM_path_nf_instances & "/" & valueof(nf_instance_id); + +template (value) PlmnId1 +ts_PlmnId1(template (value) Mcc1 mcc, + template (value) Mnc1 mnc) := { + mcc := mcc, + mnc := mnc +} + +template (value) Link1 +ts_Link1(template (omit) Uri href := omit) := { + href := href +}; + +template (value) LinksValueSchema1 +ts_LinksValueSchema1(template (value) Link1 field) := { + field2 := field +} + +type TS29510_Nnrf_NFManagement.UriList1.links UriLinkList; +template (value) UriList1 +ts_UriList1(template (omit) UriLinkList links := omit, + template (omit) integer totalItemCount := omit) := { + links := links, + totalItemCount := totalItemCount +} + + +type TS29510_Nnrf_NFManagement.NFProfile1.collocatedNfInstances CollocatedNfInstancesList; +type TS29510_Nnrf_NFManagement.NFProfile1.plmnList PlmnList; +type TS29510_Nnrf_NFManagement.NFProfile1.snpnList SnpnList; +type TS29510_Nnrf_NFManagement.NFProfile1.sNssais SNssaisList; +type TS29510_Nnrf_NFManagement.NFProfile1.perPlmnSnssaiList PerPlmnSnssaiList; +type TS29510_Nnrf_NFManagement.NFProfile1.ipv4Addresses Ipv4Addr1List; +type TS29510_Nnrf_NFManagement.NFProfile1.ipv6Addresses Ipv6Addresses; +type TS29510_Nnrf_NFManagement.NFProfile1.allowedPlmns AllowedPlmnsList; +type TS29510_Nnrf_NFManagement.NFProfile1.allowedSnpns AllowedSnpnsList; +type TS29510_Nnrf_NFManagement.NFProfile1.allowedNfTypes AllowedNfTypes; +type TS29510_Nnrf_NFManagement.NFProfile1.allowedNssais AllowedNssais; +type TS29510_Nnrf_NFManagement.NFProfile1.allowedRuleSet AllowedRuleSet; +type TS29510_Nnrf_NFManagement.NFProfile1.extLocality ExtLocalityMap; +type TS29510_Nnrf_NFManagement.NFProfile1.udrInfoList UdrInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.udmInfoList UdmInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.ausfInfoList AusfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.amfInfoList AmfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.smfInfoList SmfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.upfInfoList UpfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.pcfInfoList PcfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.bsfInfoList BsfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.chfInfoList ChfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.udsfInfoList UdsfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.nwdafInfoList NwdaInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.pcscfInfoList PcscfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.hssInfoList HssInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.nfServices NFService1List; +type TS29510_Nnrf_NFManagement.NFProfile1.nfServiceList NfServiceListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.defaultNotificationSubscriptions DefaultNotificationSubscription1List; +type TS29510_Nnrf_NFManagement.NFProfile1.nfSetIdList NfSetIdList; +type TS29510_Nnrf_NFManagement.NFProfile1.nfSetRecoveryTimeList NfSetRecoveryTimeListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.serviceSetRecoveryTimeList ServiceSetRecoveryTimeListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.supportedVendorSpecificFeatures SupportedVendorSpecificFeatures; +type TS29510_Nnrf_NFManagement.NFProfile1.aanfInfoList AanfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.easdfInfoList EasdfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.nsacfInfoList NsacfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.mbSmfInfoList MbSmfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.tsctsfInfoList TsctsfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.mbUpfInfoList MbUpfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.hniList HniList; +type TS29510_Nnrf_NFManagement.NFProfile1.dcsfInfoList DcsfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.mrfInfoList MrfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.mrfpInfoList MrfpInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.mfInfoList MfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.adrfInfoList AdrfInfoListMap; +type TS29510_Nnrf_NFManagement.NFProfile1.supportedRcfs SupportedRcfsList; +type TS29510_Nnrf_NFManagement.NFProfile1.aiotfInfoList AiotfInfoListMap; +template (present) NFProfile1 +tr_NFProfile1(template (present) NfInstanceId1 nfInstanceId := ?, + template charstring nfInstanceName := *, + template (present) NFType1 nfType := ?, + template (present) NFStatus1 nfStatus := ?, + template CollocatedNfInstancesList collocatedNfInstances := *, + template integer heartBeatTimer := *, + template PlmnList plmnList := *, + template SnpnList snpnList := *, + template SNssaisList sNssais := *, + template PerPlmnSnssaiList perPlmnSnssaiList := *, + template record of charstring nsiList := *, + template Fqdn1 fqdn := *, + template Fqdn1 interPlmnFqdn := *, + template Ipv4Addr1List ipv4Addresses := *, + template Ipv6Addresses ipv6Addresses := *, + template AllowedPlmnsList allowedPlmns := *, + template AllowedSnpnsList allowedSnpns := *, + template AllowedNfTypes allowedNfTypes := *, + template record of charstring allowedNfDomains := *, + template AllowedNssais allowedNssais := *, + template AllowedRuleSet allowedRuleSet := *, + template integer priority := *, + template integer capacity := *, + template integer load := *, + template DateTime2 loadTimeStamp := *, + template charstring locality := *, + template ExtLocalityMap extLocality := *, + template UdrInfo1 udrInfo := *, + template UdrInfoListMap udrInfoList := *, + template UdmInfo1 udmInfo := *, + template UdmInfoListMap udmInfoList := *, + template AusfInfo1 ausfInfo := *, + template AusfInfoListMap ausfInfoList := *, + template AmfInfo1 amfInfo := *, + template AmfInfoListMap amfInfoList := *, + template SmfInfo1 smfInfo := *, + template SmfInfoListMap smfInfoList := *, + template UpfInfo1 upfInfo := *, + template UpfInfoListMap upfInfoList := *, + template PcfInfo1 pcfInfo := *, + template PcfInfoListMap pcfInfoList := *, + template BsfInfo1 bsfInfo := *, + template BsfInfoListMap bsfInfoList := *, + template ChfInfo1 chfInfo := *, + template ChfInfoListMap chfInfoList := *, + template NefInfo1 nefInfo := *, + template NrfInfo1 nrfInfo := *, + template UdsfInfo1 udsfInfo := *, + template UdsfInfoListMap udsfInfoList := *, + template NwdafInfo1 nwdafInfo := *, + template NwdaInfoListMap nwdafInfoList := *, + template PcscfInfoListMap pcscfInfoList := *, + template HssInfoListMap hssInfoList := *, + template JSON_Generic.JSON_generic_val customInfo := *, + template DateTime2 recoveryTime := *, + template boolean nfServicePersistence := *, + template NFService1List nfServices := *, + template NfServiceListMap nfServiceList := *, + template boolean nfProfileChangesSupportInd := *, + template boolean nfProfilePartialUpdateChangesSupportInd := *, + template boolean nfProfileChangesInd := *, + template DefaultNotificationSubscription1List defaultNotificationSubscriptions := *, + template LmfInfo1 lmfInfo := *, + template GmlcInfo1 gmlcInfo := *, + template NfSetIdList nfSetIdList := *, + template record of charstring servingScope := *, + template boolean lcHSupportInd := *, + template boolean olcHSupportInd := *, + template NfSetRecoveryTimeListMap nfSetRecoveryTimeList := *, + template ServiceSetRecoveryTimeListMap serviceSetRecoveryTimeList := *, + template record of charstring scpDomains := *, + template ScpInfo1 scpInfo := *, + template SeppInfo1 seppInfo := *, + template VendorId1 vendorId := *, + template SupportedVendorSpecificFeatures supportedVendorSpecificFeatures := *, + template AanfInfoListMap aanfInfoList := *, + template FiveGDdnmfInfo1 fivegDdnmfInfo := *, + template MfafInfo1 mfafInfo := *, + template EasdfInfoListMap easdfInfoList := *, + template DccfInfo1 dccfInfo := *, + template NsacfInfoListMap nsacfInfoList := *, + template MbSmfInfoListMap mbSmfInfoList := *, + template TsctsfInfoListMap tsctsfInfoList := *, + template MbUpfInfoListMap mbUpfInfoList := *, + template TrustAfInfo1 trustAfInfo := *, + template NssaafInfo1 nssaafInfo := *, + template HniList hniList := *, + template IwmscInfo1 iwmscInfo := *, + template MnpfInfo1 mnpfInfo := *, + template SmsfInfo1 smsfInfo := *, + template DcsfInfoListMap dcsfInfoList := *, + template MrfInfoListMap mrfInfoList := *, + template MrfpInfoListMap mrfpInfoList := *, + template MfInfoListMap mfInfoList := *, + template AdrfInfoListMap adrfInfoList := *, + template SelectionConditions1 selectionConditions := *, + template boolean canaryRelease := *, + template boolean exclusiveCanaryReleaseSelection := *, + template charstring sharedProfileDataId := *, + template DateTime2 shutdownTime := *, + template SupportedRcfsList supportedRcfs := *, + template boolean canaryPrecedenceOverPreferred := *, + template ImsasInfo1 imsasInfo := *, + template AiotfInfoListMap aiotfInfoList := *, + template NssfInfo1 nssfInfo := *, + template AdmInfo1 admInfo := *) := { + nfInstanceId := nfInstanceId, + nfInstanceName := nfInstanceName, + nfType := nfType, + nfStatus := nfStatus, + collocatedNfInstances := collocatedNfInstances, + heartBeatTimer := heartBeatTimer, + plmnList := plmnList, + snpnList := snpnList, + sNssais := sNssais, + perPlmnSnssaiList := perPlmnSnssaiList, + nsiList := nsiList, + fqdn := fqdn, + interPlmnFqdn := interPlmnFqdn, + ipv4Addresses := ipv4Addresses, + ipv6Addresses := ipv6Addresses, + allowedPlmns := allowedPlmns, + allowedSnpns := allowedSnpns, + allowedNfTypes := allowedNfTypes, + allowedNfDomains := allowedNfDomains, + allowedNssais := allowedNssais, + allowedRuleSet := allowedRuleSet, + priority := priority, + capacity := capacity, + load := load, + loadTimeStamp := loadTimeStamp, + locality := locality, + extLocality := extLocality, + udrInfo := udrInfo, + udrInfoList := udrInfoList, + udmInfo := udmInfo, + udmInfoList := udmInfoList, + ausfInfo := ausfInfo, + ausfInfoList := ausfInfoList, + amfInfo := amfInfo, + amfInfoList := amfInfoList, + smfInfo := smfInfo, + smfInfoList := smfInfoList, + upfInfo := upfInfo, + upfInfoList := upfInfoList, + pcfInfo := pcfInfo, + pcfInfoList := pcfInfoList, + bsfInfo := bsfInfo, + bsfInfoList := bsfInfoList, + chfInfo := chfInfo, + chfInfoList := chfInfoList, + nefInfo := nefInfo, + nrfInfo := nrfInfo, + udsfInfo := udsfInfo, + udsfInfoList := udsfInfoList, + nwdafInfo := nwdafInfo, + nwdafInfoList := nwdafInfoList, + pcscfInfoList := pcscfInfoList, + hssInfoList := hssInfoList, + customInfo := customInfo, + recoveryTime := recoveryTime, + nfServicePersistence := nfServicePersistence, + nfServices := nfServices, + nfServiceList := nfServiceList, + nfProfileChangesSupportInd := nfProfileChangesSupportInd, + nfProfilePartialUpdateChangesSupportInd := nfProfilePartialUpdateChangesSupportInd, + nfProfileChangesInd := nfProfileChangesInd, + defaultNotificationSubscriptions := defaultNotificationSubscriptions, + lmfInfo := lmfInfo, + gmlcInfo := gmlcInfo, + nfSetIdList := nfSetIdList, + servingScope := servingScope, + lcHSupportInd := lcHSupportInd, + olcHSupportInd := olcHSupportInd, + nfSetRecoveryTimeList := nfSetRecoveryTimeList, + serviceSetRecoveryTimeList := serviceSetRecoveryTimeList, + scpDomains := scpDomains, + scpInfo := scpInfo, + seppInfo := seppInfo, + vendorId := vendorId, + supportedVendorSpecificFeatures := supportedVendorSpecificFeatures, + aanfInfoList := aanfInfoList, + fivegDdnmfInfo := fivegDdnmfInfo, + mfafInfo := mfafInfo, + easdfInfoList := easdfInfoList, + dccfInfo := dccfInfo, + nsacfInfoList := nsacfInfoList, + mbSmfInfoList := mbSmfInfoList, + tsctsfInfoList := tsctsfInfoList, + mbUpfInfoList := mbUpfInfoList, + trustAfInfo := trustAfInfo, + nssaafInfo := nssaafInfo, + hniList := hniList, + iwmscInfo := iwmscInfo, + mnpfInfo := mnpfInfo, + smsfInfo := smsfInfo, + dcsfInfoList := dcsfInfoList, + mrfInfoList := mrfInfoList, + mrfpInfoList := mrfpInfoList, + mfInfoList := mfInfoList, + adrfInfoList := adrfInfoList, + selectionConditions := selectionConditions, + canaryRelease := canaryRelease, + exclusiveCanaryReleaseSelection := exclusiveCanaryReleaseSelection, + sharedProfileDataId := sharedProfileDataId, + shutdownTime := shutdownTime, + supportedRcfs := supportedRcfs, + canaryPrecedenceOverPreferred := canaryPrecedenceOverPreferred, + imsasInfo := imsasInfo, + aiotfInfoList := aiotfInfoList, + nssfInfo := nssfInfo, + admInfo := admInfo +} + +} diff --git a/library/TS29573_JOSEProtectedMessageForwarding_Templates.ttcn b/library/TS29573_JOSEProtectedMessageForwarding_Templates.ttcn new file mode 100644 index 0000000..97e5532 --- /dev/null +++ b/library/TS29573_JOSEProtectedMessageForwarding_Templates.ttcn @@ -0,0 +1,62 @@ +module TS29573_JOSEProtectedMessageForwarding_Templates { + + +import from JSON_Generic all; +import from TS29573_JOSEProtectedMessageForwarding all; + +/* 6.2 JOSE Protected Message Forwarding API on N32 */ +const charstring c_N32f_Forward_path_api_prefix := "/n32f-forward/v1"; + +/* 6.2.4.2 Operation: JOSE Protected Forwarding */ +const charstring c_N32f_Forward_path_n32f_process +:= c_N32f_Forward_path_api_prefix & "/n32f-process"; + + +template (value) FlatJweJson +ts_FlatJweJson(template (omit) charstring protected := omit, + template (omit) JSON_Generic.JSON_generic_val unprotected := omit, + template (omit) JSON_Generic.JSON_generic_val header := omit, + template (omit) charstring encrypted_key := omit, + template (omit) charstring aad := omit, + template (omit) charstring iv := omit, + template (value) charstring ciphertext, + template (omit) charstring tag := omit) := { + protected := protected, + unprotected := unprotected, + header := header, + encrypted_key := encrypted_key, + aad := aad, + iv := iv, + ciphertext := ciphertext, + tag := tag +} + +type TS29573_JOSEProtectedMessageForwarding.N32fReformattedReqMsg.modificationsBlock FlatJwsJsonReqList; +template (present) N32fReformattedReqMsg +tr_N32fReformattedReqMsg(template (present) FlatJweJson reformattedData := ?, + template FlatJwsJsonReqList modificationsBlock := *) := { + reformattedData := reformattedData, + modificationsBlock := modificationsBlock +} +template (value) N32fReformattedReqMsg +ts_N32fReformattedReqMsg(template (value) FlatJweJson reformattedData, + template (omit) FlatJwsJsonReqList modificationsBlock := omit) := { + reformattedData := reformattedData, + modificationsBlock := modificationsBlock +} + +type TS29573_JOSEProtectedMessageForwarding.N32fReformattedRspMsg.modificationsBlock FlatJwsJsonRspList; +template (present) N32fReformattedRspMsg +tr_N32fReformattedRspMsg(template (present) FlatJweJson reformattedData := ?, + template FlatJwsJsonRspList modificationsBlock := *) := { + reformattedData := reformattedData, + modificationsBlock := modificationsBlock +} +template (value) N32fReformattedRspMsg +ts_N32fReformattedRspMsg(template (value) FlatJweJson reformattedData, + template (omit) FlatJwsJsonRspList modificationsBlock := omit) := { + reformattedData := reformattedData, + modificationsBlock := modificationsBlock +} + +} diff --git a/library/TS29573_N32_Handshake_Templates.ttcn b/library/TS29573_N32_Handshake_Templates.ttcn new file mode 100644 index 0000000..a7cb515 --- /dev/null +++ b/library/TS29573_N32_Handshake_Templates.ttcn @@ -0,0 +1,190 @@ +module TS29573_N32_Handshake_Templates { + +import from TS29573_N32_Handshake all; + +const charstring c_N32_Handshake_path_api_prefix := "/n32c-handshake/v1"; + +/* 6.1.4.2 Operation: Security Capability Negotiation */ +const charstring c_N32_Handshake_path_sec_cap_neg +:= c_N32_Handshake_path_api_prefix & "/exchange-capability"; + +/* 6.1.4.3 Operation: Parameter Exchange */ +const charstring c_N32_Handshake_path_exchange_params +:= c_N32_Handshake_path_api_prefix & "/exchange-params"; + +template (value) PlmnId +ts_PlmnId(template (value) Mcc mcc, + template (value) Mnc mnc) := { + mcc := mcc, + mnc := mnc +} + +template (present) SecurityCapability +tr_SecurityCapability(template (present) SecurityCapability_enum enum_val := ?) := { + enum_val := enum_val +} +template (value) SecurityCapability +ts_SecurityCapability(template (value) SecurityCapability_enum enum_val) := { + enum_val := enum_val +} + +type TS29573_N32_Handshake.SecNegotiateReqData.supportedSecCapabilityList SupportedSecCapabilityList; +type TS29573_N32_Handshake.SecNegotiateReqData.plmnIdList SecNegotiateReqDataPlmnIdList; +type TS29573_N32_Handshake.SecNegotiateReqData.snpnIdList SecNegotiateReqDataPlmnIdNidList; +type TS29573_N32_Handshake.SecNegotiateReqData.senderN32fPortList SenderN32fPortList; +type TS29573_N32_Handshake.SecNegotiateReqData.intendedUsagePurpose IntendedN32PurposeList; +template (present) SecNegotiateReqData +tr_SecNegotiateReqData(template (present) Fqdn sender_ := ?, + template charstring n32HandshakeId := *, + template (present) SupportedSecCapabilityList supportedSecCapabilityList := ?, + template boolean threeGppSbiTargetApiRootSupported := *, + template SecNegotiateReqDataPlmnIdList plmnIdList := *, + template SecNegotiateReqDataPlmnIdNidList snpnIdList := *, + template PlmnId targetPlmnId := *, + template PlmnIdNid targetSnpnId := *, + template IntendedN32PurposeList intendedUsagePurpose := *, + template SupportedFeatures supportedFeatures := *, + template Fqdn senderN32fFqdn := *, + template SenderN32fPortList senderN32fPortList := *, + template DurationSec n32KeepaliveTimer := *) := { + sender_ := sender_, + n32HandshakeId := n32HandshakeId, + supportedSecCapabilityList := supportedSecCapabilityList, + threeGppSbiTargetApiRootSupported := threeGppSbiTargetApiRootSupported, + plmnIdList := plmnIdList, + snpnIdList := snpnIdList, + targetPlmnId := targetPlmnId, + targetSnpnId := targetSnpnId, + intendedUsagePurpose := intendedUsagePurpose, + supportedFeatures := supportedFeatures, + senderN32fFqdn := senderN32fFqdn, + senderN32fPortList := senderN32fPortList, + n32KeepaliveTimer := n32KeepaliveTimer + +} +template (value) SecNegotiateReqData +ts_SecNegotiateReqData(template (value) Fqdn sender_, + template (omit) charstring n32HandshakeId := omit, + template (value) SupportedSecCapabilityList supportedSecCapabilityList, + template (omit) boolean threeGppSbiTargetApiRootSupported := omit, + template (omit) SecNegotiateReqDataPlmnIdList plmnIdList := omit, + template (omit) SecNegotiateReqDataPlmnIdNidList snpnIdList := omit, + template (omit) PlmnId targetPlmnId := omit, + template (omit) PlmnIdNid targetSnpnId := omit, + template (omit) IntendedN32PurposeList intendedUsagePurpose := omit, + template (omit) SupportedFeatures supportedFeatures := omit, + template (omit) Fqdn senderN32fFqdn := omit, + template (omit) SenderN32fPortList senderN32fPortList := omit, + template (omit) DurationSec n32KeepaliveTimer := omit) := { + sender_ := sender_, + n32HandshakeId := n32HandshakeId, + supportedSecCapabilityList := supportedSecCapabilityList, + threeGppSbiTargetApiRootSupported := threeGppSbiTargetApiRootSupported, + plmnIdList := plmnIdList, + snpnIdList := snpnIdList, + targetPlmnId := targetPlmnId, + targetSnpnId := targetSnpnId, + intendedUsagePurpose := intendedUsagePurpose, + supportedFeatures := supportedFeatures, + senderN32fFqdn := senderN32fFqdn, + senderN32fPortList := senderN32fPortList, + n32KeepaliveTimer := n32KeepaliveTimer + +} + +type TS29573_N32_Handshake.SecNegotiateRspData.plmnIdList SecNegotiateRspDataPlmnIdList; +type TS29573_N32_Handshake.SecNegotiateRspData.snpnIdList SecNegotiateRspDataPlmnIdNidList; +type TS29573_N32_Handshake.SecNegotiateRspData.allowedUsagePurpose AllowedUsagePurposeList; +type TS29573_N32_Handshake.SecNegotiateRspData.rejectedUsagePurpose RejectedUsagePurposeList; +template (present) SecNegotiateRspData +tr_SecNegotiateRspData(template (present) Fqdn sender_ := ?, + template (present) SecurityCapability selectedSecCapability := ?, + template charstring n32HandshakeId := *, + template boolean threeGppSbiTargetApiRootSupported := *, + template SecNegotiateRspDataPlmnIdList plmnIdList := *, + template SecNegotiateRspDataPlmnIdNidList snpnIdList := *, + template AllowedUsagePurposeList allowedUsagePurpose := *, + template RejectedUsagePurposeList rejectedUsagePurpose := *, + template SupportedFeatures supportedFeatures := *, + template Fqdn senderN32fFqdn := *, + template Uinteger senderN32fPort := *, + template DurationSec n32KeepaliveTimer := *) := { + sender_ := sender_, + selectedSecCapability := selectedSecCapability, + n32HandshakeId := n32HandshakeId, + threeGppSbiTargetApiRootSupported := threeGppSbiTargetApiRootSupported, + plmnIdList := plmnIdList, + snpnIdList := snpnIdList, + allowedUsagePurpose := allowedUsagePurpose, + rejectedUsagePurpose := rejectedUsagePurpose, + supportedFeatures := supportedFeatures, + senderN32fFqdn := senderN32fFqdn, + senderN32fPort := senderN32fPort, + n32KeepaliveTimer := n32KeepaliveTimer +} + +template (value) SecNegotiateRspData +ts_SecNegotiateRspData(template (value) Fqdn sender_, + template (value) SecurityCapability selectedSecCapability, + template (omit) charstring n32HandshakeId := omit, + template (omit) boolean threeGppSbiTargetApiRootSupported := omit, + template (omit) SecNegotiateRspDataPlmnIdList plmnIdList := omit, + template (omit) SecNegotiateRspDataPlmnIdNidList snpnIdList := omit, + template (omit) AllowedUsagePurposeList allowedUsagePurpose := omit, + template (omit) RejectedUsagePurposeList rejectedUsagePurpose := omit, + template (omit) SupportedFeatures supportedFeatures := omit, + template (omit) Fqdn senderN32fFqdn := omit, + template (omit) Uinteger senderN32fPort := omit, + template (omit) DurationSec n32KeepaliveTimer := omit) := { + sender_ := sender_, + selectedSecCapability := selectedSecCapability, + n32HandshakeId := n32HandshakeId, + threeGppSbiTargetApiRootSupported := threeGppSbiTargetApiRootSupported, + plmnIdList := plmnIdList, + snpnIdList := snpnIdList, + allowedUsagePurpose := allowedUsagePurpose, + rejectedUsagePurpose := rejectedUsagePurpose, + supportedFeatures := supportedFeatures, + senderN32fFqdn := senderN32fFqdn, + senderN32fPort := senderN32fPort, + n32KeepaliveTimer := n32KeepaliveTimer +} + +type TS29573_N32_Handshake.SecParamExchReqData.ipxProviderSecInfoList IpxProviderSecInfoReqList; +template (value) SecParamExchReqData +ts_SecParamExchReqData(template (value) charstring n32fContextId, + template (omit) record of charstring jweCipherSuiteList := omit, + template (omit) record of charstring jwsCipherSuiteList := omit, + template (omit) ProtectionPolicy protectionPolicyInfo := omit, + template (omit) record of charstring secProfiles := omit, + template (omit) IpxProviderSecInfoReqList ipxProviderSecInfoList := omit, + template (omit) Fqdn sender_ := omit) := { + n32fContextId := n32fContextId, + jweCipherSuiteList := jweCipherSuiteList, + jwsCipherSuiteList := jwsCipherSuiteList, + protectionPolicyInfo := protectionPolicyInfo, + secProfiles := secProfiles, + ipxProviderSecInfoList := ipxProviderSecInfoList, + sender_ := sender_ +} + +type TS29573_N32_Handshake.SecParamExchRspData.ipxProviderSecInfoList IpxProviderSecInfoRspList; +template (present) SecParamExchRspData +tr_SecParamExchRspData(template (present) charstring n32fContextId := ?, + template charstring selectedJweCipherSuite := *, + template charstring selectedJwsCipherSuite := *, + template ProtectionPolicy selProtectionPolicyInfo := *, + template record of charstring selSecProfiles := *, + template IpxProviderSecInfoRspList ipxProviderSecInfoList := *, + template Fqdn sender_ := *) := { + n32fContextId := n32fContextId, + selectedJweCipherSuite := selectedJweCipherSuite, + selectedJwsCipherSuite := selectedJwsCipherSuite, + selProtectionPolicyInfo := selProtectionPolicyInfo, + selSecProfiles := selSecProfiles, + ipxProviderSecInfoList := ipxProviderSecInfoList, + sender_ := sender_ +} + + +} diff --git a/sepp/ConnHdlr.ttcn b/sepp/ConnHdlr.ttcn new file mode 100644 index 0000000..8d4a5d0 --- /dev/null +++ b/sepp/ConnHdlr.ttcn @@ -0,0 +1,546 @@ +/* SEPP test suite in TTCN-3 (3GPP TS 29.573, 3GPP TS 33.501), ConnHdlr + * (C) 2026 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module ConnHdlr { + +import from TCCEncoding_Functions all; + +import from General_Types all; +import from Native_Functions all; +import from IPL4asp_Types all; +import from Misc_Helpers all; + +import from Osmocom_Types all; +import from GSM_Types all; + +import from HTTP2_Types all; +import from HTTP2_Templates all; +import from HTTP2_Functions all; +import from HTTP2_Msg all; +import from HTTP2_Adapter all; +import from HTTP2_Server_Emulation all; + +import from Prometheus_Checker all; + +import from TS29510_Nnrf_NFManagement all; +import from TS29510_Nnrf_NFManagement_Templates all; +import from TS29573_N32_Handshake all; +import from TS29573_N32_Handshake_Templates all; +import from TS29573_JOSEProtectedMessageForwarding all; +import from TS29573_JOSEProtectedMessageForwarding_Templates all; + +import from SEPP_Tests all; + +const integer HTTP2_CONN_SCP := 0; +const integer HTTP2_CONN_SEPP := 1; + +/* These are a preset of path matches which can be applied through the entire lifecycle of the session: */ +function f_http2_server_path_match_scp() +runs on ConnHdlr return charstring { + var charstring nf_instance_match := c_Nnrf_NFM_path_nf_instances & "/?+"; + var charstring match_ := "(" & c_Nnrf_NFM_path_nf_instances & ")|(" & nf_instance_match & ")"; + return match_; +} + +function f_http2_server_path_match_sepp() +runs on ConnHdlr return charstring { + var charstring match_n32c := c_N32_Handshake_path_sec_cap_neg; + var charstring match_n32f := "/nudr-dr/v1/subscription-data/?+"; + var charstring match_ := "(" & match_n32c & ")|(" & match_n32f & ")" + return match_; +} + +type record ConnHdlrPars { + integer idx, + charstring fqdn_sender, + charstring n32f_context_id +} + +type component ConnHdlr extends HTTP2_CT, HTTP2_ConnHdlr, Prometheus_Checker_CT { + var ConnHdlrPars g_pars; +} + +type function void_fn() runs on ConnHdlr; + +function f_ConnHdlrPars(integer idx := 0) return ConnHdlrPars +{ + var template (value) ConnHdlrPars pars := { + idx := idx, + fqdn_sender := "sepp2.localdomain", + n32f_context_id := int2str(idx) /* 3GPP TS 29.573 Table 6.2.5.2.9-1 n32fContextId */ + }; + return valueof(pars); +} + +function f_ConnHdlr_init(void_fn fn, ConnHdlrPars pars) runs on ConnHdlr { + /* make parameters available via component variable */ + g_pars := pars; + + /* Setup */ + /* Register SCP HTTP2 sever, where IUT will send all SBI requests: */ + f_http2_server_emu_register(f_http2_server_path_match_scp(), idx := HTTP2_CONN_SCP); + f_http2_server_emu_register(f_http2_server_path_match_sepp(), idx := HTTP2_CONN_SEPP); + f_http2_adapter_init(); + + fn.apply(); + + /* Cleanup */ +} + +function f_http2_adapter_connect_sepp_n32c(integer idx := 0) +runs on ConnHdlr { + f_http2_adapter_connect(mp_sepp_n32c_hostname, mp_sepp_n32c_port, mp_sepp_local_ip, idx := idx); +} + +function f_http2_adapter_connect_send_sepp_n32c(template (value) HTTP2_Msg http2_msg, integer idx := 0) +runs on ConnHdlr { + f_http2_adapter_connect_sepp_n32c(idx := idx); + f_http2_adapter_send(http2_msg); +} + +function f_http2_adapter_connect_sepp_n32f(integer idx := 0) +runs on ConnHdlr { + f_http2_adapter_connect(mp_sepp_n32f_hostname, mp_sepp_n32f_port, mp_sepp_local_ip, idx := idx); +} + +function f_http2_adapter_connect_send_sepp_n32f(template (value) HTTP2_Msg http2_msg, integer idx := 0) +runs on ConnHdlr { + f_http2_adapter_connect_sepp_n32f(idx := idx); + f_http2_adapter_send(http2_msg); +} + +function f_http2_adapter_connect_sepp_sbi(integer idx := 0) +runs on ConnHdlr { + f_http2_adapter_connect(mp_sepp_sbi_hostname, mp_sepp_sbi_port, mp_sepp_local_ip, idx := idx); +} + +function f_http2_adapter_connect_send_sepp_sbi(template (value) HTTP2_Msg http2_msg, integer idx := 0) +runs on ConnHdlr { + f_http2_adapter_connect_sepp_sbi(idx := idx); + f_http2_adapter_send(http2_msg); +} + +/******************************************** + * SCP +/*******************************************/ +const charstring SCP_uri_hostport := mp_scp_local_ip & ":" & int2str(mp_scp_local_port); +const charstring SCP_uri_prefix := "http://" & SCP_uri_hostport; + +/**************************************************** + * N32-c (SBI) Emulated SEPP, 3GPP TS 29.573 + ****************************************************/ +const charstring c_N32c_uri_hostport := mp_sepp_n32c_hostname & ":" & int2str(mp_sepp_n32c_port); +const charstring c_N32c_uri_prefix := "http://" & c_N32c_uri_hostport; + +/* 6.1.4.2.2 Operation: Security Capability Negotiation (POST) */ +function f_tr_N32_Handshake_post_sec_cap_neg() +runs on ConnHdlr return template (present) HTTP2_Msg { + var template (present) HTTP2_Msg http2_msg; + var template (present) HTTP2_header_block hb; + var template (present) HTTP2_pseudo_headers pseudo_headers; + var template HTTP2_header_list headers := *; + + pseudo_headers := tr_HTTP2_pseudo_headers_Req(method := "POST", + path := c_N32_Handshake_path_sec_cap_neg); + hb := tr_HTTP2_header_block(pseudo_headers, headers); + http2_msg := tr_HTTP2_Msg(?, ?, + hb := hb, + body := tr_HTTP2_Data_frame(data := decmatch tr_SecNegotiateReqData)); + return http2_msg; +} + +/* 6.1.4.2.2 Operation: Security Capability Negotiation (POST) */ +altstep as_N32_Handshake_post_sec_cap_neg(template (value) SecurityCapability_enum selected_sec_cap := TLS) +runs on ConnHdlr { + var HTTP2_Msg http2_rx; + [] HTTP2_CONN[HTTP2_CONN_SEPP].receive(f_tr_N32_Handshake_post_sec_cap_neg()) -> value http2_rx { + var SecNegotiateReqData req; + var template (value) SecNegotiateRspData rsp; + var octetstring body_enc; + var template (value) HTTP2_Msg http2_tx; + + f_dec_SecNegotiateReqData(http2_rx.body.data, req); // TODO: check rc + rsp := ts_SecNegotiateRspData(sender_ := g_pars.fqdn_sender, + selectedSecCapability := ts_SecurityCapability(selected_sec_cap), + plmnIdList := { ts_PlmnId(mcc := mp_sepp_local_plmn_mcc, + mnc := mp_sepp_local_plmn_mnc) }); + body_enc := f_enc_SecNegotiateRspData(valueof(rsp)); + + http2_tx := ts_HTTP2_Msg_200_OK(http2_rx.conn_id, + http2_rx.stream_id, + headers := { + ts_HTTP2_Hdr_content_type("application/json") + }, + body := ts_HTTP2_Data_frame(http2_rx.stream_id, + end_stream_flag := true, + data := body_enc)); + HTTP2_CONN[HTTP2_CONN_SEPP].send(http2_tx); + setverdict(pass); + } +} + +/* 6.1.4.2.2 Operation: Security Capability Negotiation (POST) */ +private function f_N32_Handshake_prepare_post_sec_cap_neg(SecNegotiateReqData sec_neg_req) +runs on ConnHdlr return HTTP2_Msg { + var octetstring sec_neg_req_enc; + var integer http2_idx; + var integer http2_stream_id; + var template (value) HTTP2_Msg http2_tx; + + sec_neg_req_enc := f_enc_SecNegotiateReqData(sec_neg_req); + + http2_idx := f_http2_adapter_find_free_idx(); + http2_stream_id := f_http2_adapter_next_stream_id(http2_idx); + http2_tx := ts_HTTP2_Msg(http2_idx, + http2_stream_id, + hb := { + pseudo_headers := ts_HTTP2_pseudo_headers_Req(method := "POST", + scheme := "http", + authority := c_N32c_uri_hostport, + path := c_N32_Handshake_path_sec_cap_neg), + headers := { + ts_HTTP2_Hdr_content_type("application/json"), + ts_HTTP2_Hdr_accept("application/json"), + ts_HTTP2_Hdr_user_agent("ttcn3-sepp"), + ts_HTTP2_Hdr_accept_encoding("gzip") + } + }, + body := ts_HTTP2_Data_frame(http2_stream_id, + end_stream_flag := true, + data := sec_neg_req_enc)); + return valueof(http2_tx); +} + +/* 6.1.4.2 Operation: Security Capability Negotiation */ +function f_N32_Handshake_post_sec_cap_neg(template (value) SecurityCapability_enum sec_cap := NONE) +runs on ConnHdlr { + var HTTP2_Msg http2_tx; + var HTTP2_Msg http2_rx; + var template (present) HTTP2_Msg http2_exp_rx; + var template (value) SecNegotiateReqData sec_neg_req; + + sec_neg_req := ts_SecNegotiateReqData(sender_ := g_pars.fqdn_sender, + supportedSecCapabilityList := { ts_SecurityCapability(sec_cap) }, + plmnIdList := { ts_PlmnId(mcc := mp_sepp_local_plmn_mcc, + mnc := mp_sepp_local_plmn_mnc) } ); + + http2_tx := f_N32_Handshake_prepare_post_sec_cap_neg(valueof(sec_neg_req)); + f_http2_adapter_connect_send_sepp_n32c(http2_tx, idx := http2_tx.conn_id); + + /* 3GPP TS 29.521 Table 5.3.2.3.1-3 */ + http2_exp_rx := + tr_HTTP2_Msg(http2_tx.conn_id, + http2_tx.stream_id, + tr_HTTP2_header_block(pseudo_headers := tr_HTTP2_pseudo_headers_Resp(200)), + tr_HTTP2_Data_frame(stream_id := http2_tx.stream_id, + end_stream_flag := true, + data := decmatch tr_SecNegotiateRspData(sender_ := mp_sepp_fqdn_sender, + selectedSecCapability := tr_SecurityCapability(sec_cap)))); + as_http2_adapter_receive(http2_rx, http2_exp_rx, idx := http2_tx.conn_id); + + f_http2_adapter_close(idx := http2_tx.conn_id); + setverdict(pass); +} + +/* 6.1.4.3 Operation: Parameter Exchange */ +private function f_N32_Handshake_prepare_post_exchange_params(SecParamExchReqData param_exch_req) +runs on ConnHdlr return HTTP2_Msg { + var octetstring param_exch_req_enc; + var integer http2_idx; + var integer http2_stream_id; + var template (value) HTTP2_Msg http2_tx; + + param_exch_req_enc := f_enc_SecParamExchReqData(param_exch_req); + + http2_idx := f_http2_adapter_find_free_idx(); + http2_stream_id := f_http2_adapter_next_stream_id(http2_idx); + http2_tx := ts_HTTP2_Msg(http2_idx, + http2_stream_id, + hb := { + pseudo_headers := ts_HTTP2_pseudo_headers_Req(method := "POST", + scheme := "http", + authority := c_N32c_uri_hostport, + path := c_N32_Handshake_path_exchange_params), + headers := { + ts_HTTP2_Hdr_content_type("application/json"), + ts_HTTP2_Hdr_accept("application/json"), + ts_HTTP2_Hdr_user_agent("ttcn3-sepp"), + ts_HTTP2_Hdr_accept_encoding("gzip") + } + }, + body := ts_HTTP2_Data_frame(http2_stream_id, + end_stream_flag := true, + data := param_exch_req_enc)); + return valueof(http2_tx); +} + +/* 6.1.4.3 Operation: Parameter Exchange */ +function f_N32_Handshake_post_exchange_params() +runs on ConnHdlr { + var HTTP2_Msg http2_tx; + var HTTP2_Msg http2_rx; + var template (present) HTTP2_Msg http2_exp_rx; + var template (value) SecParamExchReqData param_exch_req; + + param_exch_req := ts_SecParamExchReqData(n32fContextId := g_pars.n32f_context_id, + sender_ := g_pars.fqdn_sender); + + http2_tx := f_N32_Handshake_prepare_post_exchange_params(valueof(param_exch_req)); + f_http2_adapter_connect_send_sepp_n32c(http2_tx, idx := http2_tx.conn_id); + + /* 3GPP TS 29.521 Table 5.3.2.3.1-3 */ + http2_exp_rx := + tr_HTTP2_Msg(http2_tx.conn_id, + http2_tx.stream_id, + tr_HTTP2_header_block(pseudo_headers := tr_HTTP2_pseudo_headers_Resp(200)), + tr_HTTP2_Data_frame(stream_id := http2_tx.stream_id, + end_stream_flag := true, + data := decmatch tr_SecParamExchRspData(n32fContextId := g_pars.n32f_context_id, + sender_ := mp_sepp_fqdn_sender))); + as_http2_adapter_receive(http2_rx, http2_exp_rx, idx := http2_tx.conn_id); + + f_http2_adapter_close(idx := http2_tx.conn_id); + setverdict(pass); +} + +/**************************************************** + * N32-f (SBI) Emulated SEPP, 3GPP TS 29.573 5.3 Message Forwarding Procedure on N32 (N32-f) + ****************************************************/ +const charstring c_N32f_uri_hostport := mp_sepp_n32f_hostname & ":" & int2str(mp_sepp_n32f_port); +const charstring c_N32f_uri_prefix := "http://" & c_N32f_uri_hostport; + +/* 5.3.2.4 Message Forwarding to Peer SEPP */ +private function f_N32f_Forward_prepare_post_forward(N32fReformattedReqMsg req) +runs on ConnHdlr return HTTP2_Msg { + var octetstring req_enc; + var integer http2_idx; + var integer http2_stream_id; + var template (value) HTTP2_Msg http2_tx; + + req_enc := f_enc_N32fReformattedReqMsg(req); + + http2_idx := f_http2_adapter_find_free_idx(); + http2_stream_id := f_http2_adapter_next_stream_id(http2_idx); + http2_tx := ts_HTTP2_Msg(http2_idx, + http2_stream_id, + hb := { + pseudo_headers := ts_HTTP2_pseudo_headers_Req(method := "POST", + scheme := "http", + authority := c_N32f_uri_hostport, + path := c_N32f_Forward_path_n32f_process), + headers := { + ts_HTTP2_Hdr_content_type("application/json"), + ts_HTTP2_Hdr_accept("application/json"), + ts_HTTP2_Hdr_user_agent("ttcn3-sepp"), + ts_HTTP2_Hdr_accept_encoding("gzip") + } + }, + body := ts_HTTP2_Data_frame(http2_stream_id, + end_stream_flag := true, + data := req_enc)); + return valueof(http2_tx); +} + + +/* 5.3.2.4 Message Forwarding to Peer SEPP */ +function f_N32f_Forward_post_forward() +runs on ConnHdlr { + var HTTP2_Msg http2_tx; + var HTTP2_Msg http2_rx; + var template (present) HTTP2_Msg http2_exp_rx; + var template (value) N32fReformattedReqMsg req; + + req := ts_N32fReformattedReqMsg(reformattedData := ts_FlatJweJson(ciphertext := "foobar"), + modificationsBlock := omit); + + http2_tx := f_N32f_Forward_prepare_post_forward(valueof(req)); + f_http2_adapter_connect_send_sepp_sbi(http2_tx, idx := http2_tx.conn_id); + + /* 3GPP TS 29.573 Table 6.2.4.2.2-2 */ + http2_exp_rx := + tr_HTTP2_Msg(http2_tx.conn_id, + http2_tx.stream_id, + tr_HTTP2_header_block(pseudo_headers := tr_HTTP2_pseudo_headers_Resp(200)), + tr_HTTP2_Data_frame(stream_id := http2_tx.stream_id, + end_stream_flag := true, + data := decmatch tr_N32fReformattedRspMsg())); + as_http2_adapter_receive(http2_rx, http2_exp_rx, idx := http2_tx.conn_id); + + f_http2_adapter_close(idx := http2_tx.conn_id); + setverdict(pass); +} + +/* Receive content of f_n35_get_authentication_subscription() forwarded by the IUT SEPP to our emulated SEPP: */ +/* 6.1.3.2 Resource: nf-instances (Store) (GET) */ +function f_tr_receive_forwarded_traffic() +runs on ConnHdlr return template (present) HTTP2_Msg { + var template (present) HTTP2_Msg http2_msg; + var template (present) HTTP2_header_block hb; + var template (present) HTTP2_pseudo_headers pseudo_headers; + var template HTTP2_header_list headers := *; + + pseudo_headers := tr_HTTP2_pseudo_headers_Req(method := "GET", + path := c_Nudr_DR_path); + hb := tr_HTTP2_header_block(pseudo_headers, headers); + http2_msg := tr_HTTP2_Msg(?, ?, + hb := hb, + body := omit); + return http2_msg; +} +altstep as_N32f_receive_forwarded_traffic(template (present) HTTP2_Msg http2_exp) +runs on ConnHdlr { + var HTTP2_Msg http2_rx; + [] HTTP2_CONN[HTTP2_CONN_SEPP].receive(http2_exp) -> value http2_rx { + var template (value) HTTP2_Msg http2_tx; + + http2_tx := ts_HTTP2_Msg_200_OK(http2_rx.conn_id, + http2_rx.stream_id, + headers := { + ts_HTTP2_Hdr_content_type("application/json") + }, + body := omit); + HTTP2_CONN[HTTP2_CONN_SEPP].send(http2_tx); + setverdict(pass); + } +} + + +/**************************************************** + * Nnrf (SBI) Emulated NRF, 3GPP TS 29.510 + ****************************************************/ +const charstring c_Nnrf_uri_hostport := mp_scp_local_ip & ":" & int2str(mp_scp_local_port); +const charstring c_Nnrf_uri_prefix := "http://" & c_Nnrf_uri_hostport; + +/* 6.1.3.2 Resource: nf-instances (Store) (GET) */ +function f_tr_Nnrf_NFM_get_nf_instances() +runs on ConnHdlr return template (present) HTTP2_Msg { + var template (present) HTTP2_Msg http2_msg; + var template (present) HTTP2_header_block hb; + var template (present) HTTP2_pseudo_headers pseudo_headers; + var template HTTP2_header_list headers := *; + + pseudo_headers := tr_HTTP2_pseudo_headers_Req(method := "GET", + path := c_Nnrf_NFM_path_nf_instances); + hb := tr_HTTP2_header_block(pseudo_headers, headers); + http2_msg := tr_HTTP2_Msg(?, ?, + hb := hb, + body := omit); + return http2_msg; +} + +/* 6.1.3.2 Resource: nf-instances (Store) (GET) */ +altstep as_Nnrf_NFM_get_nf_instances() +runs on ConnHdlr { + var HTTP2_Msg http2_rx; + [] HTTP2_CONN[HTTP2_CONN_SCP].receive(f_tr_Nnrf_NFM_get_nf_instances()) -> value http2_rx { + var template (value) UriList1 uri_list; + var octetstring body_enc; + var template (value) HTTP2_Msg http2_tx; + + uri_list := ts_UriList1(links := { {"item", ts_LinksValueSchema1(ts_Link1("heyval"))} }); + body_enc := f_enc_UriList1(valueof(uri_list)); + + http2_tx := ts_HTTP2_Msg_200_OK(http2_rx.conn_id, + http2_rx.stream_id, + headers := { + ts_HTTP2_Hdr_content_type("application/json") + }, + body := ts_HTTP2_Data_frame(http2_rx.stream_id, + end_stream_flag := true, + data := body_enc)); + HTTP2_CONN[HTTP2_CONN_SCP].send(http2_tx); + setverdict(pass); + } +} + +/* 6.1.3.3 Resource: nf-instance (PUT) */ +function f_tr_Nnrf_NFM_put_nf_instance() +runs on ConnHdlr return template (present) HTTP2_Msg { + var template (present) HTTP2_Msg http2_msg; + var template (present) HTTP2_header_block hb; + var template (present) HTTP2_pseudo_headers pseudo_headers; + var template HTTP2_header_list headers := *; + + pseudo_headers := tr_HTTP2_pseudo_headers_Req(method := "PUT", + path := tr_Nnrf_NFM_path_nf_instance); + hb := tr_HTTP2_header_block(pseudo_headers, headers); + http2_msg := tr_HTTP2_Msg(?, ?, + hb := hb, + body := tr_HTTP2_Data_frame(data := decmatch tr_NFProfile1)); + return http2_msg; +} + +/* 6.1.3.3 Resource: nf-instance (PUT) */ +altstep as_Nnrf_NFM_put_nf_instance() +runs on ConnHdlr { + var HTTP2_Msg http2_rx; + [] HTTP2_CONN[HTTP2_CONN_SCP].receive(f_tr_Nnrf_NFM_put_nf_instance()) -> value http2_rx { + var NFProfile1 profile; + var octetstring body_enc; + var template (value) HTTP2_Msg http2_tx; + + f_dec_NFProfile1(http2_rx.body.data, profile); // TODO: check rc + profile.plmnList := { valueof(ts_PlmnId1(mcc := mp_sepp_plmn_mcc, mnc := mp_sepp_plmn_mnc)) }; + body_enc := f_enc_NFProfile1(profile); + + http2_tx := ts_HTTP2_Msg_201_Created(http2_rx.conn_id, + http2_rx.stream_id, + headers := { + ts_HTTP2_Hdr_content_type("application/json") + }, + body := ts_HTTP2_Data_frame(http2_rx.stream_id, + end_stream_flag := true, + data := body_enc)); + HTTP2_CONN[HTTP2_CONN_SCP].send(http2_tx); + setverdict(pass); + } +} + +/**************************************************** + * SBI Emulated NF, 3GPP TS 29.573 + ****************************************************/ +const charstring c_sbi_uri_hostport := mp_sepp_sbi_hostname & ":" & int2str(mp_sepp_sbi_port); +const charstring c_sbi_uri_prefix := "http://" & c_sbi_uri_hostport; +const charstring c_sbi_uri_fqdn := "http://5gc.mnc" & mp_sepp_local_plmn_mnc & ".mcc" & mp_sepp_local_plmn_mcc & ".3gppnetwork.org"; + +const charstring c_HTTP2_HDR_3Gpp_Sbi_Target_apiRoot := "3gpp-sbi-target-apiroot"; + +/* Test msg to be forwarded:*/ +const charstring c_Nudr_DR_path := "/nudr-dr/v1/subscription-data/imsi-345645645433/authentication-data/authentication-subscription"; + +/* Prepare some sample msg to be forwarded by the IUT SEPP + * payload: (3GPP TS 29.505 5.2.2.3.1 Resource: AuthenticationSubscription (GET)) */ +function f_n35_prepare_get_authentication_subscription() +runs on ConnHdlr return HTTP2_Msg { + var integer http2_idx := f_http2_adapter_find_free_idx(); + var integer http2_stream_id := f_http2_adapter_next_stream_id(http2_idx); + var template (value) HTTP2_Msg http2_tx; + + http2_tx := ts_HTTP2_Msg(http2_idx, + http2_stream_id, + hb := { + pseudo_headers := ts_HTTP2_pseudo_headers_Req(method := "GET", + scheme := "http", + authority := c_sbi_uri_hostport, + path := c_Nudr_DR_path), + headers := { + ts_HTTP2_Hdr_content_type("application/json"), + ts_HTTP2_Hdr_accept("application/json"), + ts_HTTP2_Hdr_user_agent("ttcn3-udm"), + ts_HTTP2_Hdr_accept_encoding("gzip"), + ts_HTTP2_header_field(c_HTTP2_HDR_3Gpp_Sbi_Target_apiRoot, c_sbi_uri_fqdn) + } + }); + return valueof(http2_tx); +} + + +} diff --git a/sepp/README.md b/sepp/README.md new file mode 100644 index 0000000..3a12f82 --- /dev/null +++ b/sepp/README.md @@ -0,0 +1,16 @@ +# SEPP_Tests.ttcn + +* external interfaces + * N32-c: SBI (emulates peer SEPP) + * NN32-f: SBI (emulates peer SEPP or RI) + +{% dot sepp_tests.svg +digraph G { + rankdir=LR; + ATS [label="ATS\nSEPP_Tests.ttcn"]; + SEPP [label="AMF\open5gs-seppd",shape="box"]; + + ATS -> SEPP [label="N32-c"]; + ATS -> SEPP [label="N32-f"]; +} +%} diff --git a/sepp/SEPP_Tests.cfg b/sepp/SEPP_Tests.cfg new file mode 100644 index 0000000..ffe2db5 --- /dev/null +++ b/sepp/SEPP_Tests.cfg @@ -0,0 +1,30 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./SEPP_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +SEPP_Tests.mp_sepp_sbi_hostname := "127.0.1.250"; +SEPP_Tests.mp_sepp_sbi_port := 7777; +SEPP_Tests.mp_sepp_n32c_hostname := "127.0.1.251"; +SEPP_Tests.mp_sepp_n32c_port := 7777; +SEPP_Tests.mp_sepp_n32f_hostname := "127.0.0.252"; +SEPP_Tests.mp_sepp_n32f_port := 7777; +SEPP_Tests.mp_sepp_fqdn_sender := "sepp1.localdomain"; + +SEPP_Tests.mp_scp_local_ip := "127.0.0.200"; +SEPP_Tests.mp_scp_local_port := 7777; +SEPP_Tests.mp_sepp_local_ip := "127.0.0.10"; +SEPP_Tests.mp_sepp_local_port := 7777; + +[MAIN_CONTROLLER] + +[EXECUTE] +SEPP_Tests.control diff --git a/sepp/SEPP_Tests.default b/sepp/SEPP_Tests.default new file mode 100644 index 0000000..b03f59e --- /dev/null +++ b/sepp/SEPP_Tests.default @@ -0,0 +1,12 @@ +[LOGGING] +FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; + +[TESTPORT_PARAMETERS] +*.TCP.noDelay := "yes" // turn off nagle +*.HTTP.use_notification_ASPs := "yes" + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] diff --git a/sepp/SEPP_Tests.ttcn b/sepp/SEPP_Tests.ttcn new file mode 100644 index 0000000..8b75273 --- /dev/null +++ b/sepp/SEPP_Tests.ttcn @@ -0,0 +1,245 @@ +/* SEPP test suite in TTCN-3 (3GPP TS 29.573, 3GPP TS 33.501) + * (C) 2026 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module SEPP_Tests { + +import from General_Types all; +import from Native_Functions all; +import from IPL4asp_Types all; +import from Misc_Helpers all; + +import from Osmocom_Types all; +import from GSM_Types all; + +import from TCCEncoding_Functions all; + +import from HTTP2_Templates all; +import from HTTP2_Msg all; +import from HTTP2_Adapter all; +import from HTTP2_Server_Emulation all; + +import from ConnHdlr all; + +modulepar { + charstring mp_sepp_sbi_hostname := "127.0.1.250"; + integer mp_sepp_sbi_port := 7777; + + charstring mp_sepp_n32c_hostname := "127.0.1.251"; + integer mp_sepp_n32c_port := 7777; + + charstring mp_sepp_n32f_hostname := "127.0.0.252"; + integer mp_sepp_n32f_port := 7777; + + charstring mp_sepp_fqdn_sender := "sepp1.localdomain"; + charstring mp_sepp_plmn_mcc := "002"; + charstring mp_sepp_plmn_mnc := "001"; + + charstring mp_scp_local_ip := "127.0.0.200"; + integer mp_scp_local_port := 7777; + + /* IP address at which we listen for HTTP2/SBI to emulate a SEPP in ttcn3 */ + charstring mp_sepp_local_ip := "127.0.0.10"; + integer mp_sepp_local_port := 7777; + + charstring mp_sepp_local_plmn_mcc := "456"; + charstring mp_sepp_local_plmn_mnc := "123"; +} + +type component MTC_CT extends HTTP2_CT, HTTP2_ConnHdlr { + /* emulated SCP */ + var HTTP2_Server_Emulation_CT vc_HTTP2_SRV_SCP; + var HTTP2_Server_Emulation_CT vc_HTTP2_SRV_SEPP; + + timer g_Tguard := 30.0; +} + +private function f_init_http2_srv(charstring id) runs on MTC_CT { + id := id & "-HTTP2SRV"; + + var Http2ServerEmulationCfg http2_srv_cfg := { + http2_bind_ip := mp_scp_local_ip, + http2_bind_port := mp_scp_local_port, + one_req_per_conn := false + }; + vc_HTTP2_SRV_SCP := HTTP2_Server_Emulation_CT.create(id & "-SCP") alive; + vc_HTTP2_SRV_SCP.start(HTTP2_Server_Emulation.main(http2_srv_cfg)); + + http2_srv_cfg := { + http2_bind_ip := mp_sepp_local_ip, + http2_bind_port := mp_sepp_local_port, + one_req_per_conn := false + }; + vc_HTTP2_SRV_SEPP := HTTP2_Server_Emulation_CT.create(id & "-SEPP") alive; + vc_HTTP2_SRV_SEPP.start(HTTP2_Server_Emulation.main(http2_srv_cfg)); + + + connect(self:HTTP2_CONN_PROC[HTTP2_CONN_SCP], vc_HTTP2_SRV_SCP:CONN_PROC); + connect(self:HTTP2_CONN_PROC[HTTP2_CONN_SEPP], vc_HTTP2_SRV_SEPP:CONN_PROC); +} + + +private function f_init(integer imsi_suffix := 0, float t_guard := 30.0) runs on MTC_CT { + var charstring id := testcasename(); + + g_Tguard.start(t_guard); + activate(as_Tguard()); + + f_init_http2_srv(id); +} + +private function f_shutdown() runs on MTC_CT { + f_http2_server_close_conn_all(idx := HTTP2_CONN_SCP); + f_http2_server_close_conn_all(idx := HTTP2_CONN_SEPP); + setverdict(pass); +} + +private function f_start_handler_create() +runs on MTC_CT return ConnHdlr +{ + var ConnHdlr vc_conn; + var charstring id := testcasename(); + + vc_conn := ConnHdlr.create(id); + + if (isbound(vc_HTTP2_SRV_SCP)) { + connect(vc_conn:HTTP2_CONN[HTTP2_CONN_SCP], vc_HTTP2_SRV_SCP:CONN); + connect(vc_conn:HTTP2_CONN_PROC[HTTP2_CONN_SCP], vc_HTTP2_SRV_SCP:CONN_PROC); + } + + if (isbound(vc_HTTP2_SRV_SEPP)) { + connect(vc_conn:HTTP2_CONN[HTTP2_CONN_SEPP], vc_HTTP2_SRV_SEPP:CONN); + connect(vc_conn:HTTP2_CONN_PROC[HTTP2_CONN_SEPP], vc_HTTP2_SRV_SEPP:CONN_PROC); + } + + return vc_conn; +} + +private function f_start_handler_run(ConnHdlr vc_conn, void_fn fn, ConnHdlrPars pars) runs on MTC_CT +{ + vc_conn.start(f_ConnHdlr_init(fn, pars)); +} + +/* start a connection handler with given parameters */ +private function f_start_handler(void_fn fn, ConnHdlrPars pars) +runs on MTC_CT return ConnHdlr { + var ConnHdlr vc_conn; + vc_conn := f_start_handler_create(); + f_start_handler_run(vc_conn, fn, pars); + return vc_conn; +} + +private altstep as_Tguard() runs on MTC_CT { + [] g_Tguard.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout"); + } +} + +private function f_TC_security_cap_negotiation_none() runs on ConnHdlr { + f_N32_Handshake_post_sec_cap_neg(NONE); + setverdict(pass); +} +testcase TC_security_cap_negotiation_none() runs on MTC_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars := f_ConnHdlrPars(0); + f_init(); + vc_conn := f_start_handler(refers(f_TC_security_cap_negotiation_none), pars); + vc_conn.done; + f_shutdown(); +} + +private function f_TC_security_cap_negotiation_tls() runs on ConnHdlr { + f_N32_Handshake_post_sec_cap_neg(TLS); + f_N32_Handshake_post_sec_cap_neg(NONE); + setverdict(pass); +} +testcase TC_security_cap_negotiation_tls() runs on MTC_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars := f_ConnHdlrPars(0); + f_init(); + vc_conn := f_start_handler(refers(f_TC_security_cap_negotiation_tls), pars); + vc_conn.done; + f_shutdown(); +} + +private function f_TC_security_cap_negotiation_prins() runs on ConnHdlr { + f_N32_Handshake_post_sec_cap_neg(PRINS); + f_N32_Handshake_post_exchange_params(); + setverdict(pass); +} +testcase TC_security_cap_negotiation_prins() runs on MTC_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars := f_ConnHdlrPars(0); + f_init(); + vc_conn := f_start_handler(refers(f_TC_security_cap_negotiation_prins), pars); + vc_conn.done; + f_shutdown(); +} + +private function f_TC_security_cap_negotiation_server() runs on ConnHdlr { + var HTTP2_Msg http2_tx; + var HTTP2_Msg http2_rx; + var template (present) HTTP2_Msg http2_exp_rx; + + as_Nnrf_NFM_put_nf_instance(); + as_Nnrf_NFM_get_nf_instances(); + as_N32_Handshake_post_sec_cap_neg(); + + /* Test NF sendig data through IUT c-SEPP to our emulated SEPP and back: */ + http2_tx := f_n35_prepare_get_authentication_subscription(); + f_http2_adapter_connect_send_sepp_sbi(http2_tx, idx := http2_tx.conn_id); + + /* emulated p-SEPP receives the traffic emulates forwarding to local NF and forwards back the answer: */ + as_N32f_receive_forwarded_traffic(f_tr_receive_forwarded_traffic()); + + /* IUT SEPP forwards the answer back to the originator inside its PLMN: */ + http2_exp_rx := tr_HTTP2_Msg(http2_tx.conn_id, + http2_tx.stream_id, + tr_HTTP2_header_block(pseudo_headers := tr_HTTP2_pseudo_headers_Resp(200)), + omit); + as_http2_adapter_receive(http2_rx, http2_exp_rx, idx := http2_tx.conn_id); + + f_http2_adapter_close(idx := http2_tx.conn_id); + setverdict(pass); +} +testcase TC_security_cap_negotiation_server() runs on MTC_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars := f_ConnHdlrPars(0); + f_init(); + vc_conn := f_start_handler(refers(f_TC_security_cap_negotiation_server), pars); + vc_conn.done; + f_shutdown(); +} + +private function f_TC_psepp_n32f_forward() runs on ConnHdlr { + f_N32_Handshake_post_sec_cap_neg(TLS); + f_N32f_Forward_post_forward(); + /* TODO: make sure the message is forwarded to an internal PLMN NF as a result. + * N32-f Forwarding is not yet implemented in open5gs-seppd. */ + setverdict(pass); +} +testcase TC_psepp_n32f_forward() runs on MTC_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars := f_ConnHdlrPars(0); + f_init(); + vc_conn := f_start_handler(refers(f_TC_psepp_n32f_forward), pars); + vc_conn.done; + f_shutdown(); +} + +control { + execute( TC_security_cap_negotiation_none() ); + execute( TC_security_cap_negotiation_tls() ); + execute( TC_security_cap_negotiation_prins() ); + execute( TC_security_cap_negotiation_server() ); + execute( TC_psepp_n32f_forward() ); +} + +} diff --git a/sepp/expected-results.xml b/sepp/expected-results.xml new file mode 100644 index 0000000..bd9d091 --- /dev/null +++ b/sepp/expected-results.xml @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<testsuite name='Titan' tests='4' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> + <testcase classname='SEPP_Tests' name='TC_security_cap_negotiation_none' time='MASKED'/> + <testcase classname='SEPP_Tests' name='TC_security_cap_negotiation_tls' time='MASKED'/> + <testcase classname='SEPP_Tests' name='TC_security_cap_negotiation_prins' time='MASKED'/> + <testcase classname='SEPP_Tests' name='TC_security_cap_negotiation_server' time='MASKED'/> + <testcase classname='SEPP_Tests' name='TC_psepp_n32f_forward' time='MASKED'/> +</testsuite> diff --git a/sepp/gen_links.sh b/sepp/gen_links.sh new file mode 100755 index 0000000..ff8fcd2 --- /dev/null +++ b/sepp/gen_links.sh @@ -0,0 +1,52 @@ +#!/bin/bash -e + +BASEDIR=../deps + +. ../_buildsystem/gen_links.inc.sh + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +# Required by MGCP and IPA +DIR=$BASEDIR/titan.TestPorts.IPL4asp/src +FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" +gen_links $DIR $FILES + +# Needed by HTTP_Adapter (Prometheus_Checker.ttcn metrics): +DIR=$BASEDIR/titan.TestPorts.Common_Components.Abstract_Socket/src +FILES="Abstract_Socket.cc Abstract_Socket.hh " +gen_links $DIR $FILES + +# Needed by HTTP_Adapter (Prometheus_Checker.ttcn metrics): +DIR=$BASEDIR/titan.TestPorts.HTTPmsg/src +FILES="HTTPmsg_MessageLen.ttcn HTTPmsg_MessageLen_Function.cc HTTPmsg_PT.cc HTTPmsg_PT.hh HTTPmsg_PortType.ttcn HTTPmsg_Types.ttcn " +gen_links $DIR $FILES + +# Needed by HTTP2_Adapter: +DIR=$BASEDIR/titan.ProtocolModules.HTTP2/src +FILES="HTTP2_EncDec.cc HTTP2_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.JSON_v07_2006/src +FILES="JSON_Generic_Null_Def.asn JSON_Generic.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/osmo-ttcn3-openapi-generator/openapi-specs/3GPP_5GC_Rel19/ttcn3 +FILES="TS29571_CommonData.ttcn TS29510_Nnrf_NFManagement.ttcn TS29573_N32_Handshake.ttcn TS29573_JOSEProtectedMessageForwarding.ttcn " +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn IPCP_Templates.ttcn " +FILES+="SCTP_Templates.ttcn " +FILES+="HTTP2_CodecPort.ttcn HTTP2_CodecPort_CtrlFunct.ttcn HTTP2_CodecPort_CtrlFunctDef.cc HTTP2_Templates.ttcn HTTP2_Functions.ttcn HTTP2_Msg.ttcn HTTP2_Adapter.ttcn HTTP2_Server_Emulation.ttcn " +FILES+="HTTP_Adapter.ttcn Prometheus_Checker.ttcn " +FILES+="TS29571_CommonData_Templates.ttcn TS29510_Nnrf_NFManagement_Templates.ttcn TS29573_N32_Handshake_Templates.ttcn TS29573_JOSEProtectedMessageForwarding_Templates.ttcn " +gen_links $DIR $FILES + +gen_links_finish diff --git a/sepp/open5gs-sepp.yaml b/sepp/open5gs-sepp.yaml new file mode 100644 index 0000000..e47264f --- /dev/null +++ b/sepp/open5gs-sepp.yaml @@ -0,0 +1,46 @@ +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/sepp1.yaml.in + +logger: + level: trace + +global: + max: + ue: 1024 + +sepp: + default: +# tls: +# server: +# private_key: @sysconfdir@/open5gs/tls/sepp1.key +# cert: @sysconfdir@/open5gs/tls/sepp1.crt +# client: +# cacert: @sysconfdir@/open5gs/tls/ca.crt + sbi: + server: + - address: 127.0.1.250 + port: 7777 + client: +# nrf: +# - uri: http://127.0.0.10:7777 + scp: + - uri: http://127.0.0.200:7777 + n32: + server: + - sender: sepp1.localdomain + scheme: http #s + address: 127.0.1.251 + port: 7777 + n32f: + scheme: http #s + address: 127.0.0.252 + port: 7777 + client: + sepp: + - receiver: sepp2.localdomain + scheme: http #s + uri: http://sepp2.localdomain:7777 + resolve: 127.0.0.10 + n32f: + scheme: http #s + uri: http://sepp2.localdomain:7777 + resolve: 127.0.0.10 diff --git a/sepp/open5gs_prepare.sh b/sepp/open5gs_prepare.sh new file mode 100755 index 0000000..7378980 --- /dev/null +++ b/sepp/open5gs_prepare.sh @@ -0,0 +1,7 @@ +#!/bin/sh -ex + +adjust_sysconfdir_config() { + sed -i "s~@sysconfdir@~$TESTENV_INSTALL_DIR/etc/~g" $1 +} + +adjust_sysconfdir_config ./*.yaml diff --git a/sepp/regen_makefile.sh b/sepp/regen_makefile.sh new file mode 100755 index 0000000..45d9ff9 --- /dev/null +++ b/sepp/regen_makefile.sh @@ -0,0 +1,23 @@ +#!/bin/sh -e + +NAME=SEPP_Tests + +FILES=" + *.asn + *.ttcn + Abstract_Socket.cc + HTTPmsg_MessageLen_Function.cc + HTTPmsg_PT.cc + HTTP2_EncDec.cc + HTTP2_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc +" + +. ../_buildsystem/regen_makefile.inc.sh + +sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lgnutls/' Makefile diff --git a/sepp/testenv.cfg b/sepp/testenv.cfg new file mode 100644 index 0000000..82d82ad --- /dev/null +++ b/sepp/testenv.cfg @@ -0,0 +1,11 @@ +[testsuite] +program=SEPP_Tests +config=SEPP_Tests.cfg + +[sepp] +prepare=./open5gs_prepare.sh +program=open5gs-seppd -c open5gs-sepp.yaml +make=open5gs +package=open5gs-sepp +copy=open5gs-sepp.yaml open5gs_prepare.sh + diff --git a/sepp/testsrcdir.cfg b/sepp/testsrcdir.cfg new file mode 100644 index 0000000..7f19289 --- /dev/null +++ b/sepp/testsrcdir.cfg @@ -0,0 +1,2 @@ +[testsrcdir] +max_jobs_per_gb_ram=0.3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/44048?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: I985f5f7e10d3f687e6a700f7c0dd9923bf995f97 Gerrit-Change-Number: 44048 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 0
0 0
[S] Change in osmo-remsim[master]: Add osmo-remsim-client-socket usage to documentation
by pespin 11 Nov '26

11 Nov '26
Attention is currently required from: jolly. pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-remsim/+/43815?usp=email ) Change subject: Add osmo-remsim-client-socket usage to documentation ...................................................................... Patch Set 5: Code-Review+1 (1 comment) Patchset: PS5: I see you are mixing 2 different features interleaved in the commits: * osmo-remsim-client-socket * maintenance slotmaps It probably makes sense to split them in 2 patch series, or at least group them (ie. moving this patch after the "Introduce osmo-remsism-client-socket"). -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/43815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ia52628a99229e615093b80748696d5849d6f0f05 Gerrit-Change-Number: 43815 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 11 Nov 2026 11:04:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes
1 0
0 0
[M] Change in osmo-remsim[master]: Update osmo-remsim-apitool to support maintenance flag
by pespin 11 Nov '26

11 Nov '26
Attention is currently required from: jolly, laforge, lynxis lazus. pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-remsim/+/43747?usp=email ) Change subject: Update osmo-remsim-apitool to support maintenance flag ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/43747?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Iaac6423b3a2f7209d0c26e9624d90b21b7c39f89 Gerrit-Change-Number: 43747 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 11 Nov 2026 11:02:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
[S] Change in osmo-remsim[master]: Add optional timeout to mapping
by pespin 11 Nov '26

11 Nov '26
Attention is currently required from: jolly, lynxis lazus. pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-remsim/+/43746?usp=email ) Change subject: Add optional timeout to mapping ...................................................................... Patch Set 6: (4 comments) File src/server/rspro_server.c: https://gerrit.osmocom.org/c/osmo-remsim/+/43746/comment/f918aa62_62f41c3a?… : PS6, Line 415: { Add some logging regarding the timeout her? https://gerrit.osmocom.org/c/osmo-remsim/+/43746/comment/78449393_d430d813?… : PS6, Line 463: osmo_timer_setup(&map->timer, mapping_timeout, map); This timer/timeout looks really related to the "map" object, not the "conn" one, which means this timer most probably belongs to the FSM/file in map->state? (The one doing stuff with slotmap_state_change()?) https://gerrit.osmocom.org/c/osmo-remsim/+/43746/comment/b162fb17_10a923a5?… : PS6, Line 464: osmo_timer_schedule(&map->timer, map->timeout, 0); if map->timeout > 0 File src/slotmap.c: https://gerrit.osmocom.org/c/osmo-remsim/+/43746/comment/8c534e4b_4e9b6aa4?… : PS6, Line 174: osmo_timer_del(&map->timer); There we go, the timer is deleted here, so the set up of the timer and arming it also probably belngs in this file or wherever its FSM is. -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/43746?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I2f7ee24e6c926b65876af2b14da3534555398769 Gerrit-Change-Number: 43746 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 11 Nov 2026 11:02:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No
1 0
0 0
[S] Change in osmo-ci[master]: jobs/registry-rebuild-upload-arm: new job
by osmith 11 Nov '26

11 Nov '26
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/44054?usp=email ) Change subject: jobs/registry-rebuild-upload-arm: new job ...................................................................... jobs/registry-rebuild-upload-arm: new job Add a separate job for building and uploading the arm image, so we can fetch the related base image and run it on a specific arm machine (lx2). As mentioned in the previous commit message, this is a lot more efficient than building this image over and over on all raspberry pis. Related: OS#7117 Change-Id: I66614406c3be68fdc5773a34617b7154e497ebdf --- A jobs/registry-rebuild-upload-arm.yml 1 file changed, 45 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/registry-rebuild-upload-arm.yml b/jobs/registry-rebuild-upload-arm.yml new file mode 100644 index 0000000..a032a8d --- /dev/null +++ b/jobs/registry-rebuild-upload-arm.yml @@ -0,0 +1,45 @@ +- project: + name: registry-rebuild-upload + jobs: + - "{job-name}" + job-name: + - registry-rebuild-upload-trixie-build-arm: + image: "debian-trixie-build-arm" + base: "arm32v7/debian:trixie" + +- job-template: + name: '{job-name}' + node: lx2-raspbian13build-ansible + description: | + Build the <code>{image}</code> image from + <a href="https://gitea.osmocom.org/osmocom/docker-playground/"> + docker-playground + </a> and push it to the Osmocom registry. + concurrent: false + parameters: + - string: + name: BRANCH + description: | + Branch of <code>docker-playground.git</code> + default: 'master' + scm: + - git: + url: https://gerrit.osmocom.org/docker-playground + skip-tag: true + branches: + - '$BRANCH' + builders: + - shell: | + REGISTRY="registry.osmocom.org" + + docker pull {base} + docker tag {base} "$REGISTRY"/{base} + + setarch linux32 make -C "{image}" REGISTRY_HOST=$REGISTRY + docker push "$REGISTRY/osmocom-build/{image}" + properties: + - build-discarder: + num-to-keep: 120 + wrappers: + - ansicolor: + colormap: xterm -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/44054?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I66614406c3be68fdc5773a34617b7154e497ebdf Gerrit-Change-Number: 44054 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 0
0 0
[M] Change in osmo-ci[master]: jobs/master-build: pull images before using them
by osmith 11 Nov '26

11 Nov '26
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/44055?usp=email ) Change subject: jobs/master-build: pull images before using them ...................................................................... jobs/master-build: pull images before using them Related: OS#7117 Change-Id: Ic93f3b8c440c8ab15d5eda28ccc06e0873a48d5b --- M jobs/master-builds.yml 1 file changed, 61 insertions(+), 17 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 7b66289..a54d93d 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -80,15 +80,18 @@ -e CCACHE_DIR="/ccache" \ -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -v "$CCACHE_DIR:/ccache" \ - docker_img: '$USER/debian-trixie-build' - docker_img_erlang: '$USER/debian-bookworm-erlang' + docker_img: 'registry.osmocom.org/osmocom-build/debian-trixie-build' + docker_img_bookworm: 'registry.osmocom.org/osmocom-build/debian-bookworm-build' + docker_img_erlang: 'registry.osmocom.org/osmocom-build/debian-bookworm-erlang' docker_img_android: 'registry.osmocom.org/osmocom-build/debian-bookworm-android' docker_img_aram_applet: 'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet' docker_img_rp2040: 'registry.osmocom.org/osmocom-build/debian-bookworm-rp2040' docker_img_pysim: 'registry.osmocom.org/osmocom-build/pysim-build' timeout_cmd: '/usr/bin/timeout 30m' wrapper_cmd: '{timeout_cmd} /osmo-ci/scripts/wrapper_core_bt_on_error.sh' - cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img} + {docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh trigger: email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org gerrit_url: 'https://gerrit.osmocom.org' @@ -155,6 +158,7 @@ - libosmo-dsp: repos_url: '{gitea_url}/sdr/{repos}' cmd: | + docker pull {docker_img} {docker_run_ccache} \ {docker_img} {wrapper_cmd} sh -ex -c \ 'autoreconf -fi; \ @@ -204,6 +208,7 @@ (WITH_TCAP == "1" && WITH_MANUALS == "1") || (WITH_TCAP == "0" && WITH_MANUALS == "0") cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e WITH_TCAP="$WITH_TCAP" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -226,7 +231,9 @@ a1_name: arch a1: !!python/tuple [arm-none-eabi, amd64] combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")' - cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins_arch.sh "$arch"' + cmd: | + docker pull {docker_img} + {docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins_arch.sh "$arch" # Full triggers would be: # trigger: > # master-libosmo-netif, master-libosmo-abis, master-libosmo-sigtran, @@ -281,7 +288,9 @@ trigger: master-osmo-trx - onomondo-eim: - cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_erlang} + {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh wipe: true - onomondo-ipa: @@ -318,6 +327,7 @@ SETARCH_CMD="setarch linux32" ;; esac + docker pull "$DOCKER_IMG" {docker_run_ccache} \ -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -325,7 +335,9 @@ - osmo_dia2gsup: repos_url: '{gerrit_url}/erlang/{repos}' - cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_erlang} + {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh - osmo-epdg: repos_url: '{gerrit_url}/erlang/{repos}' @@ -334,9 +346,11 @@ cmd: | case "$JOB_TYPE" in build) + docker pull {docker_img_erlang} {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh ;; manuals) + docker pull {docker_img} {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins_manuals.sh ;; esac @@ -348,20 +362,26 @@ cmd: | case "$JOB_TYPE" in build) + docker pull {docker_img_erlang} {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh ;; manuals) + docker pull {docker_img} {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins_manuals.sh ;; esac - logger_gsmtap: repos_url: '{gerrit_url}/erlang/{repos}' - cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_erlang} + {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh - enftables: repos_url: '{gitea_url}/erlang/{repos}' - cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_erlang} + {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh - osmo-e1-hardware: a2_name: JOB_TYPE @@ -371,9 +391,9 @@ case "$JOB_TYPE" in firmware|gateware) DOCKER_IMG="registry.osmocom.org/$USER/fpga-build" - docker pull "$DOCKER_IMG" ;; esac + docker pull "$DOCKER_IMG" {docker_run} \ -e JOB_TYPE="$JOB_TYPE" \ "$DOCKER_IMG" \ @@ -384,14 +404,18 @@ - ice40-usbtrace: repos_url: '{gitea_url}/electronics/{repos}' docker_img: 'registry.osmocom.org/$USER/fpga-build' - cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' + cmd: | + docker pull {docker_img} + {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish ssh: - binaries_ftp.osmocom.org - docs_ftp.osmocom.org - no2bootloader: repos_url: 'https://github.com/no2fpga/{repos}' docker_img: 'registry.osmocom.org/$USER/fpga-build' - cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' + cmd: | + docker pull {docker_img} + {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de 246tnt(a)gmail.com ssh: - binaries_ftp.osmocom.org @@ -409,6 +433,7 @@ (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") || (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1") cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e GTP="$GTP" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -425,10 +450,14 @@ - osmo_gsup: repos_url: '{gerrit_url}/erlang/{repos}' - cmd: '{docker_run_ccache} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_erlang} + {docker_run_ccache} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh - osmo-gsm-tester: - cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins-build-manuals.sh' + cmd: | + docker pull {docker_img} + {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins-build-manuals.sh - osmo-hlr @@ -459,6 +488,7 @@ (IU == "--enable-iu" && WITH_MANUALS == "1") || (IU == "--disable-iu" && WITH_MANUALS == "0") cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e IU="$IU" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -491,6 +521,7 @@ SETARCH_CMD="setarch linux32" ;; esac + docker pull "$DOCKER_IMG" {docker_run_ccache} \ -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \ -e with_vty="$with_vty" \ @@ -503,7 +534,9 @@ - ot290-gsmtap: repos_url: '{gitea_url}/phone-side/{repos}' - cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} make -C /build/src' + cmd: | + docker pull {docker_img} + {docker_run_ccache} {docker_img} {wrapper_cmd} make -C /build/src - pyosmocom: repos_url: '{gerrit_url}/python/{repos}' @@ -522,6 +555,7 @@ {timeout_cmd} ./contrib/jenkins.sh ;; *) + docker pull {docker_img_pysim} {docker_run} \ -e JOB_TYPE="$JOB_TYPE" \ {docker_img_pysim} \ @@ -538,6 +572,7 @@ (IU == "--enable-iu" && WITH_MANUALS == "1") || (IU == "--disable-iu" && WITH_MANUALS == "0") cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e IU="$IU" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -569,6 +604,7 @@ SETARCH_CMD="setarch linux32" ;; esac + docker pull "$DOCKER_IMG" {docker_run_ccache} \ -e INSTR="$INSTR" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -582,13 +618,17 @@ - osmo-sysmon - osmo-remsim - osmo-asf4-dfu: - cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' + cmd: | + docker pull {docker_img} + {docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de ssh: - binaries_ftp.osmocom.org - docs_ftp.osmocom.org - osmo-ccid-firmware: - cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' + cmd: | + docker pull {docker_img} + {docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org ewild(a)sysmocom.de ssh: - binaries_ftp.osmocom.org @@ -613,7 +653,9 @@ - osmo-opencm3-projects: repos_url: '{gitea_url}/electronics/{repos}' # bookworm: OS#6859 - cmd: '{docker_run} $USER/debian-bookworm-build {wrapper_cmd} /build/contrib/jenkins.sh --publish' + cmd: | + docker pull {docker_img_bookworm} + {docker_run} {docker_img_bookworm} {wrapper_cmd} /build/contrib/jenkins.sh --publish email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de ssh: - binaries_ftp.osmocom.org @@ -640,6 +682,7 @@ (PFCP == "1" && WITH_MANUALS == "1" && NFTABLES == "1") || (PFCP == "0" && WITH_MANUALS == "0" && NFTABLES == "0") cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e PFCP="$PFCP" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -696,6 +739,7 @@ cmd: | rm -rf osmo-ci git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b master + docker pull {docker_img} {docker_run_ccache} {docker_img} {wrapper_cmd} /build/osmo-ci/scripts/xgoldmon-jenkins.sh jobs: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/44055?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic93f3b8c440c8ab15d5eda28ccc06e0873a48d5b Gerrit-Change-Number: 44055 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 0
0 0
[M] Change in osmo-ci[master]: jobs/gerrit-verifications: pull images before using them
by osmith 11 Nov '26

11 Nov '26
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/44056?usp=email ) Change subject: jobs/gerrit-verifications: pull images before using them ...................................................................... jobs/gerrit-verifications: pull images before using them Related: OS#7117 Change-Id: I576745e3536286e678d409d766bfad2f5be7b866 --- M jobs/gerrit-verifications.yml 1 file changed, 43 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 35a7f5d..f3af22d 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -97,15 +97,18 @@ -e CCACHE_DIR="/ccache" \ -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -v "$CCACHE_DIR:/ccache" \ - docker_img: '$USER/debian-trixie-build' - docker_img_erlang: '$USER/debian-bookworm-erlang' + docker_img: 'registry.osmocom.org/osmocom-build/debian-trixie-build' + docker_img_bookworm: 'registry.osmocom.org/osmocom-build/debian-bookworm-build' + docker_img_erlang: 'registry.osmocom.org/osmocom-build/debian-bookworm-erlang' docker_img_android: 'registry.osmocom.org/osmocom-build/debian-bookworm-android' docker_img_aram_applet: 'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet' docker_img_rp2040: 'registry.osmocom.org/osmocom-build/debian-bookworm-rp2040' docker_img_pysim: 'registry.osmocom.org/osmocom-build/pysim-build' timeout_cmd: '/usr/bin/timeout 30m' wrapper_cmd: '{timeout_cmd} /osmo-ci/scripts/wrapper_core_bt_on_error.sh' - cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img} + {docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh check_jenkins_mark: 'git show --summary --format=%B | grep "^Jenkins:" | grep -q' gerrit_url: 'ssh://jenkins@gerrit.osmocom.org:29418' repos_url: '{gerrit_url}/{repos}' @@ -178,6 +181,7 @@ (WITH_TCAP == "1" && WITH_MANUALS == "1") || (WITH_TCAP == "0" && WITH_MANUALS == "0") cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e WITH_TCAP="$WITH_TCAP" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -188,7 +192,9 @@ a1_name: arch a1: !!python/tuple [arm-none-eabi, amd64] combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")' - cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins_arch.sh "$arch"' + cmd: | + docker pull {docker_img} + {docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins_arch.sh "$arch" # SYS#8110: almalinux:8 (osmo-pcap dep) # SYS#6760: centos:7 (osmo-pcap dep) pipeline_binpkgs: "almalinux:8 centos:7 debian:10 debian:13" @@ -201,7 +207,9 @@ - libusrp - onomondo-eim: - cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_erlang} + {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh pipeline_binpkgs: "" wipe: true @@ -241,6 +249,7 @@ SETARCH_CMD="setarch linux32" ;; esac + docker pull "$DOCKER_IMG" {docker_run_ccache} \ -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -249,7 +258,9 @@ - osmo_dia2gsup: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_erlang} + {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh - osmo-epdg: repos_url: '{gerrit_url}/erlang/{repos}' @@ -260,9 +271,11 @@ cmd: | case "$JOB_TYPE" in build) + docker pull {docker_img_erlang} {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh ;; manuals) + docker pull {docker_img} {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins_manuals.sh ;; esac @@ -276,9 +289,11 @@ cmd: | case "$JOB_TYPE" in build) + docker pull {docker_img_erlang} {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh ;; manuals) + docker pull {docker_img} {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins_manuals.sh ;; esac @@ -287,7 +302,9 @@ repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' pipeline_binpkgs: "" - cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_erlang} + {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh - osmo-e1-hardware: a2_name: JOB_TYPE @@ -297,9 +314,9 @@ case "$JOB_TYPE" in firmware|gateware|manuals) DOCKER_IMG="registry.osmocom.org/$USER/fpga-build" - docker pull "$DOCKER_IMG" ;; esac + docker pull "$DOCKER_IMG" {docker_run} \ -e JOB_TYPE="$JOB_TYPE" \ "$DOCKER_IMG" \ @@ -321,6 +338,7 @@ (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") || (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1") cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e GTP="$GTP" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -332,7 +350,9 @@ - osmo_gsup: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - cmd: '{docker_run_ccache} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_erlang} + {docker_run_ccache} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh pipeline_binpkgs: "" - osmo-hlr @@ -348,6 +368,7 @@ (IU == "--enable-iu" && WITH_MANUALS == "1") || (IU == "--disable-iu" && WITH_MANUALS == "0") cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e IU="$IU" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -384,6 +405,7 @@ SETARCH_CMD="setarch linux32" ;; esac + docker pull "$DOCKER_IMG" {docker_run_ccache} \ -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \ -e with_vty="$with_vty" \ @@ -414,6 +436,7 @@ {timeout_cmd} ./contrib/jenkins.sh ;; *) + docker pull {docker_img_pysim} {docker_run} \ -e JOB_TYPE="$JOB_TYPE" \ {docker_img_pysim} \ @@ -430,6 +453,7 @@ (IU == "--enable-iu" && WITH_MANUALS == "1") || (IU == "--disable-iu" && WITH_MANUALS == "0") cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e IU="$IU" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -438,7 +462,9 @@ - osmo_ss7: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' - cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_erlang} + {docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh pipeline_binpkgs: "" - osmo-sip-connector @@ -463,6 +489,7 @@ SETARCH_CMD="setarch linux32" ;; esac + docker pull "$DOCKER_IMG" {docker_run_ccache} \ -e INSTR="$INSTR" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -489,7 +516,9 @@ - osmo-opencm3-projects: # bookworm: OS#6859 - cmd: '{docker_run} $USER/debian-bookworm-build {wrapper_cmd} /build/contrib/jenkins.sh' + cmd: | + docker pull {docker_img_bookworm} + {docker_run} {docker_img_bookworm} {wrapper_cmd} /build/contrib/jenkins.sh pipeline_binpkgs: "" - osmo-asf4-dfu: @@ -500,6 +529,7 @@ pipeline_hwtest: true artifacts: "**/sysmoOCTSIM-*.bin" cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e SKIP_FIRMWARE_CLEAN=1 \ {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh @@ -536,6 +566,7 @@ (PFCP == "1" && WITH_MANUALS == "1" && NFTABLES == "1") || (PFCP == "0" && WITH_MANUALS == "0" && NFTABLES == "0") cmd: | + docker pull {docker_img} {docker_run_ccache} \ -e PFCP="$PFCP" \ -e WITH_MANUALS="$WITH_MANUALS" \ @@ -582,6 +613,7 @@ DISTRO="debian:trixie" IMAGE="registry.osmocom.org/osmocom-build/"$(echo "$DISTRO" | tr : -)"-osmo-ttcn3-testenv" + podman pull "$IMAGE" podman run \ --rm \ -v "$PWD:/build" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/44056?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I576745e3536286e678d409d766bfad2f5be7b866 Gerrit-Change-Number: 44056 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 0
0 0
[M] Change in osmo-ci[master]: jobs/update-osmo-ci: don't rebuild docker images
by osmith 11 Nov '26

11 Nov '26
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/44057?usp=email ) Change subject: jobs/update-osmo-ci: don't rebuild docker images ...................................................................... jobs/update-osmo-ci: don't rebuild docker images Instead of rebuilding docker images on each builder daily and whenever there is a change in either osmo-ci or docker-playground, we now only rebuild and upload them on demand with the registry-rebuild-upload jobs, see previous commits. Related: OS#7117 Change-Id: I942e8dbffe5678b8bba74c2e7c36a94e62e6b8ea --- M ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml M jobs/update-osmo-ci-on-slaves.yml D scripts/osmo-ci-docker-rebuild.sh M scripts/update-osmo-ci/update-osmo-ci.sh 4 files changed, 1 insertion(+), 65 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml index a2f2797..26f0236 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml @@ -1,8 +1,6 @@ --- -# this is from the "update-osmo-ci-on-slaves" jenkins job. However, -# we need to initially install osmo-ci and the docker images *before* -# that jenkins job can execute subsequent updates +# This is from the "update-osmo-ci-on-slaves" jenkins job. - name: install osmo-ci build dependencies apt: @@ -25,10 +23,3 @@ git: repo: "https://gerrit.osmocom.org/osmo-gsm-manuals" dest: "/home/{{ jenkins_user }}/osmo-gsm-manuals" - -- name: rebuild osmocom docker images for jenkins build tests - become: yes - become_user: "{{ jenkins_user }}" - shell: ./scripts/osmo-ci-docker-rebuild.sh - args: - chdir: "/home/{{ jenkins_user }}/osmo-ci" diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index f05c21c..2b43873 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -24,12 +24,6 @@ description: | osmo-ci.git branch default: 'master' - - string: - # Used in scripts/common.sh:docker_images_require() - name: OSMO_BRANCH_DOCKER_PLAYGROUND - description: | - docker-playground.git branch - default: 'master' scm: - git: url: https://gerrit.osmocom.org/osmo-ci @@ -60,27 +54,5 @@ - email: recipients: jenkins-notifications(a)lists.osmocom.org -# Trigger from docker-playground.git too -- job: - name: update-osmo-ci-on-slaves-dp - description: | - Trigger <a href="https://jenkins.osmocom.org/jenkins/job/update-osmo-ci-on-slaves/">update-osmo-ci-on-slaves</a> - on changes in docker-playground.git, so it can rebuild docker containers relevant for the jenkins slaves. - scm: - - git: - url: https://gerrit.osmocom.org/docker-playground - git-config-name: 'Jenkins Builder' - git-config-email: 'jenkins(a)osmocom.org' - skip-tag: true - branches: - - 'master' - triggers: - - pollscm: - cron: "H/5 * * * *" - ignore-post-commit-hooks: false - publishers: - - trigger: - project: "update-osmo-ci-on-slaves" - # vim: expandtab tabstop=2 shiftwidth=2 diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh deleted file mode 100755 index 4461e66..0000000 --- a/scripts/osmo-ci-docker-rebuild.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -set -e -x -cd "$(dirname "$0")/.." -. scripts/common.sh - -case "$(arch)" in -x86_64) - # OS#6859: still need bookworm for osmo-opencm3-projects - docker_images_require \ - "debian-bookworm-build" \ - "debian-bookworm-erlang" \ - "debian-trixie-build" - ;; -arm*|aarch64) - # OS#6627: need to run a separate "docker pull" command with platform - docker pull docker.io/arm32v7/debian:trixie --platform="linux/arm/v7" - - export NO_DOCKER_IMAGE_PULL=1 - docker_images_require \ - "debian-bookworm-build-arm" \ - "debian-trixie-build-arm" - ;; -esac diff --git a/scripts/update-osmo-ci/update-osmo-ci.sh b/scripts/update-osmo-ci/update-osmo-ci.sh index 717cd63..e562bc6 100755 --- a/scripts/update-osmo-ci/update-osmo-ci.sh +++ b/scripts/update-osmo-ci/update-osmo-ci.sh @@ -30,7 +30,3 @@ clone_repo osmo-ci clone_repo osmo-gsm-manuals - -if [ `uname` = "Linux" ] && [ "x${OSMO_CI_NO_DOCKER}" != "x1" ]; then - scripts/osmo-ci-docker-rebuild.sh -fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/44057?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I942e8dbffe5678b8bba74c2e7c36a94e62e6b8ea Gerrit-Change-Number: 44057 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 42
  • 43
  • 44
  • 45
  • 46
  • 47
  • 48
  • ...
  • 72
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.