osmith submitted this change.

View Change

Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve
gbproxy: sync configs with docker-playground

Change-Id: Ibef7e870c5c90d1cc861c89904950b1ac68dc9b2
---
M gbproxy/GBProxy_Tests.cfg
M gbproxy/osmo-gbproxy.cfg
2 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/gbproxy/GBProxy_Tests.cfg b/gbproxy/GBProxy_Tests.cfg
index d610e40..40af557 100644
--- a/gbproxy/GBProxy_Tests.cfg
+++ b/gbproxy/GBProxy_Tests.cfg
@@ -12,13 +12,89 @@
*.GBPVTY.CTRL_HOSTNAME := "127.0.0.1"

[MODULE_PARAMETERS]
+GBProxy_Tests.mp_gbproxy_ip := "127.0.0.1"
GBProxy_Tests.mp_nsconfig_sgsn := {
{
- handle_sns := true
+ handle_sns := true,
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ local_ip := "127.0.0.10",
+ remote_ip := "127.0.0.1"
+ }
+ }
+ }, {
+ provider := {
+ ip := {
+ local_ip := "127.0.0.10",
+ remote_ip := "127.0.0.1"
+ }
+ }
+ }
+ }
}, {
- handle_sns := true
+ handle_sns := true,
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ local_ip := "127.0.0.10",
+ remote_ip := "127.0.0.1"
+ }
+ }
+ }, {
+ provider := {
+ ip := {
+ local_ip := "127.0.0.10",
+ remote_ip := "127.0.0.1"
+ }
+ }
+ }
+ }
}
-
+}
+GBProxy_Tests.mp_nsconfig_pcu := {
+ {
+ handle_sns := true,
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ local_ip := "127.0.0.10",
+ remote_udp_port := 24000,
+ remote_ip := "127.0.0.1"
+ }
+ }
+ }
+ }
+ }, {
+ handle_sns := true,
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ local_ip := "127.0.0.10",
+ remote_udp_port := 24000,
+ remote_ip := "127.0.0.1"
+ }
+ }
+ }
+ }
+ }, {
+ handle_sns := true,
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ local_ip := "127.0.0.10",
+ remote_udp_port := 24000,
+ remote_ip := "127.0.0.1"
+ }
+ }
+ }
+ }
+ }
}

[MAIN_CONTROLLER]
diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg
index 0fc9fc2..ee888f4 100644
--- a/gbproxy/osmo-gbproxy.cfg
+++ b/gbproxy/osmo-gbproxy.cfg
@@ -18,6 +18,9 @@
logging level gprs debug
line vty
no login
+ bind 127.0.0.1
+ctrl
+ bind 127.0.0.1
!
gbproxy
nri bitlen 5
@@ -30,15 +33,14 @@
ns
bind udp sgsn-side
listen 127.0.0.1 23000
- accept-ipaccess
nse 101
ip-sns-bind sgsn-side
ip-sns-remote 127.0.0.10 7777
nse 102
ip-sns-bind sgsn-side
- ip-sns-remote 127.0.0.11 8888
+ ip-sns-remote 127.0.0.10 8888
bind udp bss-side
- listen 127.0.0.2 23000
+ listen 127.0.0.1 24000
accept-dynamic-ip-sns
ip-sns-default bind bss-side
timer tns-block 3

To view, visit change 40239. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibef7e870c5c90d1cc861c89904950b1ac68dc9b2
Gerrit-Change-Number: 40239
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>