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
This commit is contained in:
Alexander Couzens 2021-02-27 20:01:16 +01:00
parent 76de166a56
commit e48d355650
1 changed files with 28 additions and 28 deletions

View File

@ -456,24 +456,23 @@ testcase TC_alive_retries_single_no_resp() runs on RAW_Test_CT {
}
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 @@ control {
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() );
}
}