From 4811484a0e11d89afcd8caac058e554f6f0ec0c4 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Wed, 9 Dec 2020 01:01:25 +0100 Subject: gbproxy: change osmo-gbproxy.cfg to support ns2 vty2 All test case (except 3 which fails on jenkins as well) succeed. Change-Id: I1c3fde35cec7fa0adf2bef7659dfc19bf301ffa9 --- gbproxy/osmo-gbproxy.cfg | 13 +++++------- gbproxy/osmo-gbproxy.fr.cfg | 49 ++++++++++++++++++++++++++++----------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg index 350ddf56..52362b04 100644 --- a/gbproxy/osmo-gbproxy.cfg +++ b/gbproxy/osmo-gbproxy.cfg @@ -8,11 +8,11 @@ line vty 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 + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess + nse 101 + nsvc ipa local 127.0.0.1 7777 nsvci 101 timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 @@ -20,6 +20,3 @@ ns timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation udp local-ip 127.0.0.1 - encapsulation udp local-port 23000 - encapsulation framerelay-gre enabled 0 diff --git a/gbproxy/osmo-gbproxy.fr.cfg b/gbproxy/osmo-gbproxy.fr.cfg index efec4187..b3d19d06 100644 --- a/gbproxy/osmo-gbproxy.fr.cfg +++ b/gbproxy/osmo-gbproxy.fr.cfg @@ -8,11 +8,24 @@ line vty no login ! 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 + bind udp local + listen 127.0.0.1 23000 + bind fr hdlcnet1 + fr hdlcnet1 frnet + bind fr hdlcnet2 + fr hdlcnet2 frnet + bind fr hdlcnet3 + fr hdlcnet3 frnet + bind fr hdlcnet4 + fr hdlcnet4 frnet + bind fr hdlcnet5 + fr hdlcnet5 frnet + bind fr hdlcnet6 + fr hdlcnet6 frnet + bind fr hdlcnet7 + fr hdlcnet7 frnet + bind fr hdlcnet8 + fr hdlcnet8 frnet timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 @@ -20,18 +33,18 @@ ns timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation udp local-ip 127.0.0.1 - encapsulation udp local-port 23000 - encapsulation framerelay-gre enabled 0 - - nse 2001 nsvci 1 frnet hdlcnet1 dlci 16 - nse 2001 nsvci 2 frnet hdlcnet2 dlci 17 - nse 2001 nsvci 3 frnet hdlcnet3 dlci 18 - nse 2001 nsvci 4 frnet hdlcnet4 dlci 19 - nse 2002 nsvci 5 frnet hdlcnet5 dlci 20 - nse 2002 nsvci 6 frnet hdlcnet6 dlci 21 - nse 2003 nsvci 7 frnet hdlcnet7 dlci 22 - nse 2003 nsvci 8 frnet hdlcnet8 dlci 23 - + nse 101 + nsvc ipa local 127.0.0.1 7777 nsvci 101 + nse 2001 + nsvc fr hdlcnet1 dlci 16 nsvci 1 + nsvc fr hdlcnet2 dlci 17 nsvci 2 + nsvc fr hdlcnet3 dlci 18 nsvci 3 + nsvc fr hdlcnet4 dlci 19 nsvci 4 + nse 2002 + nsvc fr hdlcnet5 dlci 20 nsvci 5 + nsvc fr hdlcnet6 dlci 21 nsvci 6 + nse 2003 + nsvc fr hdlcnet7 dlci 22 nsvci 7 + nsvc fr hdlcnet8 dlci 23 nsvci 8 gbproxy sgsn nsei 101 -- cgit v1.2.3