From 964ca1450b293e62de4f5590f885465a2f99cce4 Mon Sep 17 00:00:00 2001 From: garciay Date: Tue, 26 Jul 2016 07:32:58 +0000 Subject: [PATCH] Merge with C2C project --- ttcn/AtsCAM/ItsCam_TpFunctions.ttcn | 4 +- .../ItsGeoNetworking_TpFunctions.ttcn | 294 +++++++++--------- .../ItsIpv6OverGeoNetworking_TestCases.ttcn | 20 +- ttcn/AtsSecurity/AtsSecurity_Templates.ttcn3 | 2 +- ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn3 | 71 ++--- .../AtsSecurity/ItsSecurity_TestControl.ttcn3 | 20 -- ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn | 4 +- ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn | 28 +- 8 files changed, 212 insertions(+), 231 deletions(-) diff --git a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn index f1a9d71e0..b8430122b 100644 --- a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn +++ b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn @@ -29,8 +29,8 @@ module ItsCam_TpFunctions { import from LibItsCam_Functions all; import from LibItsCam_Templates all; import from LibItsCam_TypesAndValues all; - import from LibItsCam_Pics {modulepar all;} - import from LibItsCam_Pixits {modulepar all;} + import from LibItsCam_Pics all; + import from LibItsCam_Pixits all; // ASN.1 import from ITS_Container language "ASN.1:1997" all; import from CAM_PDU_Descriptions language "ASN.1:1997" all; diff --git a/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn b/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn index df12834a7..1924cf6f9 100644 --- a/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn +++ b/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn @@ -303,12 +303,12 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { - [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithHlAndFlags(mw_longPosVectorPosition_withDelta(v_longPosVectorIut), ?, p_hopLimit, p_flags)))) { + [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithHlAndFlags(mw_longPosVectorPosition(v_longPosVectorIut), ?, p_hopLimit, p_flags)))) { tc_ac.stop; log("*** " & testcasename() & ": PASS: Correct GeoNetworking Common Header received ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_success); } - [] a_receiveGeoBroadcast(mw_longPosVectorPosition_withDelta(v_longPosVectorIut), ?) { + [] a_receiveGeoBroadcast(mw_longPosVectorPosition(v_longPosVectorIut), ?) { tc_ac.stop; log("*** " & testcasename() & ": FAIL: Incorrect GeoNetworking Common Header received ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_error); @@ -587,7 +587,7 @@ module ItsGeoNetworking_TpFunctions { // Test Body tc_ac.start; alt { - [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBeaconPacket(mw_longPosVectorPosition_withDelta(v_longPosVectorIut))))) { + [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBeaconPacket(mw_longPosVectorPosition(v_longPosVectorIut))))) { tc_ac.stop; log("*** " & testcasename() & ": PASS: Position equaling GN-MNGT primitive value received ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_success); @@ -633,7 +633,7 @@ module ItsGeoNetworking_TpFunctions { // Test Body tc_ac.start; alt { - [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBeaconPacket(mw_longPosVectorPosition_withDelta(v_longPosVectorIut))))) { + [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBeaconPacket(mw_longPosVectorPosition(v_longPosVectorIut))))) { tc_ac.stop; log("*** " & testcasename() & ": PASS: Timestamp equaling GN-MNGT primitive value received ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_success); @@ -694,9 +694,9 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwUnicastPacketWithSourcePv( - mw_shortPosVectorPosition_withDelta(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)), // DEPV + mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)), // DEPV ?, // sequence number - mw_longPosVectorPosition_withDelta(v_longPosVectorIut) //SOPV + mw_longPosVectorPosition(v_longPosVectorIut) //SOPV ) ) ) @@ -763,7 +763,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), // SOPV + mw_longPosVectorPosition(v_longPosVectorIut), // SOPV ? // sequence number ) ) @@ -830,7 +830,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwAnycastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), // SOPV + mw_longPosVectorPosition(v_longPosVectorIut), // SOPV ? // sequence number ) ) @@ -895,7 +895,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwShbPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), // SOPV + mw_longPosVectorPosition(v_longPosVectorIut), // SOPV 1 //MHL ) ) @@ -959,7 +959,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwPdu( mw_geoNwTsbPacket( ?, // sequence number - mw_longPosVectorPosition_withDelta(v_longPosVectorIut) // SOPV + mw_longPosVectorPosition(v_longPosVectorIut) // SOPV ) ) ) @@ -1897,14 +1897,14 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoBroadcast( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), v_expectedSequenceNumber) { tc_ac.stop; log("*** " & testcasename() & ": PASS: GBC packet received correctly ***"); f_selfOrClientSyncAndVerdict(c_tbDone, e_success); } [] a_receiveGeoBroadcast( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), v_expectedSequenceNumber) { tc_ac.stop; log("*** " & testcasename() & ": FAIL: GBC packet received with incorrect sequence number ***"); @@ -1958,7 +1958,7 @@ module ItsGeoNetworking_TpFunctions { alt { [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ? )))) -> value v_geoNwInd { tc_ac.stop; @@ -1980,7 +1980,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoBroadcast( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), v_expectedSequenceNumber) { tc_ac.stop; v_nbReceivedPackets := v_nbReceivedPackets + 1; @@ -1999,7 +1999,7 @@ module ItsGeoNetworking_TpFunctions { } } [] a_receiveGeoBroadcast( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?) { tc_ac.stop; log("*** " & testcasename() & ": FAIL: GBC packet received with incorrect sequence number ***"); @@ -2727,7 +2727,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwLsReplyPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)) ) ) @@ -2782,7 +2782,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwLsReplyPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)) ) ) @@ -4141,7 +4141,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?)))) -> value v_geoNetInd { tc_ac.stop; log("*** " & testcasename() & ": PASS: GBC packet received correctly ***"); @@ -4175,7 +4175,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?)))) -> value v_geoNetInd { tc_ac.stop; log("*** " & testcasename() & ": PASS: GBC packet received correctly ***"); @@ -4252,7 +4252,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start(1.0); alt { [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?)))) { tc_ac.stop; log("*** " & testcasename() & ": INCONC: GBC packet not buffered ***"); @@ -4269,7 +4269,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), v_expectedSequenceNumber)))) -> value v_geoNetInd { tc_ac.stop; v_nbReceivedPackets := v_nbReceivedPackets + 1; @@ -4284,7 +4284,7 @@ module ItsGeoNetworking_TpFunctions { } } [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?)))) { tc_ac.stop; log("*** " & testcasename() & ": FAIL: GBC packet received in incorrect order ***"); @@ -4322,7 +4322,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), v_expectedSequenceNumber)))) -> value v_geoNetInd { tc_ac.stop; v_nbReceivedPackets := v_nbReceivedPackets + 1; @@ -4337,7 +4337,7 @@ module ItsGeoNetworking_TpFunctions { } } [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?)))) { tc_ac.stop; log("*** " & testcasename() & ": FAIL: GBC packet received in incorrect order ***"); @@ -4417,7 +4417,7 @@ module ItsGeoNetworking_TpFunctions { alt { [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?)))) { tc_noac.stop; log("*** " & testcasename() & ": FAIL: GBC packet received ***"); @@ -4455,7 +4455,7 @@ module ItsGeoNetworking_TpFunctions { alt { [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?)))) { tc_noac.stop; log("*** " & testcasename() & ": FAIL: GBC packet received ***"); @@ -4650,7 +4650,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?)))) -> value v_geoNetInd { tc_ac.stop; @@ -4692,7 +4692,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?)))) { tc_ac.stop; log("*** " & testcasename() & ": PASS: GBC packet received correctly ***"); @@ -4898,7 +4898,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwAnycastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ? ) ) @@ -4944,7 +4944,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwAnycastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ? ) ) @@ -5019,7 +5019,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ? ) ) @@ -5065,7 +5065,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwBroadcastPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ? ) ) @@ -5141,7 +5141,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwPdu( mw_geoNwTsbPacket( ?, - mw_longPosVectorPosition_withDelta(v_longPosVectorIut) + mw_longPosVectorPosition(v_longPosVectorIut) ) ) ) @@ -5185,7 +5185,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwPdu( mw_geoNwTsbPacket( ?, - mw_longPosVectorPosition_withDelta(v_longPosVectorIut) + mw_longPosVectorPosition(v_longPosVectorIut) ) ) ) @@ -5259,7 +5259,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwShbPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut) + mw_longPosVectorPosition(v_longPosVectorIut) ) ) ) @@ -5302,7 +5302,7 @@ module ItsGeoNetworking_TpFunctions { mw_geoNwInd( mw_geoNwPdu( mw_geoNwShbPacket( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut) + mw_longPosVectorPosition(v_longPosVectorIut) ) ) ) @@ -7843,7 +7843,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoBroadcastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoBroadcastArea(c_area1)) { tc_ac.stop; @@ -7877,7 +7877,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoBroadcastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoBroadcastArea(c_area1)) { tc_ac.stop; @@ -7960,7 +7960,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoBroadcastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoBroadcastArea(c_area2)) { tc_ac.stop; @@ -7994,7 +7994,7 @@ module ItsGeoNetworking_TpFunctions { tc_noac.start; alt { [] a_receiveGeoBroadcastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoBroadcastArea(c_area2)) { tc_noac.stop; @@ -9212,7 +9212,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoBroadcastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoBroadcastArea(c_area1)) { tc_ac.stop; @@ -9246,7 +9246,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoBroadcastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoBroadcastArea(c_area1)) { tc_ac.stop; @@ -10736,7 +10736,7 @@ module ItsGeoNetworking_TpFunctions { [] geoNetworkingPort.receive( mw_geoNwInd( mw_geoNwPdu( - mw_geoNwShbPacket(mw_longPosVectorPosition_withDelta(v_longPosVectorIut)) + mw_geoNwShbPacket(mw_longPosVectorPosition(v_longPosVectorIut)) ) ) ) { @@ -10773,7 +10773,7 @@ module ItsGeoNetworking_TpFunctions { [] geoNetworkingPort.receive( mw_geoNwInd( mw_geoNwPdu( - mw_geoNwShbPacket(mw_longPosVectorPosition_withDelta(v_longPosVectorIut)) + mw_geoNwShbPacket(mw_longPosVectorPosition(v_longPosVectorIut)) ) ) ) { @@ -10910,7 +10910,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoAnycastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoAnycastArea(c_area1)) { tc_ac.stop; @@ -10944,7 +10944,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoAnycastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoAnycastArea(c_area1)) { tc_ac.stop; @@ -11027,7 +11027,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoAnycastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoAnycastArea(c_area2)) { tc_ac.stop; @@ -11061,7 +11061,7 @@ module ItsGeoNetworking_TpFunctions { tc_noac.start; alt { [] a_receiveGeoAnycastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoAnycastArea(c_area2)) { tc_noac.stop; @@ -12233,7 +12233,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoAnycastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoAnycastArea(c_area2)) { tc_ac.stop; @@ -12267,7 +12267,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoAnycastWithArea( - mw_longPosVectorPosition_withDelta(v_longPosVectorIut), + mw_longPosVectorPosition(v_longPosVectorIut), ?, f_getGeoAnycastArea(c_area2)) { tc_ac.stop; @@ -12317,11 +12317,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -12498,11 +12498,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -12687,11 +12687,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -12851,11 +12851,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -13007,11 +13007,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -13191,11 +13191,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -13352,11 +13352,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -13525,11 +13525,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -13716,11 +13716,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf06Up(); @@ -13840,11 +13840,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf05Up(); @@ -13968,11 +13968,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf06Up(); @@ -14124,11 +14124,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf05Up(); @@ -14240,11 +14240,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf05Up(); @@ -14371,11 +14371,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf05Up(); @@ -14541,11 +14541,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -14689,11 +14689,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -14831,11 +14831,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf05Up(); @@ -14991,11 +14991,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf04Up(); @@ -15158,11 +15158,11 @@ module ItsGeoNetworking_TpFunctions { stop; } - if (f_getGeoBroadcastCbfMinTime() < 300) { - log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); - setverdict(inconc); - stop; - } +// if (f_getGeoBroadcastCbfMinTime() < 300) { +// log("*** " & testcasename() & ": PICS_GN_GEOBROADCAST_CBF_MIN_TIME >= 300 required for executing the TC ***"); +// setverdict(inconc); +// stop; +// } // Test component configuration f_cf07Up(); @@ -15700,7 +15700,7 @@ module ItsGeoNetworking_TpFunctions { tc_ac.start; alt { [] a_receiveGeoBroadcast( - mw_longPosVectorPosition_withDelta(v_longPosVectorNodeC), + mw_longPosVectorPosition(v_longPosVectorNodeC), v_expectedSeqNumber ) { v_nbReceivedMessages := v_nbReceivedMessages + 1; @@ -15708,7 +15708,7 @@ module ItsGeoNetworking_TpFunctions { repeat; // repeat in any case => IUT may send more messages ! } [] a_receiveGeoBroadcast( - mw_longPosVectorPosition_withDelta(v_longPosVectorNodeC), + mw_longPosVectorPosition(v_longPosVectorNodeC), ? ) { tc_ac.stop; diff --git a/ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn b/ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn index 10563c5f1..ca555a825 100644 --- a/ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn +++ b/ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn @@ -76,7 +76,7 @@ module ItsIpv6OverGeoNetworking_TestCases { // Test component configuration f_cf01UpGn6(); - v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut)); + v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut)); v_addressesIut := f_getAddresses(c_compIut); v_addressesNodeB := f_getAddresses(c_compNodeB); @@ -180,7 +180,7 @@ module ItsIpv6OverGeoNetworking_TestCases { // Test component configuration f_cf01UpGn6(); - v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut)); + v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut)); v_addressesIut := f_getAddresses(c_compIut); // Test adapter configuration @@ -287,7 +287,7 @@ module ItsIpv6OverGeoNetworking_TestCases { // Test component configuration f_cf01UpGn6(); - v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut)); + v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut)); v_addressesIut := f_getAddresses(c_compIut); // Test adapter configuration @@ -401,7 +401,7 @@ module ItsIpv6OverGeoNetworking_TestCases { // Test component configuration f_cf01UpGn6(); - v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut)); + v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut)); v_addressesIut := f_getAddresses(c_compIut); v_longPosVectorNodeA := f_getPosition(c_compNodeA); v_addressesNodeA := f_getAddresses(c_compNodeA); @@ -532,7 +532,7 @@ module ItsIpv6OverGeoNetworking_TestCases { // Test component configuration f_cf01UpGn6(); - v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut)); + v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut)); v_addressesIut := f_getAddresses(c_compIut); v_longPosVectorNodeB := f_getPosition(c_compNodeB); v_addressesNodeB := f_getAddresses(c_compNodeB); @@ -667,7 +667,7 @@ module ItsIpv6OverGeoNetworking_TestCases { // Test component configuration f_cf01UpGn6(); - v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut)); + v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut)); v_addressesIut := f_getAddresses(c_compIut); v_longPosVectorNodeA := f_getPosition(c_compNodeA); v_addressesNodeA := f_getAddresses(c_compNodeA); @@ -706,7 +706,7 @@ module ItsIpv6OverGeoNetworking_TestCases { mw_geoNwInd( mw_geoNwPdu( mw_geoNwUnicastPacketWithNextHeader( - mw_shortPosVectorPosition_withDelta(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)), // On purpose: IUT should derive this value fron IPv6 address + mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)), // On purpose: IUT should derive this value fron IPv6 address ?, e_ipv6 ) @@ -801,7 +801,7 @@ module ItsIpv6OverGeoNetworking_TestCases { // Test component configuration f_cf01UpGn6(); - v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut)); + v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut)); v_addressesIut := f_getAddresses(c_compIut); v_longPosVectorNodeA := f_getPosition(c_compNodeA); v_addressesNodeA := f_getAddresses(c_compNodeA); @@ -839,7 +839,7 @@ module ItsIpv6OverGeoNetworking_TestCases { mw_geoNwInd( mw_geoNwPdu( mw_geoNwUnicastPacketWithNextHeader( - mw_shortPosVectorPosition_withDelta(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)), // On purpose: IUT should derive this value from SAP dest mac + mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)), // On purpose: IUT should derive this value from SAP dest mac ?, e_ipv6 ) @@ -929,7 +929,7 @@ module ItsIpv6OverGeoNetworking_TestCases { // Test component configuration f_cf01UpGn6(); - v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut)); + v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut)); v_addressesIut := f_getAddresses(c_compIut); v_longPosVectorNodeB := f_getPosition(c_compNodeB); v_addressesNodeB := f_getAddresses(c_compNodeB); diff --git a/ttcn/AtsSecurity/AtsSecurity_Templates.ttcn3 b/ttcn/AtsSecurity/AtsSecurity_Templates.ttcn3 index 23dd30174..d52296b32 100644 --- a/ttcn/AtsSecurity/AtsSecurity_Templates.ttcn3 +++ b/ttcn/AtsSecurity/AtsSecurity_Templates.ttcn3 @@ -37,7 +37,7 @@ module AtsSecurity_Templates { template (present) Payload mw_secCamPayload := { decodedPayload := { - btpPacket := mw_btpA( + btpPacket := mw_btpB( PX_DESTINATION_PORT, ?, mw_btpCamPayload diff --git a/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn3 b/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn3 index 113bc6778..4749fad73 100644 --- a/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn3 +++ b/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn3 @@ -93,8 +93,8 @@ module ItsSecurity_TestCases { var LongPosVector v_longPosVectorIut; // Test control - if (not(PICS_GN_SECURITY)) { - log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***"); + if (not(PICS_GN_SECURITY) or not(PICS_ITS_AID_OTHER_PROFILE)) { + log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_AID_OTHER_PROFILE' required for executing the TC ***"); stop; } @@ -632,6 +632,7 @@ module ItsSecurity_TestCases { for (var integer v_counter := 1; v_counter < lengthof(v_headersFields); v_counter := v_counter + 1) { // Check forbidden header + // FIXME: 'generation_time_with_confidence' does not exist. is it e_generation_time_standard_deviation ? if (match(v_headersFields[v_counter].type_, e_generation_time_standard_deviation)) { log("*** " & testcasename() & ": FAIL: Forbidden header present"); f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error); @@ -740,7 +741,7 @@ module ItsSecurity_TestCases { mw_header_field_signer_info_certificate )))) { tc_ac.stop; - t_minTransInterval.start; +// Removed in C2C t_minTransInterval.start; log("*** " & testcasename() & ": INFO: Initial conditions: First CAM message with certificate received ***"); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); } @@ -10712,7 +10713,7 @@ module ItsSecurity_TestCases { /** * @desc Check that IUT discards Secured CAM if the generation_time is more than 5 minute in the past (C2C only) * 
-             * Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE
+             * Pics Selection: PICS_GN_SECURITY
              * Config Id: CF01
              * Initial conditions:
              *  with {
@@ -10742,8 +10743,8 @@ module ItsSecurity_TestCases {
                 var GnRawPayload v_sentRawPayload;
                 
                 // Test adapter configuration
-                if (not(PICS_GN_SECURITY) or not(PICS_ITS_C2C_MODE)) {
-                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***");
+                if (not(PICS_GN_SECURITY)) {
+                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
                     stop;
                 }
                 
@@ -10790,7 +10791,7 @@ module ItsSecurity_TestCases {
             /**
              * @desc    Check that IUT discards Secured CAM if the generation_time is more than 5 minute in the future(C2C only)
              * 
-             * Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE
+             * Pics Selection: PICS_GN_SECURITY
              * Config Id: CF01
              * Initial conditions:
              *  with {
@@ -10820,8 +10821,8 @@ module ItsSecurity_TestCases {
                 var GnRawPayload v_sentRawPayload;
                 
                 // Test adapter configuration
-                if (not(PICS_GN_SECURITY) or not(PICS_ITS_C2C_MODE)) {
-                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***");
+                if (not(PICS_GN_SECURITY)) {
+                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
                     stop;
                 }
                 
@@ -15527,7 +15528,7 @@ module ItsSecurity_TestCases {
             /**
              * @desc    Check that IUT discards a Secured DENM if the generation_time is more than 10 minute in the past (C2C only)
              * 
-             * Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE
+             * Pics Selection: PICS_GN_SECURITY
              * Config Id: CF01
              * Initial conditions:
              * with { 
@@ -15558,8 +15559,8 @@ module ItsSecurity_TestCases {
                 var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB); // Use NodeB
                 
                 // Test adapter configuration
-                if (not(PICS_GN_SECURITY) or not(PICS_ITS_C2C_MODE)) {
-                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***");
+                if (not(PICS_GN_SECURITY)) {
+                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
                     stop;
                 }
                 
@@ -15606,7 +15607,7 @@ module ItsSecurity_TestCases {
             /**
              * @desc    Check that IUT discards a Secured DENM if the generation_time is more than 10 minute in the future(C2C only)
              * 
-             * Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE
+             * Pics Selection: PICS_GN_SECURITY
              * Config Id: CF01
              * Initial conditions:
              * with { 
@@ -15637,8 +15638,8 @@ module ItsSecurity_TestCases {
                 var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB); // Use NodeB
                 
                 // Test adapter configuration
-                if (not(PICS_GN_SECURITY) or not(PICS_ITS_C2C_MODE)) {
-                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***");
+                if (not(PICS_GN_SECURITY)) {
+                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
                     stop;
                 }
                 
@@ -16159,7 +16160,7 @@ module ItsSecurity_TestCases {
             /**
              * @desc    Check that IUT accepts a Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is 29.9 km (C2C only)
              * 
-             * Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE
+             * Pics Selection: PICS_GN_SECURITY
              * Config Id: CF01
              * Expected behavior:
              * with {
@@ -16193,8 +16194,8 @@ module ItsSecurity_TestCases {
                 
                 
                 // Test control
-                if (not(PICS_GN_SECURITY) or not(PICS_ITS_C2C_MODE)) {
-                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***");
+                if (not(PICS_GN_SECURITY)) {
+                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
                     stop;
                 }
                 
@@ -16253,7 +16254,7 @@ module ItsSecurity_TestCases {
             /**
              * @desc    Check that IUT discards Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is more than 30 km
              * 
-             * Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE
+             * Pics Selection: PICS_GN_SECURITY
              * Config Id: CF01
              * Expected behavior:
              * with {
@@ -16287,8 +16288,8 @@ module ItsSecurity_TestCases {
                 
                 
                 // Test control
-                if (not(PICS_GN_SECURITY) or not (PICS_ITS_C2C_MODE)) {
-                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***");
+                if (not(PICS_GN_SECURITY)) {
+                    log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
                     stop;
                 }
                 
@@ -18013,7 +18014,7 @@ module ItsSecurity_TestCases {
                                 mw_geoNwSecPdu(
                                     mdw_securedMessage_dummy, 
                                     mw_geoNwBroadcastPacketWithArea(
-                                        mw_longPosVectorPosition_withDelta(
+                                        mw_longPosVectorPosition(
                                             v_longPosVectorNodeB
                                         ),
                                         ?,
@@ -18064,7 +18065,7 @@ module ItsSecurity_TestCases {
                                 mw_geoNwSecPdu(
                                     mdw_securedMessage_dummy, 
                                     mw_geoNwBroadcastPacketWithArea(
-                                        mw_longPosVectorPosition_withDelta(
+                                        mw_longPosVectorPosition(
                                             v_longPosVectorIut
                                         ),
                                         ?,
@@ -20995,7 +20996,7 @@ module ItsSecurity_TestCases {
             /**
              * @desc    Check that IUT discards Secured GN Message if the generation_time is more than 10 minute in the past (C2C only)
              * 
-             * Pics Selection: PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE
+             * Pics Selection: PICS_GN_SECURITY and PICS_GN_GBC_SRC
              * Config Id: CF01
              * Initial conditions:
              * with { 
@@ -21024,8 +21025,8 @@ module ItsSecurity_TestCases {
                 var ItsGeoNetworking v_nodeD;
                 
                 // Test control
-                if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC) or not(PICS_ITS_C2C_MODE)) {
-                    log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE' required for executing the TC ***");
+                if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC)) {
+                    log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC' required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -21092,7 +21093,7 @@ module ItsSecurity_TestCases {
             /**
              * @desc    Check that IUT discards Secured GN Message if the generation_time is more than 10 minute in the future(C2C only)
              * 
-             * Pics Selection: PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE
+             * Pics Selection: PICS_GN_SECURITY and PICS_GN_GBC_SRC
              * Config Id: CF01
              * Initial conditions:
              * with { 
@@ -21121,8 +21122,8 @@ module ItsSecurity_TestCases {
                 var ItsGeoNetworking v_nodeD;
                 
                 // Test control
-                if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC) or not(PICS_ITS_C2C_MODE)) {
-                    log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE' required for executing the TC ***");
+                if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC)) {
+                    log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC' required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -21519,8 +21520,8 @@ module ItsSecurity_TestCases {
                 var ItsGeoNetworking v_nodeD;
                 
                 // Test control
-                if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC) or not(PICS_ITS_C2C_MODE)) {
-                    log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE' required for executing the TC ***");
+                if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC)) {
+                    log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC' required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -21547,7 +21548,7 @@ module ItsSecurity_TestCases {
             /**
              * @desc    Check that IUT accepts a Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is 29.9 km (C2C only)
              * 
-             * Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE
+             * Pics Selection: PICS_GN_SECURITY
              * Config Id: CF01
              * Expected behavior:
              * with {
@@ -21604,7 +21605,7 @@ module ItsSecurity_TestCases {
             /**
              * @desc    Check that IUT discards Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is more than 30 km
              * 
-             * Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE
+             * Pics Selection: PICS_GN_SECURITY
              * Config Id: CF01
              * Expected behavior:
              * with {
@@ -21633,8 +21634,8 @@ module ItsSecurity_TestCases {
                 var ItsGeoNetworking v_nodeD;
                 
                 // Test control
-                if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC) or not(PICS_ITS_C2C_MODE)) {
-                    log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE' required for executing the TC ***");
+                if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC)) {
+                    log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC' required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
diff --git a/ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn3 b/ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn3
index 08a494e27..3fcdfaf67 100644
--- a/ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn3
+++ b/ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn3
@@ -190,10 +190,6 @@ module ItsSecurity_TestControl {
             execute(TC_SEC_ITSS_RCV_CAM_05_05_BO());
             execute(TC_SEC_ITSS_RCV_CAM_06_01_BO());
             execute(TC_SEC_ITSS_RCV_CAM_06_02_BO());
-            if (PICS_ITS_C2C_MODE) {
-                execute(TC_SEC_ITSS_RCV_CAM_06_03_BO());
-                execute(TC_SEC_ITSS_RCV_CAM_06_04_BO());
-            }
             execute(TC_SEC_ITSS_RCV_CAM_07_01_BO());
             execute(TC_SEC_ITSS_RCV_CAM_07_02_BO());
             execute(TC_SEC_ITSS_RCV_CAM_09_02_BO());
@@ -250,10 +246,6 @@ module ItsSecurity_TestControl {
             execute(TC_SEC_ITSS_RCV_DENM_05_04_BO());
             execute(TC_SEC_ITSS_RCV_DENM_06_01_BO());
             execute(TC_SEC_ITSS_RCV_DENM_06_02_BO());
-            if (PICS_ITS_C2C_MODE) {
-                execute(TC_SEC_ITSS_RCV_DENM_06_03_BO());
-                execute(TC_SEC_ITSS_RCV_DENM_06_04_BO());
-            }
             execute(TC_SEC_ITSS_RCV_DENM_07_01_BO());
             execute(TC_SEC_ITSS_RCV_DENM_07_02_BO());
             if (PICS_USE_CIRCULAR_REGION) {
@@ -268,10 +260,6 @@ module ItsSecurity_TestControl {
             if (PICS_USE_IDENTIFIED_REGION) {
                 execute(TC_SEC_ITSS_RCV_DENM_08_04_BO());
             }
-            if (PICS_ITS_C2C_MODE) {
-                execute(TC_SEC_ITSS_RCV_DENM_08_05_BV());
-                execute(TC_SEC_ITSS_RCV_DENM_08_06_BO());
-            }
             execute(TC_SEC_ITSS_RCV_DENM_09_02_BO());
             execute(TC_SEC_ITSS_RCV_DENM_09_03_BO());
             execute(TC_SEC_ITSS_RCV_DENM_09_04_BO());
@@ -322,10 +310,6 @@ module ItsSecurity_TestControl {
                 execute(TC_SEC_ITSS_RCV_GENMSG_05_04_BO());
                 execute(TC_SEC_ITSS_RCV_GENMSG_06_01_BO());
                 execute(TC_SEC_ITSS_RCV_GENMSG_06_02_BO());
-                if (PICS_ITS_C2C_MODE) {
-                    execute(TC_SEC_ITSS_RCV_GENMSG_06_03_BO());
-                    execute(TC_SEC_ITSS_RCV_GENMSG_06_04_BO());
-                }
                 execute(TC_SEC_ITSS_RCV_GENMSG_07_01_BO());
                 if (PICS_USE_CIRCULAR_REGION) {
                     execute(TC_SEC_ITSS_RCV_GENMSG_08_01_BO());
@@ -339,10 +323,6 @@ module ItsSecurity_TestControl {
                 if (PICS_USE_IDENTIFIED_REGION) {
                     execute(TC_SEC_ITSS_RCV_GENMSG_08_04_BO());
                 }
-                if (PICS_ITS_C2C_MODE) {
-                    execute(TC_SEC_ITSS_RCV_GENMSG_08_05_BV());
-                    execute(TC_SEC_ITSS_RCV_GENMSG_08_06_BO());
-                }
                 execute(TC_SEC_ITSS_RCV_GENMSG_09_02_BO());
                 execute(TC_SEC_ITSS_RCV_GENMSG_09_03_BO());
                 execute(TC_SEC_ITSS_RCV_GENMSG_09_04_BO());
diff --git a/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn b/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn
index dcf9f26da..a8315d344 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn
@@ -16,7 +16,7 @@ module ItsSrem_TestControl {
     // Test Execution
     control {
         
-        if (not PICS_RSU) {
+        if (not PICS_RSU_ROLE) {
             
             if (PICS_SREM_GENERATION) {
                 
@@ -36,7 +36,7 @@ module ItsSrem_TestControl {
             
         }
         
-        if (PICS_RSU) {
+        if (PICS_RSU_ROLE) {
             
             if (PICS_SREM_GENERATION) {
                 
diff --git a/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn b/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
index 6a486cdda..13ea9f890 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
@@ -46,8 +46,8 @@ module ItsSrem_TpFunctions {
                     var SremInd v_sremInd;
                     
                     // Test control
-                    if (PICS_RSU or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -99,8 +99,8 @@ module ItsSrem_TpFunctions {
                     var SremInd v_sremInd;
                     
                     // Test control
-                    if (PICS_RSU or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -157,8 +157,8 @@ module ItsSrem_TpFunctions {
                     var integer i;
                     
                     // Test control
-                    if (PICS_RSU or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -333,8 +333,8 @@ module ItsSrem_TpFunctions {
                     var SremInd v_sremInd;
                     
                     // Test control
-                    if (PICS_RSU or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -417,8 +417,8 @@ module ItsSrem_TpFunctions {
                 var SsemReq   v_ssemReq;
                 var integer     i;
                     
-                if (PICS_RSU or not PICS_SSEM_RECEPTION) {
-                    log("*** " & testcasename() & ": not PICS_RSU and PICS_SSEM_RECEPTION required for executing the TC ***");
+                if (PICS_RSU_ROLE or not PICS_SSEM_RECEPTION) {
+                    log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SSEM_RECEPTION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -470,8 +470,8 @@ module ItsSrem_TpFunctions {
                     // Local variables
                     
                     // Test control
-                    if (PICS_RSU or not PICS_SREM_GENERATION) {
-                        log("*** " & testcasename() & ": not PICS_RSU  and PICS_SREM_GENERATION required for executing the TC ***");
+                    if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": not PICS_RSU_ROLE  and PICS_SREM_GENERATION required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }
@@ -532,8 +532,8 @@ module ItsSrem_TpFunctions {
                 var SremReq   v_sremReq;
                 var integer   i;
                     
-                if (PICS_RSU or not PICS_SREM_RECEPTION) {
-                    log("*** " & testcasename() & ": not PICS_RSU and PICS_SREM_RECEPTION required for executing the TC ***");
+                if (PICS_RSU_ROLE or not PICS_SREM_RECEPTION) {
+                    log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SREM_RECEPTION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
-- 
GitLab