Change in osmo-ttcn3-hacks[master]: Make f_{block, unblock}_ptp_bvc_from_pcu handle multiple SGSNs

laforge gerrit-no-reply at lists.osmocom.org
Thu Apr 1 13:52:46 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23548 )

Change subject: Make f_{block,unblock}_ptp_bvc_from_pcu handle multiple SGSNs
......................................................................

Make f_{block,unblock}_ptp_bvc_from_pcu handle multiple SGSNs

Those tests predated SGSN pooling support and needed to update
their assumptions to also cover other SGSNs in the pool.

We could come up with more complex, auto-scaling mechanisms to handle
different numbers of SGSNs, but that would make the code quite
unreadable, as it means we cannot use interleave but have to dynamically
activate altsteps for counting.  I went for the simpler approach
instead.

Change-Id: I8c3ec4e00b78cff40ac72bc857161fa7abc352b0
Related: OS#4968
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 9 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 5ae153f..91ccbb0 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -325,6 +325,9 @@
 type record of NSConfiguration NSConfigurations;
 type record of BssgpCellId BssgpCellIds;
 
+/* you cannot simply change this to any larger number of SGSNs and expect all test
+ * cases to work.  This would have overly complicated the code.  Check below for
+ * tests that use interleave on SGSN_MGMT.receive() for each SGSN NSEI for example */
 const integer NUM_SGSN := 2;
 
 type component test_CT {
@@ -2399,7 +2402,9 @@
 	/* expect state on both PCU and SGSN side to change */
 	interleave {
 	[] PCU_MGMT.receive(tr_BssgpStsInd(nsei_pcu, bvc_cfg.bvci, BVC_S_BLOCKED)) from bvc_ct;
-	[] SGSN_MGMT.receive(tr_BssgpStsInd(*, bvc_cfg.bvci, BVC_S_BLOCKED));
+	[] SGSN_MGMT.receive(tr_BssgpStsInd(mp_nsconfig_sgsn[0].nsei, bvc_cfg.bvci, BVC_S_BLOCKED));
+	[] SGSN_MGMT.receive(tr_BssgpStsInd(mp_nsconfig_sgsn[1].nsei, bvc_cfg.bvci, BVC_S_BLOCKED));
+	/* Doesn't auto-scale with NUM_SGSN */
 	}
 	setverdict(pass);
 }
@@ -2425,7 +2430,9 @@
 	/* expect state on both PCU and SGSN side to change */
 	interleave {
 	[] PCU_MGMT.receive(tr_BssgpStsInd(nsei_pcu, bvc_cfg.bvci, BVC_S_UNBLOCKED)) from bvc_ct;
-	[] SGSN_MGMT.receive(tr_BssgpStsInd(*, bvc_cfg.bvci, BVC_S_UNBLOCKED));
+	[] SGSN_MGMT.receive(tr_BssgpStsInd(mp_nsconfig_sgsn[0].nsei, bvc_cfg.bvci, BVC_S_UNBLOCKED));
+	[] SGSN_MGMT.receive(tr_BssgpStsInd(mp_nsconfig_sgsn[1].nsei, bvc_cfg.bvci, BVC_S_UNBLOCKED));
+	/* Doesn't auto-scale with NUM_SGSN */
 	}
 	setverdict(pass);
 }

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23548
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I8c3ec4e00b78cff40ac72bc857161fa7abc352b0
Gerrit-Change-Number: 23548
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210401/30474d4f/attachment.htm>


More information about the gerrit-log mailing list