aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDaniel Willmann <dwillmann@sysmocom.de>2020-12-14 16:22:39 +0100
committerDaniel Willmann <dwillmann@sysmocom.de>2020-12-29 16:38:49 +0100
commitef3c9af0f990f0825d5122a1430697f53542eccc (patch)
treeeee237e592afab052db30028b7e05d69cc553b57 /tests
parent5a21f07dff76e10c6c36edd555565e6f1ba943dd (diff)
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
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am14
-rw-r--r--tests/osmo-gbproxy-pool_test-nodes.vty35
-rw-r--r--tests/osmo-gbproxy_test-nodes.vty32
-rw-r--r--tests/osmo-sgsn_test-nodes.vty (renamed from tests/test_nodes.vty)0
4 files changed, 79 insertions, 2 deletions
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
@@ -61,9 +63,17 @@ vty-python-test: $(BUILT_SOURCES)
# 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/test_nodes.vty b/tests/osmo-sgsn_test-nodes.vty
index 109e2ece2..109e2ece2 100644
--- a/tests/test_nodes.vty
+++ b/tests/osmo-sgsn_test-nodes.vty