diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-02-14 21:39:39 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-02-14 21:40:12 +0100 |
| commit | 84a2807822fc47df31b15b232e66e0ff6b4c1e92 (patch) | |
| tree | 26a53b2598c3f0d799915e2bcf8d12ec0dc5b8ea | |
| parent | 7f5825807d53d5444426495ae8ba6ba290b758d0 (diff) | |
ggsn: Switch over to new shared/common configuration file layout
Change-Id: I491819c8bad8efa45cee161ea6f47c3f97941a17
| -rw-r--r-- | ggsn_tests/GGSN_Tests.cfg | 37 | ||||
| -rw-r--r-- | ggsn_tests/GGSN_Tests.default | 16 |
2 files changed, 24 insertions, 29 deletions
diff --git a/ggsn_tests/GGSN_Tests.cfg b/ggsn_tests/GGSN_Tests.cfg index 67fcbd4d..b7c09888 100644 --- a/ggsn_tests/GGSN_Tests.cfg +++ b/ggsn_tests/GGSN_Tests.cfg @@ -1,38 +1,17 @@ -[LOGGING] -SourceInfoFormat := Single; -ConsoleMask := DEBUG | LOG_ALL | MATCHING | DEBUG_TESTPORT +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./GGSN_Tests.default" + +# Local configuration below -LoggerPlugins := { JUnitLogger := "libjunitlogger2" } -#*.JUnitLogger.filename_stem := "MyJunitLogFile" +[LOGGING] *.JUnitLogger.testsuite_name := "osmo-ttcn3-hacks/ggsn_tests" [TESTPORT_PARAMETERS] -*.*.lazy_conn_id_handling := "YES" -system.*.lazy_conn_id_handling := "YES" [MODULE_PARAMETERS] -GGSN_Tests.m_bind_ip_gtpc := "127.0.42.1" -GGSN_Tests.m_bind_ip_gtpu := "127.0.42.1" -GGSN_Tests.m_ggsn_ip_gtpc := "127.0.0.2" -GGSN_Tests.m_ggsn_ip_gtpu := "127.0.0.2" -GGSN_Tests.m_ggsn_ip4_dns1 := "192.168.100.1" -GGSN_Tests.m_ggsn_ip4_dns2 := "8.8.8.8" -GGSN_Tests.m_ggsn_ip6_dns1 := "2001:4860:4860::8888" -GGSN_Tests.m_ggsn_ip6_dns2 := "2001:4860:4860::8844" [EXECUTE] -#GGSN_Tests.TC_dummy -GGSN_Tests.TC_pdp4_act_deact -GGSN_Tests.TC_pdp4_act_deact_ipcp -GGSN_Tests.TC_pdp4_act_deact_pcodns -GGSN_Tests.TC_pdp4_act_deact_gtpu_access -GGSN_Tests.TC_pdp6_clients_interact - -GGSN_Tests.TC_pdp6_act_deact -GGSN_Tests.TC_pdp6_act_deact_pcodns -GGSN_Tests.TC_pdp6_act_deact_icmp6 -GGSN_Tests.TC_pdp6_act_deact_gtpu_access -GGSN_Tests.TC_pdp4_clients_interact - -GGSN_Tests.TC_echo_req_resp diff --git a/ggsn_tests/GGSN_Tests.default b/ggsn_tests/GGSN_Tests.default new file mode 100644 index 00000000..7b9fe697 --- /dev/null +++ b/ggsn_tests/GGSN_Tests.default @@ -0,0 +1,16 @@ +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +GGSN_Tests.m_bind_ip_gtpc := "127.0.42.1" +GGSN_Tests.m_bind_ip_gtpu := "127.0.42.1" +GGSN_Tests.m_ggsn_ip_gtpc := "127.0.0.2" +GGSN_Tests.m_ggsn_ip_gtpu := "127.0.0.2" +GGSN_Tests.m_ggsn_ip4_dns1 := "192.168.100.1" +GGSN_Tests.m_ggsn_ip4_dns2 := "8.8.8.8" +GGSN_Tests.m_ggsn_ip6_dns1 := "2001:4860:4860::8888" +GGSN_Tests.m_ggsn_ip6_dns2 := "2001:4860:4860::8844" + +[EXECUTE] +GGSN_Tests.control |