fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37110?usp=email ) Change subject: library: cosmetic: fix formatting in Osmocom_VTY_Functions.ttcn ...................................................................... library: cosmetic: fix formatting in Osmocom_VTY_Functions.ttcn Change-Id: I14fa55314f7351997d1cf1c940cc8684bee2497f --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 129 insertions(+), 120 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index b982a8f..dc87131 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -11,148 +11,148 @@ module Osmocom_VTY_Functions { - import from Misc_Helpers all; - import from TELNETasp_PortType all; - import from Osmocom_Types all; - import from TCCConversion_Functions all; - import from Socket_API_Definitions all; +import from Misc_Helpers all; +import from TELNETasp_PortType all; +import from Osmocom_Types all; +import from TCCConversion_Functions all; +import from Socket_API_Definitions all; - modulepar { - charstring mp_prompt_prefix := "OpenBSC"; - float mp_prompt_timeout := 2.0; - } +modulepar { + charstring mp_prompt_prefix := "OpenBSC"; + float mp_prompt_timeout := 2.0; +} - const charstring VTY_VIEW_SUFFIX := "> "; - const charstring VTY_ENABLE_SUFFIX := "# "; - const charstring VTY_CFG_SUFFIX := "(*)"; +const charstring VTY_VIEW_SUFFIX := "> "; +const charstring VTY_ENABLE_SUFFIX := "# "; +const charstring VTY_CFG_SUFFIX := "(*)"; - template charstring t_vty_unknown := pattern "*% Unknown command."; +template charstring t_vty_unknown := pattern "*% Unknown command."; - /* configure prompts in TELNETasp module */ - function f_vty_set_prompts(TELNETasp_PT pt, charstring prompt_prefix := mp_prompt_prefix) { - var ASP_TelnetDynamicConfig vty_prompt[3] := { - { - prompt := { - id := 1, - prompt := prompt_prefix & VTY_VIEW_SUFFIX, - has_wildcards := false - } - }, { - prompt := { - id := 2, - prompt := prompt_prefix & VTY_ENABLE_SUFFIX, - has_wildcards := false - } - }, { - prompt := { - id := 3, - prompt := prompt_prefix & VTY_CFG_SUFFIX, - has_wildcards := true - } +/* configure prompts in TELNETasp module */ +function f_vty_set_prompts(TELNETasp_PT pt, charstring prompt_prefix := mp_prompt_prefix) { + var ASP_TelnetDynamicConfig vty_prompt[3] := { + { + prompt := { + id := 1, + prompt := prompt_prefix & VTY_VIEW_SUFFIX, + has_wildcards := false } - }; - - /* set some configuration that isn't possible to express - * in the config file due to syntactic restrictions (Who invents config - * files that don't permit regular expressions? */ - for (var integer i := 0; i < sizeof(vty_prompt); i:= i + 1) { - pt.send(vty_prompt[i]); - } - } - - /* wait for any of the permitted prompts; buffer + return all intermediate output */ - function f_vty_wait_for_prompt(TELNETasp_PT pt, boolean strict := true, charstring log_label := "(?)") - return charstring { - var charstring rx, buf := ""; - var integer fd; - timer T; - - T.start(mp_prompt_timeout); - alt { - [] pt.receive(pattern "[\w-]+" & VTY_VIEW_SUFFIX) { }; - [] pt.receive(pattern "[\w-]+\# ") { }; - [] pt.receive(pattern "[\w-]+\(*\)\# ") { }; - [] pt.receive(t_vty_unknown) -> value rx { - if (strict) { - setverdict(fail, "VTY: Unknown Command: " & log_label); - mtc.stop; - } else { - log("VTY: Unknown Command (ignored): " & log_label); - buf := buf & rx; - repeat; + }, { + prompt := { + id := 2, + prompt := prompt_prefix & VTY_ENABLE_SUFFIX, + has_wildcards := false } - }; - [] pt.receive(charstring:?) -> value rx { buf := buf & rx; repeat }; - [] pt.receive(integer:?) -> value fd { - if (fd == -1) { - setverdict(fail, "VTY Telnet Connection Failure: " & log_label); - mtc.stop; - } else { - repeat; /* telnet connection succeeded */ + }, { + prompt := { + id := 3, + prompt := prompt_prefix & VTY_CFG_SUFFIX, + has_wildcards := true } } - [] T.timeout { - setverdict(fail, "VTY Timeout for prompt: " & log_label); + }; + + /* set some configuration that isn't possible to express + * in the config file due to syntactic restrictions (Who invents config + * files that don't permit regular expressions? */ + for (var integer i := 0; i < sizeof(vty_prompt); i:= i + 1) { + pt.send(vty_prompt[i]); + } +} + +/* wait for any of the permitted prompts; buffer + return all intermediate output */ +function f_vty_wait_for_prompt(TELNETasp_PT pt, boolean strict := true, charstring log_label := "(?)") +return charstring { + var charstring rx, buf := ""; + var integer fd; + timer T; + + T.start(mp_prompt_timeout); + alt { + [] pt.receive(pattern "[\w-]+" & VTY_VIEW_SUFFIX) { }; + [] pt.receive(pattern "[\w-]+\# ") { }; + [] pt.receive(pattern "[\w-]+\(*\)\# ") { }; + [] pt.receive(t_vty_unknown) -> value rx { + if (strict) { + setverdict(fail, "VTY: Unknown Command: " & log_label); mtc.stop; - }; + } else { + log("VTY: Unknown Command (ignored): " & log_label); + buf := buf & rx; + repeat; } - T.stop; - return buf; + }; + [] pt.receive(charstring:?) -> value rx { buf := buf & rx; repeat }; + [] pt.receive(integer:?) -> value fd { + if (fd == -1) { + setverdict(fail, "VTY Telnet Connection Failure: " & log_label); + mtc.stop; + } else { + repeat; /* telnet connection succeeded */ + } } - - /* send a VTY command and obtain response until prompt is received */ - function f_vty_transceive_ret(TELNETasp_PT pt, charstring tx, boolean strict := true) return charstring { - pt.send(tx); - return f_vty_wait_for_prompt(pt, strict, tx); + [] T.timeout { + setverdict(fail, "VTY Timeout for prompt: " & log_label); + mtc.stop; + }; } + T.stop; + return buf; +} - /* send a VTY command and obtain response until prompt is received */ - function f_vty_transceive(TELNETasp_PT pt, charstring tx, boolean strict := true) { - var charstring unused := f_vty_transceive_ret(pt, tx, strict); - } +/* send a VTY command and obtain response until prompt is received */ +function f_vty_transceive_ret(TELNETasp_PT pt, charstring tx, boolean strict := true) return charstring { + pt.send(tx); + return f_vty_wait_for_prompt(pt, strict, tx); +} - type integer BtsNr (0..255); - type integer BtsTrxNr (0..255); - type integer BtsTimeslotNr (0..7); - type integer MscNr (0..255); - type integer Cs7Nr (0..255); +/* send a VTY command and obtain response until prompt is received */ +function f_vty_transceive(TELNETasp_PT pt, charstring tx, boolean strict := true) { + var charstring unused := f_vty_transceive_ret(pt, tx, strict); +} - type charstring BtsGprsMode ("none", "gprs", "egrps"); +type integer BtsNr (0..255); +type integer BtsTrxNr (0..255); +type integer BtsTimeslotNr (0..7); +type integer MscNr (0..255); +type integer Cs7Nr (0..255); - /* enter the'confiugration' mode of the VTY */ - function f_vty_enter_config(TELNETasp_PT pt) { - f_vty_transceive(pt, "configure terminal") - } +type charstring BtsGprsMode ("none", "gprs", "egrps"); - function f_vty_enter_cfg_network(TELNETasp_PT pt) { - f_vty_enter_config(pt); - f_vty_transceive(pt, "network") - } +/* enter the'confiugration' mode of the VTY */ +function f_vty_enter_config(TELNETasp_PT pt) { + f_vty_transceive(pt, "configure terminal") +} - function f_vty_enter_cfg_bts(TELNETasp_PT pt, BtsNr bts := 0) { - f_vty_enter_cfg_network(pt); - f_vty_transceive(pt, "bts " & int2str(bts)); - } +function f_vty_enter_cfg_network(TELNETasp_PT pt) { + f_vty_enter_config(pt); + f_vty_transceive(pt, "network") +} - function f_vty_enter_cfg_trx(TELNETasp_PT pt, BtsNr bts := 0, BtsTrxNr trx := 0) { - f_vty_enter_cfg_bts(pt, bts); - f_vty_transceive(pt, "trx " & int2str(trx)); - } +function f_vty_enter_cfg_bts(TELNETasp_PT pt, BtsNr bts := 0) { + f_vty_enter_cfg_network(pt); + f_vty_transceive(pt, "bts " & int2str(bts)); +} - function f_vty_enter_cfg_ts(TELNETasp_PT pt, BtsNr bts := 0, BtsTrxNr trx := 0, BtsTimeslotNr ts) { - f_vty_enter_cfg_trx(pt, bts, trx); - f_vty_transceive(pt, "timeslot " & int2str(ts)); - } +function f_vty_enter_cfg_trx(TELNETasp_PT pt, BtsNr bts := 0, BtsTrxNr trx := 0) { + f_vty_enter_cfg_bts(pt, bts); + f_vty_transceive(pt, "trx " & int2str(trx)); +} - function f_vty_enter_cfg_msc(TELNETasp_PT pt, MscNr msc := 0) { - f_vty_enter_config(pt); - f_vty_transceive(pt, "msc " & int2str(msc)); - } +function f_vty_enter_cfg_ts(TELNETasp_PT pt, BtsNr bts := 0, BtsTrxNr trx := 0, BtsTimeslotNr ts) { + f_vty_enter_cfg_trx(pt, bts, trx); + f_vty_transceive(pt, "timeslot " & int2str(ts)); +} - function f_vty_enter_cfg_cs7_inst(TELNETasp_PT pt, Cs7Nr cs7_inst := 0) { - f_vty_enter_config(pt); - f_vty_transceive(pt, "cs7 instance " & int2str(cs7_inst)); - } +function f_vty_enter_cfg_msc(TELNETasp_PT pt, MscNr msc := 0) { + f_vty_enter_config(pt); + f_vty_transceive(pt, "msc " & int2str(msc)); +} + +function f_vty_enter_cfg_cs7_inst(TELNETasp_PT pt, Cs7Nr cs7_inst := 0) { + f_vty_enter_config(pt); + f_vty_transceive(pt, "cs7 instance " & int2str(cs7_inst)); +} type record of charstring rof_charstring; function f_vty_config3(TELNETasp_PT pt, rof_charstring config_nodes, rof_charstring cmds) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37110?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I14fa55314f7351997d1cf1c940cc8684bee2497f Gerrit-Change-Number: 37110 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged