osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38527?usp=email )
Change subject: hnbgw: Support testenv ......................................................................
hnbgw: Support testenv
Change-Id: Id2bcc4e13881db01b8e4d9f1738355b8d779fa63 --- M _testenv/testenv/osmo_dev.py A hnbgw/HNBGW_Tests-with-pfcp.cfg M hnbgw/osmo-hnbgw-with-pfcp.cfg M hnbgw/osmo-hnbgw.cfg A hnbgw/testenv_generic.cfg A hnbgw/testenv_with-pfcp.cfg 6 files changed, 87 insertions(+), 11 deletions(-)
Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved
diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 9a10462..51d07a7 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -85,9 +85,12 @@ "default.opts", "ccache.opts", "gtp_linux.opts", + "hnbgw_with_nftables.opts", + "hnbgw_with_pfcp.opts", "iu.opts", "no_dahdi.opts", "no_doxygen.opts", + "no_man_pages.opts", "no_systemd.opts", "werror.opts", os.path.join(testenv.data_dir, "osmo-dev/osmo-bts-trx.opts"), diff --git a/hnbgw/HNBGW_Tests-with-pfcp.cfg b/hnbgw/HNBGW_Tests-with-pfcp.cfg new file mode 100644 index 0000000..7024bb9 --- /dev/null +++ b/hnbgw/HNBGW_Tests-with-pfcp.cfg @@ -0,0 +1,20 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./HNBGW_Tests.default" + +# Local configuration below + + [LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-with-pfcp" + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +HNBGW_Tests.mp_enable_pfcp_tests := true; + +[MAIN_CONTROLLER] + +[EXECUTE] +HNBGW_Tests.control diff --git a/hnbgw/osmo-hnbgw-with-pfcp.cfg b/hnbgw/osmo-hnbgw-with-pfcp.cfg index ffe5e09..c4e1c08 100644 --- a/hnbgw/osmo-hnbgw-with-pfcp.cfg +++ b/hnbgw/osmo-hnbgw-with-pfcp.cfg @@ -2,28 +2,38 @@ ! OsmoHNBGW (1.1.0) configuration saved from vty !! ! +log gsmtap 172.0.0.1 + logging level set-all debug + logging filter all 1 +! log stderr logging filter all 1 logging color 1 logging print category-hex 0 logging print category 1 + logging print level 1 logging print thread-id 0 logging print extended-timestamp 1 - logging print level 1 logging print file basename last logging level set-all debug - logging level ranap info - logging level rua info - logging level lss7 error - logging level lm3ua error - logging level linp error - logging level lpfcp info - logging level lsua notice - logging level lsccp notice ! line vty no login + bind 127.0.0.1 +ctrl + bind 127.0.0.1 ! + +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 127.0.0.1 + remote-port 8125 + flush-period 1 + mtu 1024 + enable + cs7 instance 0 point-code 0.23.5
@@ -65,6 +75,8 @@ local-ip 127.0.0.1 local-port 29169 hnbap-allow-tmsi 1 + # don't spam RANAP RESET messages for up to eight CN links across all tests + timer hnbgw T4 60 pfcp remote-addr 127.0.0.1 local-addr 127.0.0.2 diff --git a/hnbgw/osmo-hnbgw.cfg b/hnbgw/osmo-hnbgw.cfg index 8a9774b..854e4cc 100644 --- a/hnbgw/osmo-hnbgw.cfg +++ b/hnbgw/osmo-hnbgw.cfg @@ -2,18 +2,26 @@ ! OsmoHNBGW (1.1.0) configuration saved from vty !! ! +log gsmtap 172.0.0.1 + logging level set-all debug + logging filter all 1 +! log stderr logging filter all 1 logging color 1 - logging print category-hex 1 + logging print category-hex 0 logging print category 1 + logging print level 1 logging print thread-id 0 logging print extended-timestamp 1 - logging print file 1 + logging print file basename last logging level set-all debug ! line vty no login + bind 127.0.0.1 +ctrl + bind 127.0.0.1 !
stats interval 0 diff --git a/hnbgw/testenv_generic.cfg b/hnbgw/testenv_generic.cfg new file mode 100644 index 0000000..d1daeab --- /dev/null +++ b/hnbgw/testenv_generic.cfg @@ -0,0 +1,16 @@ +[testsuite] +program=HNBGW_Tests +config=HNBGW_Tests.cfg + +[stp] +program=osmo-stp +make=libosmo-sigtran +package=osmo-stp +copy=osmo-stp.cfg + +[hnbgw] +program=osmo-hnbgw +make=osmo-hnbgw +package=osmo-hnbgw +copy=osmo-hnbgw.cfg +vty_port=4261 diff --git a/hnbgw/testenv_with-pfcp.cfg b/hnbgw/testenv_with-pfcp.cfg new file mode 100644 index 0000000..4f19a31 --- /dev/null +++ b/hnbgw/testenv_with-pfcp.cfg @@ -0,0 +1,17 @@ +[testsuite] +program=HNBGW_Tests +config=HNBGW_Tests-with-pfcp.cfg +clean=rename_junit_xml_classname.sh :with-pfcp + +[stp] +program=osmo-stp +make=libosmo-sigtran +package=osmo-stp +copy=osmo-stp.cfg + +[hnbgw] +program=osmo-hnbgw -c osmo-hnbgw-with-pfcp.cfg +make=osmo-hnbgw +package=osmo-hnbgw +copy=osmo-hnbgw-with-pfcp.cfg +vty_port=4261
-
osmith