<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17207">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remsim: Integrate VPCD test port into RemsimBankd_Tests.ttcn<br><br>VPCD (specifically ifd-vpcd) is an ifd-handler (reader driver)<br>for a virtual smart card reader integrated with pcsc-lite. It is<br>part of the virtualsmartcard project. Using this ifd-vpcd, we<br>can implementa virtual smart card reader beneath osmo-remsim-bankd,<br>which allows us to implement both the smart card [reader] below<br>osmo-remsim-bankd as well as the osmo-remsim-server + client above<br>osmo-remsim-bankd - in other words a fully virtualized test fixture for<br>bankd.<br><br>Change-Id: I967f2d526f4ef1278bd2ac1d590a8dce732379d5<br>---<br>M remsim/RemsimBankd_Tests.ttcn<br>M remsim/gen_links.sh<br>M remsim/regen_makefile.sh<br>3 files changed, 41 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/remsim/RemsimBankd_Tests.ttcn b/remsim/RemsimBankd_Tests.ttcn</span><br><span>index e9e3b31..fd3f907 100644</span><br><span>--- a/remsim/RemsimBankd_Tests.ttcn</span><br><span>+++ b/remsim/RemsimBankd_Tests.ttcn</span><br><span>@@ -17,6 +17,10 @@</span><br><span> import from IPA_Emulation all;</span><br><span> import from Misc_Helpers all;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import from VPCD_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from VPCD_CodecPort all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from VPCD_Adapter all;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> import from RSPRO all;</span><br><span> import from RSRES all;</span><br><span> import from RSPRO_Types all;</span><br><span>@@ -30,7 +34,7 @@</span><br><span> </span><br><span> /* We implement a RSPRO server to simulate the remsim-server and a</span><br><span> RSPRO client to simulate a remsim-client connecting to bankd */</span><br><span style="color: hsl(0, 100%, 40%);">-type component bankd_test_CT extends rspro_server_CT, rspro_client_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+type component bankd_test_CT extends rspro_server_CT, rspro_client_CT, VPCD_Adapter_CT {</span><br><span> }</span><br><span> </span><br><span> private function f_init(boolean start_client := false) runs on bankd_test_CT {</span><br><span>@@ -332,11 +336,43 @@</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_vpcd() runs on VPCD_Adapter_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] VPCD.receive(tr_VPCD_Recv(g_vpcd_conn_id, tr_VPCD_CTRL_ATR)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vpcd_send(ts_VPCD_DATA('3B9F96801FC78031A073BE21136743200718000001A5'O));</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] VPCD.receive(tr_VPCD_Recv(g_vpcd_conn_id, tr_VPCD_CTRL_OFF)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] VPCD.receive(tr_VPCD_Recv(g_vpcd_conn_id, tr_VPCD_CTRL_ON)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* transceive a TPDU from modem to card (and back) */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_rspro_xceive_mdm2card_vpcd(integer idx, BankSlot bs, template (value) octetstring data,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) TpduFlags flags, template (value) octetstring res) runs on bankd_test_CT return octetstring {</span><br><span style="color: hsl(120, 100%, 40%);">+ var RsproPDU rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ RSPRO[idx].send(ts_RSPRO_TpduModemToCard(rspro[idx].rspro_client_slot, bs, flags, data));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vpcd_exp(tr_VPCD_DATA(data));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vpcd_send(ts_VPCD_DATA(res));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_rspro_exp(tr_RSPRO_TpduCardToModem(bs, rspro[idx].rspro_client_slot, ?, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rx.msg.tpduCardToModem.data != valueof(res)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Expected ", res, " from card, but got ", rx.msg.tpduCardToModem.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return rx.msg.tpduCardToModem.data;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* first add mapping, then connect matching client and exchange some TPDUs */</span><br><span> testcase TC_createMapping_exchangeTPDU() runs on bankd_test_CT {</span><br><span> /* FIXME: this would only be done in f_init_client(), but we need it before */</span><br><span> rspro[0].rspro_client_slot := { clientId := 23+0, slotNr := 0 };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ VPCD_Adapter.f_connect();</span><br><span style="color: hsl(120, 100%, 40%);">+ activate(as_vpcd());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(2.0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> f_init();</span><br><span> as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots);</span><br><span> f_rspro_srv_reset_state(ok);</span><br><span>@@ -354,7 +390,7 @@</span><br><span> var TpduFlags f := {tpduHeaderPresent:=true, finalPart:=true, procByteContinueTx:=false,</span><br><span> procByteContinueRx:=false};</span><br><span> for (var integer i := 0; i < 10; i:=i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_rspro_xceive_mdm2card(0, bs, 'A0A40000023F00'O, f);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rspro_xceive_mdm2card_vpcd(0, bs, 'A0A40000023F00'O, f, '9000'O);</span><br><span> }</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass);</span><br><span> }</span><br><span>diff --git a/remsim/gen_links.sh b/remsim/gen_links.sh</span><br><span>index 7c234ec..366a8e6 100755</span><br><span>--- a/remsim/gen_links.sh</span><br><span>+++ b/remsim/gen_links.sh</span><br><span>@@ -38,6 +38,8 @@</span><br><span> 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 "</span><br><span> FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn "</span><br><span> FILES+="Native_Functions.ttcn Native_FunctionDefs.cc "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="VPCD_Types.ttcn VPCD_CodecPort.ttcn VPCD_CodecPort_CtrlFunct.ttcn VPCD_CodecPort_CtrlFunctDef.cc</span><br><span style="color: hsl(120, 100%, 40%);">+VPCD_Adapter.ttcn "</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span> ignore_pp_results</span><br><span>diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh</span><br><span>index e398360..6f7d209 100755</span><br><span>--- a/remsim/regen_makefile.sh</span><br><span>+++ b/remsim/regen_makefile.sh</span><br><span>@@ -1,6 +1,6 @@</span><br><span> #!/bin/sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FILES="*.ttcn *.ttcnpp *.asn IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc Native_FunctionDefs.cc RSPRO_EncDec.cc Abstract_Socket.cc HTTPmsg_PT.cc HTTPmsg_MessageLen_Function.cc JSON_EncDec.cc"</span><br><span style="color: hsl(120, 100%, 40%);">+FILES="*.ttcn *.ttcnpp *.asn IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc Native_FunctionDefs.cc RSPRO_EncDec.cc Abstract_Socket.cc HTTPmsg_PT.cc HTTPmsg_MessageLen_Function.cc JSON_EncDec.cc VPCD_CodecPort_CtrlFunctDef.cc "</span><br><span> </span><br><span> export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSPRO -DIPA_EMULATION_CTRL"</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17207">change 17207</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17207"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I967f2d526f4ef1278bd2ac1d590a8dce732379d5 </div>
<div style="display:none"> Gerrit-Change-Number: 17207 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>