aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-02-27 20:41:32 +0100
committerHarald Welte <laforge@gnumonks.org>2018-02-27 22:32:54 +0100
commit8da4824ecb2df6a563b4843e8f2a7d3cf2b7e954 (patch)
treec4289b21e27efde712e7e23ef1e714703bd17e58
parent57fe8232db3fc6647596423873ae209f8aa06aba (diff)
bts: Add TELNET/VTY module so we can interact with BTS VTY
-rw-r--r--bts/BTS_Tests.default2
-rw-r--r--bts/BTS_Tests.ttcn12
-rwxr-xr-xbts/gen_links.sh6
-rwxr-xr-xbts/regen_makefile.sh3
4 files changed, 19 insertions, 4 deletions
diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default
index 927d7c47..562088b2 100644
--- a/bts/BTS_Tests.default
+++ b/bts/BTS_Tests.default
@@ -15,7 +15,7 @@ mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC;
*.BTSVTY.PROMPT1 := "OsmoBTS> "
[MODULE_PARAMETERS]
-//Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBTS";
+Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBTS";
[EXECUTE]
BTS_Tests.control
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 45fcb064..261d9691 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -27,6 +27,9 @@ import from MobileL3_RRM_Types all;
import from MobileL3_Types all;
import from L3_Templates all;
+import from Osmocom_VTY_Functions all;
+import from TELNETasp_PortType all;
+
/* The tests assume a BTS with the following timeslot configuration:
* TS0 : Combined CCCH + SDCCH/4
* TS1 .. TS 4: TCH/F
@@ -57,6 +60,8 @@ type component test_CT extends CTRL_Adapter_CT {
port TRXC_CODEC_PT BB_TRXC;
var integer g_bb_trxc_conn_id;
+ port TELNETasp_PT BTSVTY;
+
/* SI configuration */
var SystemInformationConfig si_cfg := {
bcch_extended := false,
@@ -201,11 +206,18 @@ runs on test_CT {
f_rsl_bcch_fill_raw(rsl_si_type, si_enc);
}
+private function f_init_vty(charstring id) runs on test_CT {
+ map(self:BTSVTY, system:BTSVTY);
+ f_vty_set_prompts(BTSVTY);
+ f_vty_transceive(BTSVTY, "enable");
+}
+
/* global init function */
function f_init(charstring id := "BTS-Test") runs on test_CT {
f_init_rsl(id);
RSL_CCHAN.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP});
f_sleep(0.5); /* workaround for OS#3000 */
+ f_init_vty(id);
/* Send SI3 to the BTS, it is needed for various computations */
f_rsl_bcch_fill(RSL_SYSTEM_INFO_3, ts_SI3_default);
diff --git a/bts/gen_links.sh b/bts/gen_links.sh
index 66ffca35..253b757f 100755
--- a/bts/gen_links.sh
+++ b/bts/gen_links.sh
@@ -35,8 +35,12 @@ DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src
FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn"
gen_links $DIR $FILES
+DIR=$BASEDIR/titan.TestPorts.TELNETasp/src
+FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn"
+gen_links $DIR $FILES
+
DIR=../library
-FILES="General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn GSM_SystemInformation.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn "
+FILES="General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_VTY_Functions.ttcn GSM_SystemInformation.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn "
#FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc "
#FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn "
FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp IPA_CodecPort.ttcn RSL_Types.ttcn RSL_Emulation.ttcn "
diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh
index 46cc4eae..9ed5a060 100755
--- a/bts/regen_makefile.sh
+++ b/bts/regen_makefile.sh
@@ -1,7 +1,6 @@
#!/bin/sh
-FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc
-TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TRXC_CodecPort_CtrlFunctDef.cc L1CTL_PortType_CtrlFunctDef.cc"
+FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TRXC_CodecPort_CtrlFunctDef.cc L1CTL_PortType_CtrlFunctDef.cc TELNETasp_PT.cc"
export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL"