Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien...
lynxis lazus has submitted this change and it was merged. (
https://gerrit.osmocom.org/10386 )
Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli
f_bssgp_client_llgmm_assign f_process_rau_accept
..
sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli
f_bssgp_client_llgmm_assign f_process_rau_accept
f_process_rau_accept can send the RAU Complete over the correct BSSGP
Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 82c37f2..497e45f 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -461,12 +461,12 @@
deactivate(di);
}
-function f_upd_ptmsi_and_tlli(OCT4 p_tmsi) runs on BSSGP_ConnHdlr {
+function f_upd_ptmsi_and_tlli(OCT4 p_tmsi, integer bssgp_index := 0) runs on
BSSGP_ConnHdlr {
g_pars.p_tmsi := p_tmsi;
/* update TLLI */
g_pars.tlli_old := g_pars.tlli;
g_pars.tlli := g_pars.p_tmsi or4b 'c000'O;
- f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli);
+ f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli,
BSSGP_PROC[bssgp_index]);
}
function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on
BSSGP_ConnHdlr {
@@ -498,7 +498,7 @@
/* T3302, T3319, T3323, T3312_ext, T3324 */
}
-function f_process_rau_accept(PDU_GMM_RoutingAreaUpdateAccept ra) runs on
BSSGP_ConnHdlr {
+function f_process_rau_accept(PDU_GMM_RoutingAreaUpdateAccept ra, integer
bssgp_index := 0) runs on BSSGP_ConnHdlr {
/* mandatory IE */
g_pars.ra := ra.routingAreaId;
if (ispresent(ra.allocatedPTMSI)) {
@@ -506,7 +506,7 @@
setverdict(fail, "unexpected P-TMSI allocation");
mtc.stop;
}
-
f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets);
+
f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets,
bssgp_index);
}
if (ispresent(ra.msIdentity)) {
setverdict(fail, "unexpected TMSI allocation in non-combined
attach");
@@ -867,10 +867,10 @@
}
/* general GPRS DETACH helper */
-function f_detach_mo(BIT3 detach_type, boolean power_off, boolean
expect_purge) runs on BSSGP_ConnHdlr {
+function f_detach_mo(BIT3 detach_type, boolean power_off, boolean
expect_purge, integer bssgp_index := 0) runs on BSSGP_ConnHdlr {
var BssgpDecoded bd;
timer T := 5.0;
- f_send_l3_gmm_llc(ts_GMM_DET_REQ_MO(detach_type, power_off));
+ f_send_l3_gmm_llc(ts_GMM_DET_REQ_MO(detach_type, power_off),
bssgp_index);
if (expect_purge) {
GSUP.receive(tr_GSUP_PURGE_MS_REQ(g_pars.imsi,
OSMO_GSUP_CN_DOMAIN_PS));
GSUP.send(ts_GSUP_PURGE_MS_RES(g_pars.imsi));
@@ -881,7 +881,7 @@
setverdict(fail, "Unexpected GSUP PURGE MS for unregistered
TLLI");
mtc.stop;
}
- [power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) ->
value bd {
+ [power_off]
BSSGP[bssgp_index].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd {
g_pars.ra := omit;
setverdict(fail, "Unexpected ATTACH ACCEPT in no-power-off
DETACH");
mtc.stop;
@@ -890,12 +890,12 @@
[power_off] T.timeout {
setverdict(pass);
}
- [not power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) ->
value bd {
+ [not power_off]
BSSGP[bssgp_index].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd {
g_pars.ra := omit;
setverdict(pass);
/* TODO: check if any PDP contexts are deactivated on network
side? */
}
- [] BSSGP[0].receive { repeat; }
+ [] BSSGP[bssgp_index].receive { repeat; }
}
}
@@ -1857,7 +1857,7 @@
f_send_l3_gmm_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA,
g_pars.ra, false, omit, omit), bssgp);
alt {
[] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd {
-
f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept);
+
f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp);
f_send_l3_gmm_llc(ts_GMM_RAU_COMPL, bssgp);
setverdict(pass);
}
--
To view, visit https://gerrit.osmocom.org/10386
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5
Gerrit-Change-Number: 10386
Gerrit-PatchSet: 4
Gerrit
Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien...
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10386 ) Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 14 Aug 2018 13:27:07 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien...
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10386 to look at the new patch set (#3). Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept .. sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept f_process_rau_accept can send the RAU Complete over the correct BSSGP Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/10386/3 -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien...
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10386 ) Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/10386/2/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/10386/2/sgsn/SGSN_Tests.ttcn@445 PS2, Line 445: bsspb what is the meaning of this variable name? -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 14 Aug 2018 06:55:30 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien...
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10386 to look at the new patch set (#2). Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept .. sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept f_process_rau_accept can send the RAU Complete over the correct BSSGP Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/10386/2 -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien...
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10386 ) Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:17:54 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien...
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/10386
Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli
f_bssgp_client_llgmm_assign f_process_rau_accept
..
sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli
f_bssgp_client_llgmm_assign f_process_rau_accept
f_process_rau_accept can send the RAU Complete over the correct BSSGP
Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/86/10386/1
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 974576f..1ee71b6 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -433,12 +433,12 @@
deactivate(di);
}
-function f_upd_ptmsi_and_tlli(OCT4 p_tmsi) runs on BSSGP_ConnHdlr {
+function f_upd_ptmsi_and_tlli(OCT4 p_tmsi, integer bsspb := 0) runs on
BSSGP_ConnHdlr {
g_pars.p_tmsi := p_tmsi;
/* update TLLI */
g_pars.tlli_old := g_pars.tlli;
g_pars.tlli := g_pars.p_tmsi or4b 'c000'O;
- f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli);
+ f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli,
BSSGP_PROC[bsspb]);
}
function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on
BSSGP_ConnHdlr {
@@ -470,7 +470,7 @@
/* T3302, T3319, T3323, T3312_ext, T3324 */
}
-function f_process_rau_accept(PDU_GMM_RoutingAreaUpdateAccept ra) runs on
BSSGP_ConnHdlr {
+function f_process_rau_accept(PDU_GMM_RoutingAreaUpdateAccept ra, integer
bsspb := 0) runs on BSSGP_ConnHdlr {
/* mandatory IE */
g_pars.ra := ra.routingAreaId;
if (ispresent(ra.allocatedPTMSI)) {
@@ -478,7 +478,7 @@
setverdict(fail, "unexpected P-TMSI allocation");
mtc.stop;
}
-
f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets);
+
f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets,
bsspb);
}
if (ispresent(ra.msIdentity)) {
setverdict(fail, "unexpected TMSI allocation in non-combined
attach");
@@ -839,10 +839,10 @@
}
/* general GPRS DETACH helper */
-function f_detach_mo(BIT3 detach_type, boolean power_off, boolean
expect_purge) runs on BSSGP_ConnHdlr {
+function f_detach_mo(BIT3 detach_type, boolean power_off, boolean
expect_purge, integer bssgp := 0) runs on BSSGP_ConnHdlr {
var BssgpDecoded bd;
timer T := 5.0;
- f_send_llc(ts_GMM_DET_REQ_MO(detach_type, power_off));
+ f_send_llc(ts_GMM_DET_REQ_MO(detach_type, power_off), bssgp);
if (expect_purge) {
GSUP.receive(tr_GSUP_PURGE_MS_REQ(g_pars.imsi,
OSMO_GSUP_CN_DOMAIN_PS));
GSUP.send(ts_GSUP_PURGE_MS_RES(g_pars.imsi));
@@ -853,7 +853,7 @@
setverdict(fail, "Unexpected GSUP PURGE MS for unregistered
TLLI");
mtc.stop;
}
- [power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) ->
value bd {
+ [power_off] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) ->
value bd {
g_pars.ra := omit;
setverdict(fail, "Unexpected ATTACH ACCEPT in no-power-off
DETACH");
mtc.stop;
@@ -862,12 +862,12 @@
[power_off] T.timeout {
setverdict(pass);
}
- [not power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) ->
value bd {
+ [not power_off] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT))
-> value bd {
g_pars.ra := omit;
setverdict(pass);
/* TODO: check if any PDP contexts are deactivated on network
side? */
}
- [] BSSGP[0].receive { repeat; }
+ [] BSSGP[bssgp].receive { repeat; }
}
}
@@ -1829,7 +1829,7 @@
f_send_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra,
false, omit, omit), bssgp);
alt {
[] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd {
-
f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept);
+
f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp);
f_send_llc(ts_GMM_RAU_COMPL, bssgp);
setverdict(pass);
}
--
To view, visit https://gerrit.osmocom.org/10386
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5
Gerrit-Change-Number: 10386
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
