commit e057146df7b16f34bf7fd59510e692cb9691f85b
author Harald Welte <laforge@gnumonks.org> Wed Feb 14 15:42:14 2018 +0100
committer Harald Welte <laforge@gnumonks.org> Wed Feb 14 18:50:16 2018 +0100
tree 994a425cedb638998fc1b7b8392c7e708870e4a7
parent 261af4b501b063e2ca190b40b8262200f866a98b

re-organize configuration files; add tcpdump integration

Let's make sure we share common configuration between the test
suites and split the config file into a "default" part which is
used (but not copied) in the Docker images, and a "local" part
which is basically those overrides that the user (or docker image)
wants to do from the default.

Change-Id: I3db452e24e5238aa05254d903739c64d202e61db

mgw/MGCP_Test.cfg

diff --git a/mgw/MGCP_Test.cfg b/mgw/MGCP_Test.cfg
index da45761..b936fe1 100644
--- a/mgw/MGCP_Test.cfg
+++ b/mgw/MGCP_Test.cfg
@@ -1,40 +1,39 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./MSC_Tests.default"
+
+# Local configuration below
+
 [LOGGING]
-SourceInfoFormat := Single;
-#FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC;
-#ConsoleMask := ERROR | WARNING | TESTCASE | TTCN_MATCHING | DEBUG_ENCDEC
-FileMask := LOG_ALL | TTCN_MATCHING;
 
 [TESTPORT_PARAMETERS]
-#*.*.udpReuseAddress := "yes";
 
 [MODULE_PARAMETERS]
-mp_local_udp_port := 2727;
-mp_local_ip:= "127.0.0.1";
-mp_remote_udp_port := 2427;
-mp_remote_ip:= "127.0.0.1";
 
 [MAIN_CONTROLLER]
 
 [EXECUTE]
 #MGCP_Test.TC_selftest
-MGCP_Test.TC_crcx
-MGCP_Test.TC_crcx_noprefix
-MGCP_Test.TC_crcx_unsupp_mode
-MGCP_Test.TC_crcx_early_bidir_mode
-MGCP_Test.TC_crcx_unsupp_param
-MGCP_Test.TC_crcx_missing_callid
-MGCP_Test.TC_crcx_missing_mode
-MGCP_Test.TC_crcx_unsupp_packet_intv
-MGCP_Test.TC_crcx_sdp
-MGCP_Test.TC_crcx_wildcarded
-MGCP_Test.TC_crcx_wildcarded_exhaust
-MGCP_Test.TC_mdcx_without_crcx
-MGCP_Test.TC_dlcx_without_crcx
-MGCP_Test.TC_mdcx_wildcarded
-MGCP_Test.TC_dlcx_wildcarded
-MGCP_Test.TC_crcx_and_dlcx_ep_callid_connid
-MGCP_Test.TC_crcx_and_dlcx_ep_callid
-MGCP_Test.TC_crcx_and_dlcx_ep
-MGCP_Test.TC_crcx_and_dlcx_ep_callid_inval
-MGCP_Test.TC_crcx_and_dlcx_ep_callid_connid_inval
-MGCP_Test.TC_crcx_and_dlcx_retrans
+##MGCP_Test.TC_crcx
+#MGCP_Test.TC_crcx_noprefix
+#MGCP_Test.TC_crcx_unsupp_mode
+#MGCP_Test.TC_crcx_early_bidir_mode
+#MGCP_Test.TC_crcx_unsupp_param
+#MGCP_Test.TC_crcx_missing_callid
+#MGCP_Test.TC_crcx_missing_mode
+#MGCP_Test.TC_crcx_unsupp_packet_intv
+#MGCP_Test.TC_crcx_sdp
+#MGCP_Test.TC_crcx_wildcarded
+#MGCP_Test.TC_crcx_wildcarded_exhaust
+#MGCP_Test.TC_mdcx_without_crcx
+#MGCP_Test.TC_dlcx_without_crcx
+#MGCP_Test.TC_mdcx_wildcarded
+#MGCP_Test.TC_dlcx_wildcarded
+#MGCP_Test.TC_crcx_and_dlcx_ep_callid_connid
+#MGCP_Test.TC_crcx_and_dlcx_ep_callid
+#MGCP_Test.TC_crcx_and_dlcx_ep
+#MGCP_Test.TC_crcx_and_dlcx_ep_callid_inval
+#MGCP_Test.TC_crcx_and_dlcx_ep_callid_connid_inval
+#MGCP_Test.TC_crcx_and_dlcx_retrans

mgw/MGCP_Test.default

diff --git a/mgw/MGCP_Test.default b/mgw/MGCP_Test.default
new file mode 100644
index 0000000..c9d6129
--- /dev/null
+++ b/mgw/MGCP_Test.default
@@ -0,0 +1,15 @@
+[LOGGING]
+FileMask := LOG_ALL | TTCN_MATCHING;
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+mp_local_udp_port := 2727;
+mp_local_ip:= "127.0.0.1";
+mp_remote_udp_port := 2427;
+mp_remote_ip:= "127.0.0.1";
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+MGCP_Test.control