pespin has uploaded this change for review.

View Change

hnbgw: Support testenv

Dependency package asciidoc-base is installed due to nftables checking
for a2x presence during configure stage.

Change-Id: Id2bcc4e13881db01b8e4d9f1738355b8d779fa63
---
M _testenv/data/podman/Dockerfile
M _testenv/testenv/osmo_dev.py
A hnbgw/HNBGW_Tests-with-pfcp.cfg
M hnbgw/osmo-hnbgw.cfg
A hnbgw/testenv_generic.cfg
A hnbgw/testenv_with-pfcp.cfg
6 files changed, 65 insertions(+), 2 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/38527/1

diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile
index 6f6c739..5348e2b 100644
--- a/_testenv/data/podman/Dockerfile
+++ b/_testenv/data/podman/Dockerfile
@@ -19,6 +19,7 @@
 		-y \
 		--no-install-recommends \
 		-o Dpkg::Options::="--force-confold" \
+		asciidoc-base \
 		autoconf \
 		automake \
 		bc \
diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py
index 4dd581a..eb541aa 100644
--- a/_testenv/testenv/osmo_dev.py
+++ b/_testenv/testenv/osmo_dev.py
@@ -84,6 +84,8 @@
         "default.opts",
         "ccache.opts",
         "gtp_linux.opts",
+        "hnbgw_with_nftables.opts",
+        "hnbgw_with_pfcp.opts",
         "iu.opts",
         "no_dahdi.opts",
         "no_doxygen.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.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..a86ea92
--- /dev/null
+++ b/hnbgw/testenv_with-pfcp.cfg
@@ -0,0 +1,16 @@
+[testsuite]
+program=HNBGW_Tests
+config=HNBGW_Tests-with-pfcp.cfg
+
+[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

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