Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001 )


Change subject: PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE
......................................................................

PCU_Tests_NS: allow an UNBLOCK message to arrive before ALIVE

The ALIVE PDU does not have to be sent before an UNBLOCK message.
Ignore UNBLOCK messages in cases a single ALIVE is expected.

According to TS 48.016 v5.2.0, 7.4:
"Upon successful completion of an NS-VC reset procedure,
a BSS (or SGSN) shall start timer Tns-test, then [..]"
The ALIVE should arive Tns-test after the reset procedure (typ. 1s-60s).

Change-Id: I11d77b7477981998082967e5123b61636af2b980
---
M pcu/PCU_Tests_NS.ttcn
1 file changed, 13 insertions(+), 11 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/20001/1

diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn
index b1c8f38..b6ed723 100644
--- a/pcu/PCU_Tests_NS.ttcn
+++ b/pcu/PCU_Tests_NS.ttcn
@@ -295,9 +295,11 @@
 	/* Expect inbound NS-RESET procedure */
 	as_rx_ns_reset_ack(oneshot := true);
 
+	alt {
 	/* wait for one ALIVE cycle, then ACK any further ALIVE in the background */
-	as_rx_alive_tx_ack(oneshot := true);
-	setverdict(pass);
+	[] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { setverdict(pass); };
+	[] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; }
+	}
 }
 
 /* Test for NS-RESET after NS-ALIVE timeout */
@@ -309,12 +311,16 @@
 	as_rx_ns_reset_ack(oneshot := true);
 
 	/* wait for at least one NS-ALIVE */
-	NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE));
+	alt {
+	[] as_rx_alive_tx_ack(oneshot := true) { };
+	[] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; }
+	}
 
 	/* wait for NS-RESET to re-appear, ignoring any NS-ALIVE until then */
 	alt {
 	[] as_rx_ns_reset_ack(oneshot := true) { setverdict(pass); }
 	[] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; }
+	[] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; }
 	}
 }
 
@@ -326,8 +332,7 @@
 	/* Expect inbound NS-RESET procedure */
 	as_rx_ns_reset_ack(oneshot := true);
 
-	/* wait for one ALIVE cycle, then ACK any further ALIVE in the background */
-	as_rx_alive_tx_ack(oneshot := true);
+	/* keep it alive */
 	activate(as_rx_alive_tx_ack());
 
 	as_rx_ns_unblock_ack(oneshot := true);
@@ -342,8 +347,7 @@
 	/* Expect inbound NS-RESET procedure */
 	as_rx_ns_reset_ack(oneshot := true);
 
-	/* wait for one ALIVE cycle, then ACK any further ALIVE in the background */
-	as_rx_alive_tx_ack(oneshot := true);
+	/* keep it alive */
 	activate(as_rx_alive_tx_ack());
 
 	/* wait for first NS-UNBLOCK, don't respond */
@@ -362,8 +366,7 @@
 	/* Expect inbound NS-RESET procedure */
 	as_rx_ns_reset_ack(oneshot := true);
 
-	/* wait for one ALIVE cycle, then ACK any further ALIVE in the background */
-	as_rx_alive_tx_ack(oneshot := true);
+	/* keep it alive */
 	activate(as_rx_alive_tx_ack());
 
 	as_rx_ns_unblock_ack(oneshot := true);
@@ -389,8 +392,7 @@
 	/* Expect inbound NS-RESET procedure */
 	as_rx_ns_reset_ack(oneshot := true);
 
-	/* wait for one ALIVE cycle, then ACK any further ALIVE in the background */
-	as_rx_alive_tx_ack(oneshot := true);
+	/* keep it alive */
 	activate(as_rx_alive_tx_ack());
 
 	as_rx_ns_unblock_ack(oneshot := true);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20001
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: I11d77b7477981998082967e5123b61636af2b980
Gerrit-Change-Number: 20001
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200906/2cb2dd38/attachment.htm>