From ef3c9af0f990f0825d5122a1430697f53542eccc Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Mon, 14 Dec 2020 16:22:39 +0100 Subject: gbproxy: Add SGSN NRI configuration In order to support SGSN pooling we need to configure the various NRI parameters such as the bitlen, NULL NRI, and which NRIs are assigned to which SGSN. Related: OS#4890, OS#4472 Change-Id: Id67592aa7712e5e04e7264b2fb8f26d57eb7e69e --- tests/Makefile.am | 14 ++++++-- tests/osmo-gbproxy-pool_test-nodes.vty | 35 +++++++++++++++++++ tests/osmo-gbproxy_test-nodes.vty | 32 +++++++++++++++++ tests/osmo-sgsn_test-nodes.vty | 64 ++++++++++++++++++++++++++++++++++ tests/test_nodes.vty | 64 ---------------------------------- 5 files changed, 143 insertions(+), 66 deletions(-) create mode 100644 tests/osmo-gbproxy-pool_test-nodes.vty create mode 100644 tests/osmo-gbproxy_test-nodes.vty create mode 100644 tests/osmo-sgsn_test-nodes.vty delete mode 100644 tests/test_nodes.vty (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 4a9449a3d..32ed47258 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,7 +32,9 @@ EXTRA_DIST = \ $(TESTSUITE) \ vty_test_runner.py \ ctrl_test_runner.py \ - test_nodes.vty \ + osmo-sgsn_test-nodes.vty \ + osmo-gbproxy_test-nodes.vty \ + osmo-gbproxy-pool_test-nodes.vty \ $(NULL) TESTSUITE = $(srcdir)/testsuite @@ -60,10 +62,18 @@ vty-python-test: $(BUILT_SOURCES) # pass -u to vty_script_runner.py by doing: # make vty-transcript-test U=-u vty-transcript-test: + osmo_verify_transcript_vty.py -v \ + -n OsmoGbProxy -p 4246 \ + -r "$(top_builddir)/src/gbproxy/osmo-gbproxy -c $(top_srcdir)/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg" \ + $(U) $${T:-$(srcdir)/osmo-gbproxy_test-nodes.vty} + osmo_verify_transcript_vty.py -v \ + -n OsmoGbProxy -p 4246 \ + -r "$(top_builddir)/src/gbproxy/osmo-gbproxy -c $(top_srcdir)/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg" \ + $(U) $${T:-$(srcdir)/osmo-gbproxy-pool_test-nodes.vty} osmo_verify_transcript_vty.py -v \ -n OsmoSGSN -p 4245 \ -r "$(top_builddir)/src/sgsn/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \ - $(U) $${T:-$(srcdir)/*.vty} + $(U) $${T:-$(srcdir)/osmo-sgsn*.vty} rm -f $(builddir)/sms.db $(builddir)/gsn_restart # don't run multiple tests concurrently so that the ports don't conflict diff --git a/tests/osmo-gbproxy-pool_test-nodes.vty b/tests/osmo-gbproxy-pool_test-nodes.vty new file mode 100644 index 000000000..a741e483e --- /dev/null +++ b/tests/osmo-gbproxy-pool_test-nodes.vty @@ -0,0 +1,35 @@ +OsmoGbProxy> enable +OsmoGbProxy# show nri all +sgsn nsei 101 + nri add 1 + nri add 11 +sgsn nsei 102 + nri add 2 + nri add 12 +OsmoGbProxy# configure terminal +OsmoGbProxy(config)# list +... + gbproxy + sgsn nsei <0-65534> + ns +... + +OsmoGbProxy(config)# sgsn nsei 101 +OsmoGbProxy(config-sgsn)# list +... + allow-attach + no allow-attach + nri add <0-32767> [<0-32767>] + nri del <0-32767> [<0-32767>] +... + +OsmoGbProxy(config-sgsn)# exit +OsmoGbProxy(config)# gbproxy + +OsmoGbProxy(config-gbproxy)# list +... + pool bvc-flow-control-ratio <1-100> + nri bitlen <0-15> + nri null add <0-32767> [<0-32767>] + nri null del <0-32767> [<0-32767>] +... diff --git a/tests/osmo-gbproxy_test-nodes.vty b/tests/osmo-gbproxy_test-nodes.vty new file mode 100644 index 000000000..8a47aa075 --- /dev/null +++ b/tests/osmo-gbproxy_test-nodes.vty @@ -0,0 +1,32 @@ +OsmoGbProxy> enable +OsmoGbProxy# show nri all +sgsn nsei 101 + % no NRI mappings +... +OsmoGbProxy# configure terminal +OsmoGbProxy(config)# list +... + gbproxy + sgsn nsei <0-65534> + ns +... + +OsmoGbProxy(config)# sgsn nsei 101 +OsmoGbProxy(config-sgsn)# list +... + allow-attach + no allow-attach + nri add <0-32767> [<0-32767>] + nri del <0-32767> [<0-32767>] +... + +OsmoGbProxy(config-sgsn)# exit +OsmoGbProxy(config)# gbproxy + +OsmoGbProxy(config-gbproxy)# list +... + pool bvc-flow-control-ratio <1-100> + nri bitlen <0-15> + nri null add <0-32767> [<0-32767>] + nri null del <0-32767> [<0-32767>] +... diff --git a/tests/osmo-sgsn_test-nodes.vty b/tests/osmo-sgsn_test-nodes.vty new file mode 100644 index 000000000..109e2ece2 --- /dev/null +++ b/tests/osmo-sgsn_test-nodes.vty @@ -0,0 +1,64 @@ +OsmoSGSN> enable +OsmoSGSN# show timer +T3312 = 600 s Periodic RA Update timer (s) (default: 600 s) +T3313 = 30 s Waiting for paging response timer (s) (default: 30 s) +T3314 = 44 s READY timer. Force to STANDBY on expiry timer (s) (default: 44 s) +T3316 = 44 s AA-Ready timer (s) (default: 44 s) +T3322 = 6 s Detach request -> accept timer (s) (default: 6 s) +T3350 = 6 s Waiting for ATT/RAU/TMSI_COMPL timer (s) (default: 6 s) +T3360 = 6 s Waiting for AUTH/CIPH response timer (s) (default: 6 s) +T3370 = 6 s Waiting for IDENTITY response timer (s) (default: 6 s) +T3385 = 8 s Wait for ACT PDP CTX REQ timer (s) (default: 8 s) +T3386 = 8 s Wait for MODIFY PDP CTX ACK timer (s) (default: 8 s) +T3395 = 8 s Wait for DEACT PDP CTX ACK timer (s) (default: 8 s) +T3397 = 8 s Wait for DEACT AA PDP CTX ACK timer (s) (default: 8 s) +X1001 = 5 s RANAP Release timeout. Wait for RANAP Release Complete.On expiry release Iu connection (s) (default: 5 s) +X3314 = 44 s Iu User inactivity timer. On expiry release Iu connection (s) (default: 44 s) +OsmoSGSN# configure terminal +OsmoSGSN(config)# list +... + sgsn + ctrl +... + ns + bssgp +... + +OsmoSGSN(config)# sgsn +OsmoSGSN(config-sgsn)# list +... + gtp state-dir PATH + gtp local-ip A.B.C.D + ggsn <0-255> remote-ip A.B.C.D + ggsn <0-255> gtp-version (0|1) + ggsn <0-255> echo-interval <1-36000> + ggsn <0-255> no echo-interval + imsi-acl (add|del) IMSI + auth-policy (accept-all|closed|acl-only|remote) + authentication (optional|required) + encryption (GEA0|GEA1|GEA2|GEA3|GEA4) + gsup ipa-name NAME + gsup remote-ip A.B.C.D + gsup remote-port <0-65535> + gsup oap-id <0-65535> + gsup oap-k K + gsup oap-opc OPC + apn APNAME ggsn <0-255> + apn APNAME imsi-prefix IMSIPRE ggsn <0-255> + access-point-name NAME + no access-point-name NAME + cdr filename NAME + no cdr filename + cdr trap + no cdr trap + cdr interval <1-2147483647> + ggsn dynamic + grx-dns-add A.B.C.D + timer [TNNNN] [(<0-2147483647>|default)] + no compression rfc1144 + compression rfc1144 active slots <1-256> + compression rfc1144 passive + no compression v42bis + compression v42bis active direction (ms|sgsn|both) codewords <512-65535> strlen <6-250> + compression v42bis passive +... diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty deleted file mode 100644 index 109e2ece2..000000000 --- a/tests/test_nodes.vty +++ /dev/null @@ -1,64 +0,0 @@ -OsmoSGSN> enable -OsmoSGSN# show timer -T3312 = 600 s Periodic RA Update timer (s) (default: 600 s) -T3313 = 30 s Waiting for paging response timer (s) (default: 30 s) -T3314 = 44 s READY timer. Force to STANDBY on expiry timer (s) (default: 44 s) -T3316 = 44 s AA-Ready timer (s) (default: 44 s) -T3322 = 6 s Detach request -> accept timer (s) (default: 6 s) -T3350 = 6 s Waiting for ATT/RAU/TMSI_COMPL timer (s) (default: 6 s) -T3360 = 6 s Waiting for AUTH/CIPH response timer (s) (default: 6 s) -T3370 = 6 s Waiting for IDENTITY response timer (s) (default: 6 s) -T3385 = 8 s Wait for ACT PDP CTX REQ timer (s) (default: 8 s) -T3386 = 8 s Wait for MODIFY PDP CTX ACK timer (s) (default: 8 s) -T3395 = 8 s Wait for DEACT PDP CTX ACK timer (s) (default: 8 s) -T3397 = 8 s Wait for DEACT AA PDP CTX ACK timer (s) (default: 8 s) -X1001 = 5 s RANAP Release timeout. Wait for RANAP Release Complete.On expiry release Iu connection (s) (default: 5 s) -X3314 = 44 s Iu User inactivity timer. On expiry release Iu connection (s) (default: 44 s) -OsmoSGSN# configure terminal -OsmoSGSN(config)# list -... - sgsn - ctrl -... - ns - bssgp -... - -OsmoSGSN(config)# sgsn -OsmoSGSN(config-sgsn)# list -... - gtp state-dir PATH - gtp local-ip A.B.C.D - ggsn <0-255> remote-ip A.B.C.D - ggsn <0-255> gtp-version (0|1) - ggsn <0-255> echo-interval <1-36000> - ggsn <0-255> no echo-interval - imsi-acl (add|del) IMSI - auth-policy (accept-all|closed|acl-only|remote) - authentication (optional|required) - encryption (GEA0|GEA1|GEA2|GEA3|GEA4) - gsup ipa-name NAME - gsup remote-ip A.B.C.D - gsup remote-port <0-65535> - gsup oap-id <0-65535> - gsup oap-k K - gsup oap-opc OPC - apn APNAME ggsn <0-255> - apn APNAME imsi-prefix IMSIPRE ggsn <0-255> - access-point-name NAME - no access-point-name NAME - cdr filename NAME - no cdr filename - cdr trap - no cdr trap - cdr interval <1-2147483647> - ggsn dynamic - grx-dns-add A.B.C.D - timer [TNNNN] [(<0-2147483647>|default)] - no compression rfc1144 - compression rfc1144 active slots <1-256> - compression rfc1144 passive - no compression v42bis - compression v42bis active direction (ms|sgsn|both) codewords <512-65535> strlen <6-250> - compression v42bis passive -... -- cgit v1.2.3