Change in osmo-ttcn3-hacks[master]: ns: SNS: ensure all current testcase are only executed with IPACCESS ...

[lynxis lazus]

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


Change subject: ns: SNS: ensure all current testcase are only executed with IPACCESS or RESET_BLOCK dialect
......................................................................

ns: SNS: ensure all current testcase are only executed with IPACCESS or RESET_BLOCK dialect

All current test cases are for those 2 dialect. In preparation
of SNS test cases ensure those testcase have the correct dependency.

Change-Id: Ifda066553eabb0ace4aca12e60797c4950fcc498
---
M ns/NS_Tests.ttcn
1 file changed, 28 insertions(+), 28 deletions(-)



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

diff --git a/ns/NS_Tests.ttcn b/ns/NS_Tests.ttcn
index 59ab765..77b96cd 100644
--- a/ns/NS_Tests.ttcn
+++ b/ns/NS_Tests.ttcn
@@ -456,24 +456,23 @@
 }
 
 control {
-	execute( TC_tx_reset() );
+	if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK or mp_dialect == NS2_DIALECT_IPACCESS) {
+		execute( TC_tx_reset() );
 
-	/* 48.016 7.2 Block procedure */
-	execute( TC_tx_block() );
-	execute( TC_tx_block_by_vty() );
-	execute( TC_tx_block_by_vty_reset() );
-	// execute( TC_block_other_nsvc() ); // reset, unblock, sleep(1), block over another nsvci 
-	/* 48.016 7.2 Unblock procedure */
-	execute( TC_tx_unblock() );
-	execute( TC_tx_unblock_retries() );
-	// execute( TC_rx_unblock_tx_unblock() ); // wait for an rx unblock pdu, send an unblock pdu, expect unblock ack pdu
-	// execute( TC_unblockable() ); // block a NS-VCI via vty, try block procedure
+		/* 48.016 7.2 Block procedure */
+		execute( TC_tx_block() );
+		execute( TC_tx_block_by_vty() );
+		execute( TC_tx_block_by_vty_reset() );
+		// execute( TC_block_other_nsvc() ); // reset, unblock, sleep(1), block over another nsvci
+		/* 48.016 7.2 Unblock procedure */
+		execute( TC_tx_unblock() );
+		execute( TC_tx_unblock_retries() );
+		// execute( TC_rx_unblock_tx_unblock() ); // wait for an rx unblock pdu, send an unblock pdu, expect unblock ack pdu
+		// execute( TC_unblockable() ); // block a NS-VCI via vty, try block procedure
 
-	/* 48.016 7.2.1 Block Abnormal Condition */
-	/* 48.016 7.2.1 Unblock Abnormal Condition */
-
-	/* 48.016 7.3.1 Abnormal Condition */
-	if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK) {
+		/* 48.016 7.2.1 Block Abnormal Condition */
+		/* 48.016 7.2.1 Unblock Abnormal Condition */
+		/* 48.016 7.3.1 Abnormal Condition */
 		execute( TC_reset_wrong_nsei() );
 		execute( TC_reset_wrong_nsvci() );
 		execute( TC_reset_wrong_nsei_nsvci() );
@@ -482,21 +481,22 @@
 		execute( TC_reset_ack_wrong_nsei_nsvci() );
 		execute( TC_reset_retries() );
 		execute( TC_reset_on_block_reset() );
-	}
-	execute( TC_ignore_reset_ack() );
+		execute( TC_ignore_reset_ack() );
 
-	/* 48.016 7.4 Test procedure on frame relay */
-	execute( TC_tx_reset_tx_alive() );
-	execute( TC_tx_reset_rx_alive() );
+		/* 48.016 7.4 Test procedure on frame relay */
+		execute( TC_tx_reset_tx_alive() );
+		execute( TC_tx_reset_rx_alive() );
 
-	/* 48.016 7.4.1 Abnormal Condition */
-	if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK) {
-		// execute( TC_alive_retries_multi() ); // check if alive retries works and block over an alive nsvc
-		execute( TC_alive_retries_single_reset() );
-	} else if (mp_dialect == NS2_DIALECT_IPACCESS) {
-		execute( TC_alive_retries_single_no_resp() );
+		/* 48.016 7.4.1 Abnormal Condition */
+		if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK) {
+			// execute( TC_alive_retries_multi() ); // check if alive retries works and block over an alive nsvc
+			execute( TC_alive_retries_single_reset() );
+		} else if (mp_dialect == NS2_DIALECT_IPACCESS) {
+			execute( TC_alive_retries_single_no_resp() );
+		}
+
+		execute( TC_no_reset_alive_ack() );
 	}
-	execute( TC_no_reset_alive_ack() );
 }
 
 }

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23179
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: Ifda066553eabb0ace4aca12e60797c4950fcc498
Gerrit-Change-Number: 23179
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/20210302/5d655ab9/attachment.htm>