From cb111b21aba1d5881da1a1d3f19754cbd15b3779 Mon Sep 17 00:00:00 2001 From: Stefan Sperling Date: Thu, 26 Jul 2018 17:57:08 +0200 Subject: detect VTY TELNET port connection failures in TTCN3 tests Pass the CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT parameter to the TELNET port by default. This allows tests to make progress into an error handling path if they are started while the osmo-* program they want to connect on VTY is not running. Observed with osmo-ggsn tests, where if the one test runs into a VTY connection failure the subsequent test would get stuck forever in a map() call on the VTY TELNET port. Change-Id: I9acf7793d5d68aec6d087cff254a10d8b673dab1 Related: OS#3149 --- bsc/BSC_Tests.default | 1 + bts/BTS_Tests.default | 1 + ggsn_tests/GGSN_Tests.default | 1 + hlr/HLR_Tests.default | 1 + msc/MSC_Tests.default | 1 + sccp/SCCP_Tests.default | 1 + sgsn/SGSN_Tests.default | 1 + sip/SIP_Tests.default | 1 + 8 files changed, 8 insertions(+) diff --git a/bsc/BSC_Tests.default b/bsc/BSC_Tests.default index c13f7b03..88183591 100644 --- a/bsc/BSC_Tests.default +++ b/bsc/BSC_Tests.default @@ -15,6 +15,7 @@ mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; *.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.BSCVTY.CTRL_READMODE := "buffered" *.BSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.BSCVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.BSCVTY.PROMPT1 := "OsmoBSC> " [MODULE_PARAMETERS] diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default index 502c17fd..f254993a 100644 --- a/bts/BTS_Tests.default +++ b/bts/BTS_Tests.default @@ -12,6 +12,7 @@ mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; *.BTSVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.BTSVTY.CTRL_READMODE := "buffered" *.BTSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.BTSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.BTSVTY.PROMPT1 := "OsmoBTS> " *.PCU.socket_type := "SEQPACKET" diff --git a/ggsn_tests/GGSN_Tests.default b/ggsn_tests/GGSN_Tests.default index ff0cd975..4d52e242 100644 --- a/ggsn_tests/GGSN_Tests.default +++ b/ggsn_tests/GGSN_Tests.default @@ -8,6 +8,7 @@ *.GGSNVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.GGSNVTY.CTRL_READMODE := "buffered" *.GGSNVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.GGSNVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.GGSNVTY.PROMPT1 := "OsmoGGSN> " [MODULE_PARAMETERS] diff --git a/hlr/HLR_Tests.default b/hlr/HLR_Tests.default index f4584792..84d4ff39 100644 --- a/hlr/HLR_Tests.default +++ b/hlr/HLR_Tests.default @@ -9,6 +9,7 @@ mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING; // | DEBUG_ENCDEC; *.VTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.VTY.CTRL_READMODE := "buffered" *.VTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.VTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.VTY.PROMPT1 := "OsmoHLR> " [MODULE_PARAMETERS] diff --git a/msc/MSC_Tests.default b/msc/MSC_Tests.default index bcaae068..a24fa385 100644 --- a/msc/MSC_Tests.default +++ b/msc/MSC_Tests.default @@ -20,6 +20,7 @@ mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; *.MSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.MSCVTY.CTRL_READMODE := "buffered" *.MSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.MSCVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.MSCVTY.PROMPT1 := "OsmoMSC> " diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default index 7d16e5b6..95e0d2fe 100644 --- a/sccp/SCCP_Tests.default +++ b/sccp/SCCP_Tests.default @@ -15,6 +15,7 @@ mtc.FileMask := ERROR | WARNING; *.SCCP_DEMO_USER_VTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.SCCP_DEMO_USER_VTY.CTRL_READMODE := "buffered" *.SCCP_DEMO_USER_VTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.SCCP_DEMO_USER_VTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.SCCP_DEMO_USER_VTY.PROMPT1 := "sccp-demo-user> " [MODULE_PARAMETERS] diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default index bac5fdda..3957e82d 100644 --- a/sgsn/SGSN_Tests.default +++ b/sgsn/SGSN_Tests.default @@ -15,6 +15,7 @@ FileMask := LOG_ALL | TTCN_MATCHING; *.SGSNVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.SGSNVTY.CTRL_READMODE := "buffered" *.SGSNVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.SGSNVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.SGSNVTY.PROMPT1 := "OsmoSGSN> " diff --git a/sip/SIP_Tests.default b/sip/SIP_Tests.default index 2576b332..4434a1a5 100644 --- a/sip/SIP_Tests.default +++ b/sip/SIP_Tests.default @@ -13,6 +13,7 @@ mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; *.SIPVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.SIPVTY.CTRL_READMODE := "buffered" *.SIPVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.SIPVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.SIPVTY.PROMPT1 := "OsmoSIPcon> " *.SIP.local_sip_port := "5060" -- cgit v1.2.3