summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-11-16 20:06:49 +0100
committerHarald Welte <laforge@osmocom.org>2020-11-18 15:21:32 +0100
commit131db2ade005c342c4589dc967b105c620ec4199 (patch)
tree956ffd93d2b9de8affaee0e2ab0c113dfc2f8b1e
parent4de626e9024d41b58d8d945760701301a8fcfc97 (diff)
WIP: LOCAL HACKSlaforge/nsvcg
-rw-r--r--fr-net/FRNET_Tests.cfg84
-rw-r--r--fr/FR_Tests.cfg83
-rw-r--r--gbproxy/GBProxy_Tests.ttcn1
-rw-r--r--gbproxy/osmo-gbproxy.cfg17
-rw-r--r--library/BSSGP_Emulation.ttcnpp2
-rw-r--r--library/Osmocom_Gb_Types.ttcn2
6 files changed, 179 insertions, 10 deletions
diff --git a/fr-net/FRNET_Tests.cfg b/fr-net/FRNET_Tests.cfg
index dedd828..a90914b 100644
--- a/fr-net/FRNET_Tests.cfg
+++ b/fr-net/FRNET_Tests.cfg
@@ -7,6 +7,90 @@
[LOGGING]
[MODULE_PARAMETERS]
+FRNET_Tests.mp_num_bvc := 50;
+FRNET_Tests.mp_nsconfig := {
+ {
+ nsei := 1,
+ role_sgsn := true,
+ handle_sns := false,
+ nsvc := {
+ {
+ provider := {
+ fr := {
+ netdev := "hdlcnet1",
+ dlci := 16
+ }
+ },
+ nsvci := 1
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlcnet2",
+ dlci := 17
+ }
+ },
+ nsvci := 2
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlcnet3",
+ dlci := 18
+ }
+ },
+ nsvci := 3
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlcnet4",
+ dlci := 19
+ }
+ },
+ nsvci := 4
+ }
+ }
+ }, {
+ nsei := 2,
+ role_sgsn := true,
+ handle_sns := false,
+ nsvc := {
+ {
+ provider := {
+ fr := {
+ netdev := "hdlcnet5",
+ dlci := 24
+ }
+ },
+ nsvci := 9
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlcnet6",
+ dlci := 25
+ }
+ },
+ nsvci := 10
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlcnet7",
+ dlci := 26
+ }
+ },
+ nsvci := 11
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlcnet8",
+ dlci := 27
+ }
+ },
+ nsvci := 12
+ }
+ }
+ }
+};
+
+
[TESTPORT_PARAMETERS]
diff --git a/fr/FR_Tests.cfg b/fr/FR_Tests.cfg
index 9a97c3a..e9d0701 100644
--- a/fr/FR_Tests.cfg
+++ b/fr/FR_Tests.cfg
@@ -7,6 +7,89 @@
[LOGGING]
[MODULE_PARAMETERS]
+FR_Tests.mp_num_bvc := 20;
+FR_Tests.mp_num_ue_in_bvc := 5;
+FR_Tests.mp_nsconfig := {
+ {
+ nsei := 1,
+ role_sgsn := false,
+ handle_sns := false,
+ nsvc := {
+ {
+ provider := {
+ fr := {
+ netdev := "hdlc1",
+ dlci := 16
+ }
+ },
+ nsvci := 1
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlc2",
+ dlci := 17
+ }
+ },
+ nsvci := 2
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlc3",
+ dlci := 18
+ }
+ },
+ nsvci := 3
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlc4",
+ dlci := 19
+ }
+ },
+ nsvci := 4
+ }
+ }
+ }, {
+ nsei := 2,
+ role_sgsn := false,
+ handle_sns := false,
+ nsvc := {
+ {
+ provider := {
+ fr := {
+ netdev := "hdlc5",
+ dlci := 24
+ }
+ },
+ nsvci := 9
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlc6",
+ dlci := 25
+ }
+ },
+ nsvci := 10
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlc7",
+ dlci := 26
+ }
+ },
+ nsvci := 11
+ }, {
+ provider := {
+ fr := {
+ netdev := "hdlc8",
+ dlci := 27
+ }
+ },
+ nsvci := 12
+ }
+ }
+ }
+};
[TESTPORT_PARAMETERS]
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 1fc041a..a70a09b 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -831,7 +831,6 @@ type component test_CT_NS extends test_CT {
-
control {
execute( TC_BVC_bringup() );
execute( TC_ul_unitdata() );
diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg
index 350ddf5..2ee92a5 100644
--- a/gbproxy/osmo-gbproxy.cfg
+++ b/gbproxy/osmo-gbproxy.cfg
@@ -2,17 +2,17 @@
! Osmocom Gb Proxy (0.9.0.404-6463) configuration saved from vty
!!
!
+log stderr
+ logging level lns debug
line vty
no login
!
-gbproxy
- sgsn nsei 101
ns
- nse 101 nsvci 101
- nse 101 remote-role sgsn
- nse 101 encapsulation udp
- nse 101 remote-ip 127.0.0.1
- nse 101 remote-port 7777
+ !nse 101 nsvci 101
+ nse 101 nsvci 101 remote-role sgsn
+ nse 101 nsvci 101 encapsulation udp
+ nse 101 nsvci 101 remote-ip 127.0.0.1
+ nse 101 nsvci 101 remote-port 7777
timer tns-block 3
timer tns-block-retries 3
timer tns-reset 3
@@ -23,3 +23,6 @@ ns
encapsulation udp local-ip 127.0.0.1
encapsulation udp local-port 23000
encapsulation framerelay-gre enabled 0
+
+gbproxy
+ sgsn nsei 101
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index 898b38d..c45fd75 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -242,7 +242,7 @@ type component BSSGP_CT {
/* port to per-BVC components */
port BSSGP_BVC_SP_PT BVC;
/* per-BVC state table */
- var BvcEntity BvcTable[16];
+ var BvcEntity BvcTable[64];
};
/* one element in the per-BVC state table */
diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index 3ba3fca..6a9a7b1 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -847,7 +847,7 @@ octetstring sdu) := {
}
template LLC_PDU ts_BSSGP_LLC_PDU(octetstring pdu) := {
- iEI := '0D'O,
+ iEI := '0E'O,
ext := '1'B,
lengthIndicator := f_bssgp_length_ind(lengthof(pdu)),
lLC_PDU := pdu