February 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: move SIMTRACE_{Types,Templates,Emulation}.ttcn to library

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27338 ) Change subject: move SIMTRACE_{Types,Templates,Emulation}.ttcn to library ...................................................................... move SIMTRACE_{Types,Templates,Emulation}.ttcn to library this will allow us to us SIMTRACE as part of a test suite testing e.g. CCID readers. Change-Id: I4349019e2deac114f4c040f1441b70663a521ec2 --- R library/SIMTRACE_Emulation.ttcn R library/SIMTRACE_Templates.ttcn R library/SIMTRACE_Types.ttcn M simtrace/gen_links.sh 4 files changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/simtrace/SIMTRACE_Emulation.ttcn b/library/SIMTRACE_Emulation.ttcn similarity index 100% rename from simtrace/SIMTRACE_Emulation.ttcn rename to library/SIMTRACE_Emulation.ttcn diff --git a/simtrace/SIMTRACE_Templates.ttcn b/library/SIMTRACE_Templates.ttcn similarity index 100% rename from simtrace/SIMTRACE_Templates.ttcn rename to library/SIMTRACE_Templates.ttcn diff --git a/simtrace/SIMTRACE_Types.ttcn b/library/SIMTRACE_Types.ttcn similarity index 100% rename from simtrace/SIMTRACE_Types.ttcn rename to library/SIMTRACE_Types.ttcn diff --git a/simtrace/gen_links.sh b/simtrace/gen_links.sh index 72787b9..eef1fea 100755 --- a/simtrace/gen_links.sh +++ b/simtrace/gen_links.sh @@ -15,6 +15,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn " FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="SIMTRACE_Types.ttcn SIMTRACE_Templates.ttcn SIMTRACE_Emulation.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27338 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: I4349019e2deac114f4c040f1441b70663a521ec2 Gerrit-Change-Number: 27338 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27339 ) Change subject: ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB ...................................................................... ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB Change-Id: Ie110ad1511b01fe84e1ad181b0e053e25f80f522 --- M ccid/CCID_Tests.ttcn M deps/Makefile 2 files changed, 1 insertion(+), 140 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index f7423cd..e650f37 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -29,13 +29,6 @@ var Slot_CT vc_SLOT[NR_SLOTS]; }; -/* per-slot test component; manages one slot */ -type component Slot_CT { - var uint8_t g_slot_nr; - port CCID_SLOT_PT CCID; - timer g_Tguard := 120.0; -}; - /* maximum number of slots we are supporting in the test suite */ private const integer NR_SLOTS := 16; @@ -96,25 +89,6 @@ type function void_fn() runs on Slot_CT; -/* altstep running on the per-slot test component */ -private altstep as_Tguard() runs on Slot_CT { - [] g_Tguard.timeout { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout"); - } -} - -private altstep as_ccid_any() runs on Slot_CT { - var CCID_PDU pdu; - [] CCID.receive(CCID_PDU:?) -> value pdu { - setverdict(fail, "Received unexpected CCID ", pdu); - self.stop; - } - [] CCID.receive { - setverdict(fail, "Received unexpected non-CCID"); - self.stop; - } -} - /* first function inside Slot_CT; wait for CCID_EVENT_UP + call testcase-specific function */ private function f_handler_init(void_fn fn, integer slot_nr) runs on Slot_CT { g_slot_nr := slot_nr; @@ -163,119 +137,6 @@ } -/* transceive a CCID command (send 'tx' on OUT; expect 'rx' on IN) */ -private function f_ccid_xceive(template (value) CCID_PDU tx, template (present) CCID_PDU exp_rx) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - tx.hdr.bSlot := g_slot_nr; - exp_rx.hdr.bSlot := g_slot_nr; - - CCID.send(tx); - alt { - [] CCID.receive(exp_rx) -> value pdu { - return pdu; - } - [] as_ccid_any(); - } - return pdu; -} - -private template (present) CCID_Header_IN tr_inact := - tr_CCID_HeaderIN_OK(icc_status := (CCID_ICC_STATUS_PRES_INACT, CCID_ICC_STATUS_NO_ICC)); - -private template (present) CCID_Header_IN tr_act := - tr_CCID_HeaderIN_OK(icc_status := CCID_ICC_STATUS_PRES_ACT); - -/* Send IccPowerOn on OUT; expect DataBlock in retunr */ -private function f_ccid_power_on(CCID_PowerSelect psel := CCID_PWRSEL_AUTO, - template (present) CCID_Header_IN hdr_in := tr_act) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_IccPowerOn(g_slot_nr, psel), - tr_CCID_DataBlock(g_slot_nr, hdr_in := hdr_in) ); - return pdu; -} - -/* Send IccPowerOn on OUT; expect SlotStatus in return */ -private function f_ccid_power_off(template (present) CCID_Header_IN hdr_in := tr_inact) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_IccPowerOff(g_slot_nr), - tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := hdr_in) ); - return pdu; -} - -/* Send IccClockCommand on OUT; expect SlotStatus in return */ -private function f_ccid_clock_cmd(CCID_ClockCommand cmd, - template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_ClockCommand(g_slot_nr, cmd), - tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - -/* Send XfrBlock on OUT; expect DataBlock in return */ -private function f_ccid_xfr(octetstring tx, template octetstring rx) runs on Slot_CT return octetstring { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_XfrBlock(g_slot_nr, tx, 0), - tr_CCID_DataBlock(g_slot_nr, ?, ?, rx) ); - return pdu.u.DataBlock.abData; -} - -/* Send SetParameters on OUT; expect Parameters on IN */ -private function f_ccid_set_par(template (value) CCID_ProtocolData par, - template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_SetParameters(g_slot_nr, par), - tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - -/* Send GetParameters on OUT; expect Parameters on IN */ -private function f_ccid_get_par(template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_GetParameters(g_slot_nr), - tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - -/* Send ResetParameters on OUT; expect Parameters on IN */ -private function f_ccid_reset_par(template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - /* [at least] Omnikey seems to have failed to follow the CCID spec here :/ */ - if (mp_quirk_resetpar_returns_slotsts) { - pdu := f_ccid_xceive(ts_CCID_ResetParameters(g_slot_nr), - tr_CCID_SlotStatus(g_slot_nr, hdr_in := hdr_in)); - } else { - pdu := f_ccid_xceive(ts_CCID_ResetParameters(g_slot_nr), - tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); - } - return pdu; -} - -/* Send Escape on OUT; expect Escape on IN */ -private function f_ccid_escape(template (value) octetstring data, - template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) -runs on Slot_CT return CCID_PDU { - var CCID_PDU pdu; - - pdu := f_ccid_xceive(ts_CCID_Escape(g_slot_nr, data), - tr_CCID_EscapeIN(g_slot_nr, hdr_in := hdr_in)); - return pdu; -} - /*********************************************************************** * Test behavior regarding valid situations diff --git a/deps/Makefile b/deps/Makefile index e67b499..2a906eb 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -126,7 +126,7 @@ titan.TestPorts.TELNETasp_commit= 873fe539642542cd9a901c208f1ec11c6d2f5387 titan.TestPorts.UDPasp_commit= c20d77a34f288dd70dd4aaa30e520778876e9336 titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-13-gd34ab71 -titan.TestPorts.USB_commit= 4c742e931aae66c0046cebfe3c1de4618b6f9ffc +titan.TestPorts.USB_commit= a9470fdc99c82fbf988f4508c3161118c9106e28 osmo-uecups_commit= 8362efef7c6fa341eb947a75786878e0685767b7 all: $(foreach dir,$(ALL_REPOS),$(dir)/update) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27339 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: Ie110ad1511b01fe84e1ad181b0e053e25f80f522 Gerrit-Change-Number: 27339 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 ) Change subject: simtrace: Add support for slot_mux_nr to CardEmu_BD_Config ...................................................................... Patch Set 1: (1 comment) File library/SIMTRACE_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340/comment/f4c34b86_928a… PS1, Line 225: ? I guess this should be * not ?, otherwise any message without this entirely optional part would no longer match. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27340 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: Id29584764a2f27b9de5fa9ff67fd0ae3e912f02e Gerrit-Change-Number: 27340 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:14:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27339 ) Change subject: ccid: Lots of CCID helpers have been moved to titan.TestPorts.USB ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27339 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: Ie110ad1511b01fe84e1ad181b0e053e25f80f522 Gerrit-Change-Number: 27339 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:13:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: move SIMTRACE_{Types,Templates,Emulation}.ttcn to library

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27338 ) Change subject: move SIMTRACE_{Types,Templates,Emulation}.ttcn to library ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27338 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: I4349019e2deac114f4c040f1441b70663a521ec2 Gerrit-Change-Number: 27338 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 18:12:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27348 ) Change subject: ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools ...................................................................... ttcn3-ggsn: Modify configs to alloc bigger IPv4 pools This is needed for test TC_lots_of_concurrent_pdp_ctx, which creates up to 1000 pdp contexts. Change-Id: If3344c8acc9bc3b43ed0a13af52807d2a6050a81 --- M ttcn3-ggsn-test/ogs/smfd.yaml M ttcn3-ggsn-test/ogs/upfd-setup.sh M ttcn3-ggsn-test/ogs/upfd.yaml M ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg M ttcn3-ggsn-test/osmo-ggsn.cfg 5 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/48/27348/1 diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml b/ttcn3-ggsn-test/ogs/smfd.yaml index 0860074..96463e5 100644 --- a/ttcn3-ggsn-test/ogs/smfd.yaml +++ b/ttcn3-ggsn-test/ogs/smfd.yaml @@ -340,11 +340,11 @@ - addr: 172.18.3.201 port: 2152 subnet: - - addr: 176.16.222.1/24 + - addr: 176.16.16.1/20 dnn: internet - addr: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 - - addr: 176.16.46.1/24 + - addr: 176.16.32.1/20 dnn: inet46 - addr: 2001:780:44:2100:0:0:0:1/56 dnn: inet46 diff --git a/ttcn3-ggsn-test/ogs/upfd-setup.sh b/ttcn3-ggsn-test/ogs/upfd-setup.sh index c96a561..b185ac0 100755 --- a/ttcn3-ggsn-test/ogs/upfd-setup.sh +++ b/ttcn3-ggsn-test/ogs/upfd-setup.sh @@ -18,9 +18,9 @@ create_tun "ogstun6" create_tun "ogstun46" -add_addr "ogstun4" "176.16.222.1/16" +add_addr "ogstun4" "176.16.16.1/20" add_addr "ogstun6" "2001:780:44:2000:0:0:0:1/56" -add_addr "ogstun46" "176.16.46.1/24" +add_addr "ogstun46" "176.16.32.1/20" add_addr "ogstun46" "2001:780:44:2100:0:0:0:1/56" ip link set ogstun4 up diff --git a/ttcn3-ggsn-test/ogs/upfd.yaml b/ttcn3-ggsn-test/ogs/upfd.yaml index 8fe932b..b38bc34 100644 --- a/ttcn3-ggsn-test/ogs/upfd.yaml +++ b/ttcn3-ggsn-test/ogs/upfd.yaml @@ -156,13 +156,13 @@ - addr: 172.18.3.222 port: 2152 subnet: - - addr: 176.16.222.1/24 + - addr: 176.16.16.1/20 dnn: internet dev: ogstun4 - addr: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 dev: ogstun6 - - addr: 176.16.46.1/24 + - addr: 176.16.32.1/20 dnn: inet46 dev: ogstun46 - addr: 2001:780:44:2100:0:0:0:1/56 diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg index 0288d60..6fbfd0e 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg @@ -48,10 +48,10 @@ gtpu-mode kernel-gtp tun-device tun4 type-support v4 - ip prefix dynamic 176.16.222.0/24 + ip prefix dynamic 176.16.16.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 - ip ifconfig 176.16.222.0/24 + ip ifconfig 176.16.16.0/20 no shutdown # apn inet6 # apn inet46 diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg index 972ee93..b27a6e4 100644 --- a/ttcn3-ggsn-test/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn.cfg @@ -48,10 +48,10 @@ gtpu-mode tun tun-device tun4 type-support v4 - ip prefix dynamic 176.16.222.0/24 + ip prefix dynamic 176.16.16.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 - ip ifconfig 176.16.222.0/24 + ip ifconfig 176.16.16.0/20 no shutdown apn inet6 gtpu-mode tun @@ -66,10 +66,10 @@ gtpu-mode tun tun-device tun46 type-support v4v6 - ip prefix dynamic 176.16.46.0/24 + ip prefix dynamic 176.16.32.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 - ip ifconfig 176.16.46.0/24 + ip ifconfig 176.16.32.0/20 ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 ipv6 dns 0 fd02:db8:3::201 ipv6 dns 1 2001:4860:4860::8844 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If3344c8acc9bc3b43ed0a13af52807d2a6050a81 Gerrit-Change-Number: 27348 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 ) Change subject: ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx ...................................................................... ggsn: Introduce test TC_lots_of_concurrent_pdp_ctx Change-Id: Iab19963f8e869af8fe0c385abd0fd7bbd9221790 --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 115 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/27347/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index b66d7ba..58a12a6 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1862,6 +1862,119 @@ setverdict(pass); } + /* Test creation, user plane and deletion of big amount (1000) of concurrent PDP context */ + testcase TC_lots_of_concurrent_pdp_ctx() runs on GT_CT { + var Gtp1cUnitdata udc; + var Gtp1uUnitdata udu; + const integer num_ctx := 1000; + var PdpContext ctx[num_ctx]; + timer T_next := 0.01; + var integer next_req_ctx := 0; + var integer rx_resp_ctx := 0; + var integer rx_pong := 0; + var OCT4 dns1_addr; + var OCT4 saddr; + var integer teic; + var integer idx; + + f_init(); + + for (var integer i := 0; i < num_ctx; i := i + 1) { + ctx[i] := valueof(t_DefinePDP(f_rnd_imsi('26242'H), f_rnd_msisdn('1234'O), c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx[i].teic := int2oct(i+1, 4); /* +1: skip TEIC=0 */ + ctx[i].teid := int2oct(i+1, 4); /* +1: skip TEID=0 */ + ctx[i].pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + } + + T_default.start(60.0); + + T_next.start; + alt { + [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(INITIAL_REQUEST) { repeat; } + [] pingpong(); + [] T_next.timeout { + f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].imsi, g_restart_ctr, + ctx[next_req_ctx].teid, ctx[next_req_ctx].teic, ctx[next_req_ctx].nsapi, + ctx[next_req_ctx].eua, ctx[next_req_ctx].apn, g_sgsn_ip_c, g_sgsn_ip_u, + ctx[next_req_ctx].msisdn, ctx[next_req_ctx].pco_req, ctx[next_req_ctx].ratType, + ctx[next_req_ctx].uli)); + next_req_ctx := next_req_ctx + 1; + if (next_req_ctx < num_ctx) { + T_next.start; + } + repeat; + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ?)) -> value udc { + teic := oct2int(udc.gtpc.teid); + if (not match(teic, (1 .. num_ctx))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rx Unexpected TEIC"); + } + idx := teic - 1; + f_handle_create_req(ctx[idx], udc); + rx_resp_ctx := rx_resp_ctx + 1; + + dns1_addr := f_PCO_extract_proto(ctx[idx].pco_neg, '000d'O); + saddr := ctx[idx].eua.endUserAddress.endUserAddressIPv4.ipv4_address; + f_send_gtpu(ctx[idx], f_gen_icmpv4_echo(saddr, dns1_addr)); + repeat; + } + [] GTPU.receive(tr_GTPU_GPDU(g_peer_u, ?)) -> value udu { + var octetstring gpdu := udu.gtpu.gtpu_IEs.g_PDU_IEs.data; + var IPv4_packet ip4 := f_IPv4_dec(gpdu); + if (ip4.header.ver != 4) { + repeat; + } + var PDU_ICMP icmp4 := f_dec_PDU_ICMP(ip4.payload); + if (not match(icmp4, (tr_ICMPv4_ERP, tr_ICMPv4_DU))) { + repeat; + } + rx_pong := rx_pong + 1; + if (rx_pong < num_ctx) { + repeat; + } + setverdict(pass); + } + [] GTPC.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPC"); } + [] GTPU.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPU"); } + } + + /* Let's close them now: */ + next_req_ctx := 0; + rx_resp_ctx := 0; + T_next.start; + alt { + [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(TERMINATION_REQUEST) { repeat; } + [] pingpong(); + [] T_next.timeout { + f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].teic_remote, ctx[next_req_ctx].nsapi, '1'B)); + next_req_ctx := next_req_ctx + 1; + if (next_req_ctx < num_ctx) { + T_next.start; + } + repeat; + } + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, ?)) -> value udc { + teic := oct2int(udc.gtpc.teid); + if (not match(teic, (1 .. num_ctx))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rx Unexpected TEIC"); + } + rx_resp_ctx := rx_resp_ctx + 1; + if (rx_resp_ctx < num_ctx) { + repeat; + } + setverdict(pass); + } + [] GTPC.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPC"); } + [] GTPU.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx Unexpected GTPU"); } + } + T_next.stop; + + T_default.stop; + setverdict(pass); + } + control { execute(TC_pdp4_act_deact()); execute(TC_pdp4_act_deact_ipcp()); @@ -1904,5 +2017,7 @@ execute(TC_act_deact_retrans_duplicate()); execute(TC_pdp_act_restart_ctr_echo()); + + execute(TC_lots_of_concurrent_pdp_ctx()); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27347 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: Iab19963f8e869af8fe0c385abd0fd7bbd9221790 Gerrit-Change-Number: 27347 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: vty: Fix cmd 'no echo-interval' doing nothing

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27346 ) Change subject: vty: Fix cmd 'no echo-interval' doing nothing ...................................................................... vty: Fix cmd 'no echo-interval' doing nothing It was incorrectly implemented and in practice was a NOOP. Change-Id: I5e03c4965d05871d3f2e56675da6e75af0ec18c2 --- M ggsn/ggsn_vty.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/46/27346/1 diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index 1738e70..9591bf7 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -389,10 +389,9 @@ NO_STR "Send an echo request to this static GGSN every interval.\n") { struct ggsn_ctx *ggsn = (struct ggsn_ctx *) vty->index; - int prev_interval = ggsn->cfg.echo_interval; struct sgsn_peer *sgsn; - if (prev_interval == ggsn->cfg.echo_interval) + if (ggsn->cfg.echo_interval == 0) return CMD_SUCCESS; ggsn->cfg.echo_interval = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5e03c4965d05871d3f2e56675da6e75af0ec18c2 Gerrit-Change-Number: 27346 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: simtrace emulation: adjust templates to support octsim tester

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27344 ) Change subject: simtrace emulation: adjust templates to support octsim tester ...................................................................... simtrace emulation: adjust templates to support octsim tester It has multiple switchable slots. Change-Id: I00576170a2b6921d99906ed8bd45d9eece053056 --- M library/SIMTRACE_Templates.ttcn M library/SIMTRACE_Types.ttcn 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/27344/1 diff --git a/library/SIMTRACE_Templates.ttcn b/library/SIMTRACE_Templates.ttcn index ef857fe..d71828a 100644 --- a/library/SIMTRACE_Templates.ttcn +++ b/library/SIMTRACE_Templates.ttcn @@ -215,9 +215,9 @@ template (value) SIMTRACE_PDU -ts_SIMTRACE_CEMU_CONFIG(template (value) CardEmu_FeatureFlags flags) := +ts_SIMTRACE_CEMU_CONFIG(template (value) CardEmu_FeatureFlags flags, integer slotnr) := ts_SIMTRACE(SIMTRACE_MSGT_BD_CEMU_CONFIG, { cardem_bd_config := { features := flags, - slot_mux_nr := 0} }); + slot_mux_nr := slotnr} }); template (present) SIMTRACE_PDU tr_SIMTRACE_CEMU_CONFIG(template (present) CardEmu_FeatureFlags flags) := diff --git a/library/SIMTRACE_Types.ttcn b/library/SIMTRACE_Types.ttcn index d28df2f..25a1adf 100644 --- a/library/SIMTRACE_Types.ttcn +++ b/library/SIMTRACE_Types.ttcn @@ -195,7 +195,7 @@ /* CEMU_USB_MSGT_DT_CARDINSERT */ type record Cardemu_DT_CardInsert { - uint8_t card_insert + uint8_t card_insert (0..1) }; /* CEMU_USB_MSGT_DT_SET_ATR */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27344 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: I00576170a2b6921d99906ed8bd45d9eece053056 Gerrit-Change-Number: 27344 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: octsim: tester support

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345 ) Change subject: octsim: tester support ...................................................................... octsim: tester support Change-Id: Id7c7e529a5444cffc8e79b385959a522dc9a6beb --- M octsim/OCTSIM_Tests.cfg M octsim/OCTSIM_Tests.ttcn 2 files changed, 439 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/27345/1 diff --git a/octsim/OCTSIM_Tests.cfg b/octsim/OCTSIM_Tests.cfg index 79b78a3..d701325 100644 --- a/octsim/OCTSIM_Tests.cfg +++ b/octsim/OCTSIM_Tests.cfg @@ -1,20 +1,28 @@ [ORDERED_INCLUDE] # Common configuration, shared between test suites -"../Common.cfg" +#"../Common.cfg" # testsuite specific configuration, not expected to change "./OCTSIM_Tests.default" # Local configuration below [LOGGING] -ConsoleMask := ERROR | WARNING | TESTCASE | USER; +LogFile := "%e-%c-%h-%r.%s" +AppendFile := Yes; +SourceInfoFormat := Stack; +LogSourceInfo := Yes; +LogEventTypes := Yes; +LoggerPlugins := { JUnitLogger := "libjunitlogger2" } +FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; +ConsoleMask := ERROR | WARNING | TESTCASE | USER | VERDICTOP; # | MATCHING| DEBUG| PORTEVENT ; [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] - +mp_cardem_usb_interface := 0 [MAIN_CONTROLLER] [EXECUTE] OCTSIM_Tests.control +#OCTSIM_Tests.TC_test_grouped diff --git a/octsim/OCTSIM_Tests.ttcn b/octsim/OCTSIM_Tests.ttcn index 941cfa3..14dd45a 100644 --- a/octsim/OCTSIM_Tests.ttcn +++ b/octsim/OCTSIM_Tests.ttcn @@ -19,10 +19,11 @@ import from SIMTRACE_Emulation all; modulepar { - //USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '60e3'H} }; - charstring mp_cardem_usb_path := "1-2"; + //charstring mp_cardem_usb_path := "2-15"; integer mp_cardem_usb_interface := 0; - USB_Device_Match mp_ccid_usb_dev_match := { vid_pid := { vid := '076b'H, pid := '6622'H } }; + USB_Device_Match mp_ccid_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '6141'H } }; + USB_Device_Match mp_st_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '616d'H } }; + boolean true_card := false; } type component test_CT extends Slot_CT { @@ -31,6 +32,7 @@ port ST_USER_PT ST_IRQ; var CCID_Emulation_CT vc_CCID; + timer t_transaction_guard := 3.0; }; private template (value) USB_IF_Params ts_UsbPars_path(charstring path, uint8_t if_nr) := { @@ -47,20 +49,23 @@ g_slot_nr := slot_nr; var USB_IF_Params st_usb_pars; - st_usb_pars := valueof(ts_UsbPars_path(mp_cardem_usb_path, mp_cardem_usb_interface)); + st_usb_pars.usb_dev_match := mp_st_usb_dev_match;// := valueof(ts_UsbPars_path(mp_cardem_usb_path, mp_cardem_usb_interface)); + st_usb_pars.usb_if_nr := mp_cardem_usb_interface; vc_ST := ST_Emulation_CT.create("ST"); map(vc_ST:USB, system:USB); connect(vc_ST:INOUT, self:ST); connect(vc_ST:IRQ, self:ST_IRQ); vc_ST.start(SIMTRACE_Emulation.main(st_usb_pars)); + f_st_drain(0.5); + /* remove the virtual card */ ST.send(ts_SIMTRACE_CEMU_CARDINSERT(0)); - /* TODO: set the ATR */ + ST.send(ts_SIMTRACE_CEMU_SET_ATR('3B9F96801FC78031A073BE21136743200718000001A5'O)); /* Enable the use of the IRQ endpoint to report status updates */ - f_st_xceive(ts_SIMTRACE_CEMU_CONFIG(ts_FeatureFlags(true)), + f_st_xceive(ts_SIMTRACE_CEMU_CONFIG(ts_FeatureFlags(true), slot_nr), tr_SIMTRACE_CEMU_CONFIG(tr_FeatureFlags(true))) @@ -78,8 +83,8 @@ f_ccid_power_off(?); } -function f_st_drain() runs on test_CT { - timer T := 0.1; +function f_st_drain(float waittime := 0.1) runs on test_CT { + timer T := waittime; T.start; alt { [] ST.receive { @@ -151,7 +156,7 @@ } [] ST_IRQ.receive(tr_SIMTRACE_CEMU_STATUS) -> value rx_st { log("Ignoring non-matching flags of ", rx_st); - repeat; + repeat; } } @@ -159,81 +164,456 @@ tr_CardEmu_DataFlags(false, false, false, tpdu_hdr := true); /* transceive a TPDU, either with e rx data part, or a tx data part */ -function f_xceive(octetstring apdu, octetstring sw := '9000'O, boolean rx := true) runs on test_CT { +function f_xceive(octetstring apdu, octetstring sw := '9000'O, boolean rx := true) runs on test_CT return octetstring { var octetstring apdu_hdr := substr(apdu, 0, 5); var octetstring pb := substr(apdu, 1, 1); var octetstring data := substr(apdu, 5, lengthof(apdu)-5); + var CCID_PDU rx_ccid; - CCID.send(ts_CCID_XfrBlock(g_slot_nr, apdu)); - ST.receive(tr_SIMTRACE_CEMU_RX_DATA(tr_cef_tpdu_hdr, apdu_hdr)); - if (rx) { - /* transmit procedure byte and wait for remainder */ - ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_rx:=true), pb)); - /* expect reader to transmit the remaining data */ - ST.receive(tr_SIMTRACE_CEMU_RX_DATA(tr_CardEmu_DataFlags(final:=true), data)); - /* respond with status word */ - ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(final:=true), sw)); - /* expect reader to receive status word */ - CCID.receive(tr_CCID_DataBlock(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK, data := sw)); + if (rx == true) { + CCID.send(ts_CCID_XfrBlock(g_slot_nr, apdu)); } else { - /* FIXmE: doesn't work yet! */ + /* the octsim judges the command type by length: >header size means data, and data means "rx = true" here */ + CCID.send(ts_CCID_XfrBlock(g_slot_nr, apdu_hdr)); + } + + if(not true_card){ + ST.receive(tr_SIMTRACE_CEMU_RX_DATA(tr_cef_tpdu_hdr, apdu_hdr)); + } + if (rx) { + if(not true_card){ + /* transmit procedure byte and wait for remainder */ + ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_rx:=true), pb)); + /* expect reader to transmit the remaining data */ + ST.receive(tr_SIMTRACE_CEMU_RX_DATA(tr_CardEmu_DataFlags(final:=true), data)); + /* respond with status word */ + ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(final:=true), sw)); + } + /* expect reader to receive status word */ + CCID.receive(tr_CCID_DataBlock(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK, data := sw)) -> value rx_ccid; + } else { /* transmit procedure byte and remainder */ var octetstring tx := data; - ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true), pb & data)); - ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true, final:=true), sw)); + + if(not true_card){ + ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true, final:=true), pb & data & sw)); + + // attempt to split the transfer causes proplems with 5m/512/32 ?! apparently anything above 4m/372/2 + //ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true), pb & data)); + //f_sleep(0.1); + //ST.send(ts_SIMTRACE_CEMU_TX_DATA(ts_CardEmu_DataFlags(pb_and_tx:=true, final:=true), sw)); + } /* expect reader to receive status word */ - CCID.receive(tr_CCID_DataBlock(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK, data := tx)); + CCID.receive(tr_CCID_DataBlock(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK, data := data & sw)) -> value rx_ccid; } setverdict(pass); + + + return rx_ccid.u.DataBlock.abData; } -testcase TC_test() runs on test_CT +private function f_update(integer slot_nr := 0) runs on test_CT +{ + /* remove the virtual card */ + ST.send(ts_SIMTRACE_CEMU_CARDINSERT(0)); + + f_st_drain(); + disconnect(vc_CCID:SLOT[g_slot_nr], self:CCID); + g_slot_nr := slot_nr; + //f_sleep(1.0); + connect(vc_CCID:SLOT[g_slot_nr], self:CCID); + //f_ccid_power_off(?); + f_st_drain(); + /* Enable the use of the IRQ endpoint to report status updates */ + f_st_xceive(ts_SIMTRACE_CEMU_CONFIG(ts_FeatureFlags(true), slot_nr), + tr_SIMTRACE_CEMU_CONFIG(tr_FeatureFlags(true))) + + +} + +private function f_pps_512_32() runs on test_CT { + var CCID_PDU rx_ccid; + var CCID_ProtocolData pd := { + T0 := { + + // does not work with sjs1! + // card will nak by being unresponsive + //Findex := bit2int('0000'B), + //Dindex := bit2int('0110'B), + + Findex := bit2int('1001'B), + Dindex := bit2int('0101'B), + //Dindex := bit2int('0100'B), + + + // ok: 2.5m / 372/2 + //Findex := bit2int('0001'B), + //Dindex := bit2int('0010'B), + + bRFU := '000000'B, + inv_convention := false, + bRFU2 := '0'B, + + bGuardTimeT0 := 0, + bWaitingIntegerT0 := 10, + bClockStop := STOPPING_NOT_ALLOWED + } + } + CCID.send(ts_CCID_SetParameters(g_slot_nr, pd)); + if(not true_card){ + ST.receive(tr_SIMTRACE_CEMU_PTS(?,?)); + } + CCID.receive(tr_CCID_Parameters(g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK)); + +} + +private altstep as_guardtimer() runs on test_CT { + [] t_transaction_guard.timeout { + setverdict(fail, "t_transaction_guard timeout!"); + mtc.stop; + } +} + +private function TC_test_common(integer slotnr,CCID_PowerSelect psel := CCID_PWRSEL_AUTO ,boolean use_ppss := true) runs on test_CT { var template (present) CardEmu_StatusFlags exp_flags; var CCID_PDU rx_ccid; - f_init(); - f_st_drain(); + f_update(slotnr); - f_sleep(1.0); + f_st_drain(); + f_ccid_power_off(?); /* insert the virtual card */ - ST.send(ts_SIMTRACE_CEMU_CARDINSERT(1)); + ST.send(ts_SIMTRACE_CEMU_CARDINSERT(2)); //f_ccid_xceive(ts_CCID_GetSlotStatus(0, g_slot_nr), tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := tr_CCID_HeaderIN_OK(?))); + //f_sleep(1.0); - rx_ccid := f_ccid_power_on(); + f_st_drain(); - if (false) { - /* FIXME: why does this only work on the first time after powering both devices? */ - f_sleep(1.0); - /* wait for status with RESET active */ - exp_flags := tr_CardEmu_StatusFlags(reset_active := true, clk_active := true, vcc_present := true); + t_transaction_guard.start; + var default d1 := activate(as_guardtimer()) + + rx_ccid := f_ccid_power_on(psel); + + /* wait for status with RESET inactive/released */ + if(not true_card){ + exp_flags := tr_CardEmu_StatusFlags(reset_active := false, clk_active := true, vcc_present := true); as_st_irq_wait_flags(exp_flags); } - /* wait for status with RESET inactive/released */ - exp_flags := tr_CardEmu_StatusFlags(reset_active := false, clk_active := true, vcc_present := true); - as_st_irq_wait_flags(exp_flags); - - if (not match(rx_ccid, tr_CCID_DataBlock(data := '3B8080811FC759'O))) { - setverdict(fail, "Unexpected ATR on CCID side: ", rx_ccid.u.DataBlock.abData); + if (not match(rx_ccid, tr_CCID_DataBlock(data := '3B9F96801FC78031A073BE21136743200718000001A5'O))) { + setverdict(fail, "Unexpected ATR on CCID side: ", slotnr, psel, use_ppss, rx_ccid.u.DataBlock.abData); + mtc.stop; } - for (var integer i := 0; i < 100; i := i+1) { - f_xceive('a0a40004023f00'O); + f_sleep(0.1); + if (use_ppss){ + f_pps_512_32(); } - /* doesn't work yet */ - //f_xceive('a0a40004023f00'O, rx:=false); - f_sleep(2.0); + + for (var integer i := 0; i < 5; i := i+1) { + //f_xceive('a0a40004023f00'O); + var octetstring rv := f_xceive('a0a40000023f00'O, sw := '9f22'O); + + /* actual card data */ + var octetstring data := '00007fff3f0001000000000015b104050600838a838a008300830000000000000000'O + + //var OCT1 sw1 := substr(rv, 0, 1); + var OCT1 sw2 := substr(rv, 1, 1); + //var octetstring data := ''O; + //f_pad_oct(data, oct2int(sw2), '2B'O); + f_xceive('A0C00000'O & sw2 & data, rx:=false); + + //f_xceive('a0b0000004fefed00f'O, rx:=false); + } + + t_transaction_guard.stop; + deactivate(d1); + + f_sleep(0.1); + + f_ccid_power_off(?); + f_st_drain(); + + log("currently trying slot " & int2str(slotnr) & " with " , psel, getverdict); } +testcase TC_test_grouped() runs on test_CT +{ + f_init(0); + f_st_drain(1.0); + + + for (var integer j := 0; j < 1; j := j+1) { + for (var integer i := 0; i < 8; i := i+1) { + + //TC_test_common(1, CCID_PWRSEL_1V8); + + if (false) { + f_st_drain(); + + f_update(i); + /* insert the virtual card */ + ST.send(ts_SIMTRACE_CEMU_CARDINSERT(1)); + + f_sleep(1.0); + f_ccid_power_off(?); + f_sleep(1.0); + f_ccid_xceive(ts_CCID_IccPowerOn(i, CCID_PWRSEL_3V0), tr_CCID_DataBlock(?, hdr_in := ?) ); + } else { + TC_test_common(i, CCID_PWRSEL_1V8); + TC_test_common(i, CCID_PWRSEL_3V0); + TC_test_common(i, CCID_PWRSEL_5V0, false); + } + } + } + + f_ccid_power_off(?); + f_st_drain(); +} + +testcase TC_test_slot0_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(0); + TC_test_common(0, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot0_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(0); + TC_test_common(0, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot0_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(0); + TC_test_common(0, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot1_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(1); + TC_test_common(1, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot1_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(1); + TC_test_common(1, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot1_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(1); + TC_test_common(1, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot2_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(2); + TC_test_common(2, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot2_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(2); + TC_test_common(2, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot2_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(2); + TC_test_common(2, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot3_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(3); + TC_test_common(3, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot3_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(3); + TC_test_common(3, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot3_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(3); + TC_test_common(3, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot4_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(4); + TC_test_common(4, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot4_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(4); + TC_test_common(4, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot4_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(4); + TC_test_common(4, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot5_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(5); + TC_test_common(5, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot5_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(5); + TC_test_common(5, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot5_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(5); + TC_test_common(5, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot6_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(6); + TC_test_common(6, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot6_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(6); + TC_test_common(6, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot6_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(6); + TC_test_common(6, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} + +testcase TC_test_slot7_CCID_PWRSEL_1V8() runs on test_CT +{ + f_init(7); + TC_test_common(7, CCID_PWRSEL_1V8, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot7_CCID_PWRSEL_3V0() runs on test_CT +{ + f_init(7); + TC_test_common(7, CCID_PWRSEL_3V0, true); + f_ccid_power_off(?); +} + +testcase TC_test_slot7_CCID_PWRSEL_5V0() runs on test_CT +{ + f_init(7); + TC_test_common(7, CCID_PWRSEL_5V0, false); + f_ccid_power_off(?); +} control { - execute( TC_test() ); + +execute( TC_test_slot0_CCID_PWRSEL_1V8() ); +execute( TC_test_slot0_CCID_PWRSEL_3V0() ); +execute( TC_test_slot0_CCID_PWRSEL_5V0() ); +execute( TC_test_slot1_CCID_PWRSEL_1V8() ); +execute( TC_test_slot1_CCID_PWRSEL_3V0() ); +execute( TC_test_slot1_CCID_PWRSEL_5V0() ); +execute( TC_test_slot2_CCID_PWRSEL_1V8() ); +execute( TC_test_slot2_CCID_PWRSEL_3V0() ); +execute( TC_test_slot2_CCID_PWRSEL_5V0() ); +execute( TC_test_slot3_CCID_PWRSEL_1V8() ); +execute( TC_test_slot3_CCID_PWRSEL_3V0() ); +execute( TC_test_slot3_CCID_PWRSEL_5V0() ); +execute( TC_test_slot4_CCID_PWRSEL_1V8() ); +execute( TC_test_slot4_CCID_PWRSEL_3V0() ); +execute( TC_test_slot4_CCID_PWRSEL_5V0() ); +execute( TC_test_slot5_CCID_PWRSEL_1V8() ); +execute( TC_test_slot5_CCID_PWRSEL_3V0() ); +execute( TC_test_slot5_CCID_PWRSEL_5V0() ); +execute( TC_test_slot6_CCID_PWRSEL_1V8() ); +execute( TC_test_slot6_CCID_PWRSEL_3V0() ); +execute( TC_test_slot6_CCID_PWRSEL_5V0() ); +execute( TC_test_slot7_CCID_PWRSEL_1V8() ); +execute( TC_test_slot7_CCID_PWRSEL_3V0() ); +execute( TC_test_slot7_CCID_PWRSEL_5V0() ); + } + } + + + +/* +python to generate tests + + +slots = range(0,8,1) +volts = ["CCID_PWRSEL_1V8", "CCID_PWRSEL_3V0", "CCID_PWRSEL_5V0"] + + +text="""testcase TC_test_slot{slot}_{volt}() runs on test_CT +{{ + f_init({slot}); + TC_test_common({slot}, {volt}, {pps}); + f_ccid_power_off(?); +}} +""" + +text2=""" +control { +""" +text3="""execute( TC_test_slot{slot}_{volt}() );""" +text4=""" +} +""" + + +for s in slots: + for i in volts: #range(0,10,1): + pps = "false" if i == "CCID_PWRSEL_5V0" else "true" + print(text.format(slot=s, volt=i, pps=pps)) + +print(text2) +for s in slots: + for i in volts: #range(0,10,1): + pps = "false" if i == "CCID_PWRSEL_5V0" else "true" + print(text3.format(slot=s, volt=i, pps=pps)) +print(text4) + +*/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27345 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: Id7c7e529a5444cffc8e79b385959a522dc9a6beb Gerrit-Change-Number: 27345 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022