gbproxy: Remove test testing NSVCI change

This was overlooked in commit 82182d which already removed lots of
NS-specific code in gbproxy_test.c

From that commit message:
"""
Since NS2 has a different abstraction we mock up the prim send/recv
functions and don't test NS like the old tests did.
"""

Change-Id: Ic1d7e646e633c9fa62812f5005ed10c0108a06f2
Related: SYS#5226

2 files changed, 2 insertions, 255 deletions

diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c
index 76fc000d5..78fa8cbde 100644
--- a/tests/gbproxy/gbproxy_test.c
+++ b/tests/gbproxy/gbproxy_test.c
@@ -1309,7 +1309,7 @@ static void test_gbproxy_ident_changes()
 {
 	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
 	uint16_t bss_nsei[2] = {0x1000, 0x2000};
-	uint16_t bvci[4] = {0x1002, 0x2002, 0x3002, 0x4002};
+	uint16_t bvci[4] = {0x1002, 0x2002, 0x3002};
 
 	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
@@ -1381,45 +1381,6 @@ static void test_gbproxy_ident_changes()
 	send_ns_unitdata(nsi, NULL, bss_nsei[0], bvci[2], (uint8_t *)"", 0);
 	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[2], (uint8_t *)"", 0);
 
-	printf("--- Change NSVCI ---\n\n");
-
-	setup_ns(nsi, bss_nsei[1]);
-
-	printf("--- Setup BVCI 1 ---\n\n");
-
-	setup_bssgp(nsi, bss_nsei[1], bvci[0]);
-	send_bssgp_reset_ack(nsi, SGSN_NSEI, bvci[0]);
-	dump_peers(stdout, 0, 0, &gbcfg);
-
-	printf("--- Setup BVCI 4 ---\n\n");
-
-	setup_bssgp(nsi, bss_nsei[1], bvci[3]);
-	send_bssgp_reset_ack(nsi, SGSN_NSEI, bvci[3]);
-	dump_peers(stdout, 0, 0, &gbcfg);
-
-	printf("--- Send message from BSS 1 to SGSN and back, BVCI 1 ---\n\n");
-
-	send_ns_unitdata(nsi, NULL, bss_nsei[1], bvci[0], (uint8_t *)"", 0);
-	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[0], (uint8_t *)"", 0);
-
-	printf("--- Send message from BSS 1 to SGSN and back, BVCI 2 "
-	       " (should fail) ---\n\n");
-
-	send_ns_unitdata(nsi, NULL, bss_nsei[1], bvci[1], (uint8_t *)"", 0);
-	dump_peers(stdout, 0, 0, &gbcfg);
-	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[1], (uint8_t *)"", 0);
-	dump_peers(stdout, 0, 0, &gbcfg);
-
-	printf("--- Send message from BSS 1 to SGSN and back, BVCI 3 ---\n\n");
-
-	send_ns_unitdata(nsi, NULL, bss_nsei[1], bvci[2], (uint8_t *)"", 0);
-	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[2], (uint8_t *)"", 0);
-
-	printf("--- Send message from BSS 1 to SGSN and back, BVCI 4 ---\n\n");
-
-	send_ns_unitdata(nsi, NULL, bss_nsei[1], bvci[3], (uint8_t *)"", 0);
-	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[3], (uint8_t *)"", 0);
-
 	dump_global(stdout, 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
diff --git a/tests/gbproxy/gbproxy_test.ok b/tests/gbproxy/gbproxy_test.ok
index 6f20f129a..74cedb3c2 100644
--- a/tests/gbproxy/gbproxy_test.ok
+++ b/tests/gbproxy/gbproxy_test.ok
@@ -654,227 +654,13 @@ NS2 UD REQUEST, prim 0, msg length 0, bvci 0x3002
 Message for BSS (NSEI=8192 BVCI=12290):
 [L2]> [L3]> 
 
---- Change NSVCI ---
-
-Setup NS-VC: NSEI 0x2000(8192)
-
-NS2 CALLBACK, prim 2, bvci 0x0000
-
---- Setup BVCI 1 ---
-
-Setup BSSGP: BVCI 0x1002(4098)
-
-PROCESSING BVC_RESET from NSEI 8192
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-Message for SGSN (NSEI=256 BVCI=0):
-[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-PROCESSING BVC_RESET_ACK from NSEI 256
-23 04 82 10 02 
-
-NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
-23 04 82 10 02 
-
-NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
-23 04 82 10 02 
-
-Message for BSS (NSEI=8192 BVCI=0):
-[L2]> [L3]> 23 04 82 10 02 
-
-Peers:
-  NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
---- Setup BVCI 4 ---
-
-Setup BSSGP: BVCI 0x4002(16386)
-
-PROCESSING BVC_RESET from NSEI 8192
-22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
-22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
-22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-Message for SGSN (NSEI=256 BVCI=0):
-[L2]> [L3]> 22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-PROCESSING BVC_RESET_ACK from NSEI 256
-23 04 82 40 02 
-
-NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
-23 04 82 40 02 
-
-NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
-23 04 82 40 02 
-
-Message for BSS (NSEI=8192 BVCI=0):
-[L2]> [L3]> 23 04 82 40 02 
-
-Peers:
-  NSEI 8192, BVCI 16386, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
---- Send message from BSS 1 to SGSN and back, BVCI 1 ---
-
-PROCESSING (null) from NSEI 8192
-
-
-NS2 CALLBACK, prim 0, msg length 0, bvci 0x1002
-
-
-NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1002
-
-
-Message for SGSN (NSEI=256 BVCI=4098):
-[L2]> [L3]> 
-
-PROCESSING (null) from NSEI 256
-
-
-NS2 CALLBACK, prim 0, msg length 0, bvci 0x1002
-
-
-NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1002
-
-
-Message for BSS (NSEI=8192 BVCI=4098):
-[L2]> [L3]> 
-
---- Send message from BSS 1 to SGSN and back, BVCI 2  (should fail) ---
-
-PROCESSING (null) from NSEI 8192
-
-
-NS2 CALLBACK, prim 0, msg length 0, bvci 0x2002
-
-
-NS2 UD REQUEST, prim 0, msg length 0, bvci 0x2002
-
-
-Message for SGSN (NSEI=256 BVCI=8194):
-[L2]> [L3]> 
-
-Peers:
-  NSEI 8192, BVCI 16386, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 2
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
-PROCESSING (null) from NSEI 256
-
-
-NS2 CALLBACK, prim 0, msg length 0, bvci 0x2002
-
-
-NS2 UD REQUEST, prim 0, msg length 0, bvci 0x2002
-
-
-Message for BSS (NSEI=4096 BVCI=8194):
-[L2]> [L3]> 
-
-Peers:
-  NSEI 8192, BVCI 16386, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 2
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
---- Send message from BSS 1 to SGSN and back, BVCI 3 ---
-
-PROCESSING (null) from NSEI 8192
-
-
-NS2 CALLBACK, prim 0, msg length 0, bvci 0x3002
-
-
-NS2 UD REQUEST, prim 0, msg length 0, bvci 0x3002
-
-
-Message for SGSN (NSEI=256 BVCI=12290):
-[L2]> [L3]> 
-
-PROCESSING (null) from NSEI 256
-
-
-NS2 CALLBACK, prim 0, msg length 0, bvci 0x3002
-
-
-NS2 UD REQUEST, prim 0, msg length 0, bvci 0x3002
-
-
-Message for BSS (NSEI=8192 BVCI=12290):
-[L2]> [L3]> 
-
---- Send message from BSS 1 to SGSN and back, BVCI 4 ---
-
-PROCESSING (null) from NSEI 8192
-
-
-NS2 CALLBACK, prim 0, msg length 0, bvci 0x4002
-
-
-NS2 UD REQUEST, prim 0, msg length 0, bvci 0x4002
-
-
-Message for SGSN (NSEI=256 BVCI=16386):
-[L2]> [L3]> 
-
-PROCESSING (null) from NSEI 256
-
-
-NS2 CALLBACK, prim 0, msg length 0, bvci 0x4002
-
-
-NS2 UD REQUEST, prim 0, msg length 0, bvci 0x4002
-
-
-Message for BSS (NSEI=8192 BVCI=16386):
-[L2]> [L3]> 
-
 Gbproxy global:
 Peers:
-  NSEI 8192, BVCI 16386, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
   NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
     TLLI-Cache: 0
   NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 2
+    NSEI mismatch                   : 1
     TLLI-Cache: 0
   NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1