From f8d2a982fb268301557a93671dc0b57601b9cf3f Mon Sep 17 00:00:00 2001 From: garciay Date: Mon, 7 Nov 2016 10:20:54 +0000 Subject: [PATCH] Update TCT3 patches --- patches/tct3_javasrc.patch | 134 ++++--- patches/tct3_ttcn.patch | 765 ++----------------------------------- 2 files changed, 102 insertions(+), 797 deletions(-) diff --git a/patches/tct3_javasrc.patch b/patches/tct3_javasrc.patch index 486c1886d..50eaa4b1d 100644 --- a/patches/tct3_javasrc.patch +++ b/patches/tct3_javasrc.patch @@ -1,6 +1,6 @@ Index: adapter/org/etsi/its/adapter/TestAdapter.java =================================================================== ---- adapter/org/etsi/its/adapter/TestAdapter.java (revision 2573) +--- adapter/org/etsi/its/adapter/TestAdapter.java (revision 2612) +++ adapter/org/etsi/its/adapter/TestAdapter.java (working copy) @@ -20,7 +20,6 @@ import org.etsi.its.adapter.ports.ProtocolPortFactory; @@ -63,9 +63,72 @@ Index: adapter/org/etsi/its/adapter/TestAdapter.java + return null; + } } +Index: certificatesio/org/etsi/certificates/io/CertificatesIO.java +=================================================================== +--- certificatesio/org/etsi/certificates/io/CertificatesIO.java (revision 2612) ++++ certificatesio/org/etsi/certificates/io/CertificatesIO.java (working copy) +@@ -149,7 +149,7 @@ + */ + @Override + public boolean readCertificate(final String key, final ByteArrayOutputStream certificate) { +-// TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificate: " + key); ++ TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificate: " + key); + + String certKey; + if (_cachedReverseCertificatesDigest.containsKey(key)) { +@@ -173,7 +173,7 @@ + + @Override + public boolean readCertificateDigest(final String certificateId, final ByteArrayOutputStream digest) { +-// TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificateDigest: " + certificateId); ++ TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificateDigest: " + certificateId); + + // Sanity check + if (!_cachedCertificatesDigest.containsKey(certificateId)) { +@@ -199,7 +199,7 @@ + */ + @Override + public boolean readSigningKey(final String keyName, final ByteArrayOutputStream key) { +-// TERFactory.getInstance().logDebug(">>> CertificatesIO.readSigningKey: " + keyName); ++ TERFactory.getInstance().logDebug(">>> CertificatesIO.readSigningKey: " + keyName); + + try { + String certKey; +@@ -305,11 +305,11 @@ + return; + } + _cachedCertificatesDigest.put(certName, bytes); +-// TERFactory.getInstance().logDebug("CertificatesIO.addDigestItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName); ++ TERFactory.getInstance().logDebug("CertificatesIO.addDigestItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName); + } + + private void addCertItem(final File p_certFile) throws FileNotFoundException, IOException { +-// TERFactory.getInstance().logDebug(">>> CertificatesIO.addItem: " + p_certFile); ++ TERFactory.getInstance().logDebug(">>> CertificatesIO.addCertItem: " + p_certFile); + + // Load the keys file name + String filename = p_certFile.getName(); +@@ -322,14 +322,14 @@ + fsKeys.close(); + bytes = ByteHelper.hexStringToByteArray(new String(bytes)); + _cachedCertificates.put(certName, bytes); +-// TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store cert " + certName + " - " + ByteHelper.byteArrayToString(bytes)); ++ TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store cert " + certName + " - " + ByteHelper.byteArrayToString(bytes)); + + // calculate digest + bytes = calculateDigestFromCertificate(bytes); + _cachedCertificatesDigest.put(certName, bytes); +-// TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName); ++ TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName); + _cachedReverseCertificatesDigest.put(ByteHelper.byteArrayToString(bytes), certName); +-// TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store reverse digest " + ByteHelper.byteArrayToString(bytes) + " - " + certName); ++ TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store reverse digest " + ByteHelper.byteArrayToString(bytes) + " - " + certName); + + // Load Private Keys + filename = p_certFile.getPath(); Index: codec/org/etsi/ttcn/codec/CodecFactory.java =================================================================== ---- codec/org/etsi/ttcn/codec/CodecFactory.java (revision 2573) +--- codec/org/etsi/ttcn/codec/CodecFactory.java (revision 2612) +++ codec/org/etsi/ttcn/codec/CodecFactory.java (working copy) @@ -83,7 +83,7 @@ if(codec != null) { @@ -102,7 +165,7 @@ Index: codec/org/etsi/ttcn/codec/CodecFactory.java return ctor.newInstance(mainCodec); Index: codec/org/etsi/ttcn/codec/MainCodec.java =================================================================== ---- codec/org/etsi/ttcn/codec/MainCodec.java (revision 2573) +--- codec/org/etsi/ttcn/codec/MainCodec.java (revision 2612) +++ codec/org/etsi/ttcn/codec/MainCodec.java (working copy) @@ -67,6 +67,8 @@ @@ -113,68 +176,3 @@ Index: codec/org/etsi/ttcn/codec/MainCodec.java CodecFactory cf = CodecFactory.getInstance(); TciCDProvided extCodec = cf.getExternalCodec(value.getValueEncoding()); -Index: tool/org/etsi/its/tool/elvior/res/ta.properties -=================================================================== ---- tool/org/etsi/its/tool/elvior/res/ta.properties (revision 2573) -+++ tool/org/etsi/its/tool/elvior/res/ta.properties (working copy) -@@ -1,12 +1,12 @@ - # Debug level - Authorized values: OFF, ALL, INFO, SEVERE - DEBUG_ENABLED=OFF - # Define the port/layer configuration for CAM --#camPort=BTP/GN/ETH --camPort=BTP/GN/UdpIpCSG -+camPort=BTP/GN/ETH -+#camPort=BTP/GN/UdpIpCSG - #camPort=BTP/GN/CSG - # Define the port/layer configuration for DENM --#denmPort=BTP/GN/ETH --denmPort=BTP/GN/UdpIpCSG -+denmPort=BTP/GN/ETH -+#denmPort=BTP/GN/UdpIpCSG - #denmPort=BTP/GN/CSG - # Define the port/layer configuration for MAPEM-SPATEM - mapemSpatemPort=BTP/GN/ETH -@@ -32,7 +32,7 @@ - #fsapPort=FSAP/UdpIp - #fsapPort=FSAP/UdpIp - --# Commsignia RSU/OBU Simulator -+# Commsignia RSU and OBU Simulator - #UpperTesterSettings=10.200.1.101:12345 - # Commsignia Wireless OBU - UpperTesterSettings=80.98.62.165:18502 -@@ -60,9 +60,10 @@ - #LocalEthernetMAC=0022191B7FDB - # G5 bridge connected on USB3/Ethernet - #LocalEthernetMAC=00E08F008855 --# Post-mortem ATS execution mode -+# Post-mortem ATS execution mode (G5 raw Ethernet only) - OfflineMode=false --PcapFile=pcap/vendor/Livorno 20160914-2 DENM Full packet.pcap -+#PcapFile=pcap/vendor/Livorno 20160914-2 DENM Full packet.pcap -+PcapFile=F:/FSCOM/ETSI/ITS/STF517_ITS_Valid_Conform_Frmwk.2016/ITS-CMS5 PreQ/Savari/TC_SEC_ITSS_SND_MSG_01_01_BV.pcap - # Start at time in seconds since 1970-01-01, e.g. 1421661427.233361 - OffsetTime=0 - # Define the Ethernet type value used by the IUT -@@ -92,15 +93,15 @@ - # Interval between each beacon sent by TS (ms) - TsBeaconInterval=1000 - # Latitude of Test System --#Commsignia --TsLatitude=514744250 -+#Commsignia TsLatitude=514744250 - #Yogoko TsLatitude=481210840 --#Livorno TsLatitude=43551050 -+#Livorno -+TsLatitude=43551050 - # Longitude of Test System --#Commsignia --TsLongitude=56240550 -+#Commsignia TsLongitude=56240550 - # Yogoko TsLongitude=-16287930 --#Livorno TsLongitude=10298730 -+#Livorno -+TsLongitude=10298730 - # Secured mode status - UtSecuredMode=false - # Secured configuration identifier diff --git a/patches/tct3_ttcn.patch b/patches/tct3_ttcn.patch index b4a1e0ccf..e9fb4f4f8 100644 --- a/patches/tct3_ttcn.patch +++ b/patches/tct3_ttcn.patch @@ -1,192 +1,6 @@ -Index: AtsCAM/ItsCam_TestControl.ttcn -=================================================================== ---- AtsCAM/ItsCam_TestControl.ttcn (revision 2577) -+++ AtsCAM/ItsCam_TestControl.ttcn (working copy) -@@ -17,98 +17,98 @@ - control { - - if(PICS_CAM_GENERATION) { -- execute(TC_CAM_MSD_FMT_BV_01()); -- if (not PICS_RSU) { -- execute(TC_CAM_MSD_FMT_BV_02()); -- execute(TC_CAM_MSD_FMT_BV_03()); -- execute(TC_CAM_MSD_FMT_BV_04()); -- execute(TC_CAM_MSD_FMT_BV_05()); -- execute(TC_CAM_MSD_INA_BV_01_01()); -- execute(TC_CAM_MSD_INA_BV_01_02()); -- execute(TC_CAM_MSD_INA_BV_01_03()); -- execute(TC_CAM_MSD_INA_BV_01_04()); -- execute(TC_CAM_MSD_INA_BV_01_05()); -- execute(TC_CAM_MSD_INA_BV_01_06()); -- execute(TC_CAM_MSD_INA_BV_01_07()); -- execute(TC_CAM_MSD_INA_BV_01_08()); -- execute(TC_CAM_MSD_INA_BV_01_09()); -- execute(TC_CAM_MSD_INA_BV_01_10()); -- execute(TC_CAM_MSD_INA_BV_01_11()); -- execute(TC_CAM_MSD_INA_BV_01_12()); -- execute(TC_CAM_MSD_INA_BV_01_13()); -- execute(TC_CAM_MSD_INA_BV_01_14()); -- execute(TC_CAM_MSD_INA_BV_01_15()); -- execute(TC_CAM_MSD_INA_BV_01_16()); -- execute(TC_CAM_MSD_INA_BV_01_17()); -- execute(TC_CAM_MSD_INA_BV_01_18()); -- execute(TC_CAM_MSD_INA_BV_01_19()); -- execute(TC_CAM_MSD_INA_BV_01_20()); -- execute(TC_CAM_MSD_INA_BV_01_21()); -- execute(TC_CAM_MSD_INA_BV_01_22()); -- execute(TC_CAM_MSD_INA_BV_01_23()); -- execute(TC_CAM_MSD_INA_BV_01_24()); -- execute(TC_CAM_MSD_INA_BV_01_25()); -- execute(TC_CAM_MSD_INA_BV_01_26()); -- execute(TC_CAM_MSD_INA_BV_01_27()); -- execute(TC_CAM_MSD_INA_BV_01_28()); -- execute(TC_CAM_MSD_INA_BV_01_29()); -- execute(TC_CAM_MSD_INA_BV_01_30()); -- execute(TC_CAM_MSD_INA_BV_01_31()); -- execute(TC_CAM_MSD_INA_BV_01_32()); -- execute(TC_CAM_MSD_INA_BV_01_33()); -- execute(TC_CAM_MSD_INA_BV_01_34()); -- execute(TC_CAM_MSD_INA_BV_01_35()); -- } -- if (PICS_PUBLICTRANS) { -- execute(TC_CAM_MSD_INA_BV_02()); -- } -- if (PICS_SPECIALTRANS) { -- execute(TC_CAM_MSD_INA_BV_03()); -- } -- if (PICS_DANGEROUSGOODS) { -- execute(TC_CAM_MSD_INA_BV_04()); -- } -- if (PICS_ROADWORKS) { -- execute(TC_CAM_MSD_INA_BV_05()); -- } -- if (PICS_RESCUE) { -- execute(TC_CAM_MSD_INA_BV_06()); -- } -- if (PICS_EMERGENCY) { -- execute(TC_CAM_MSD_INA_BV_07()); -- } -- if (PICS_SAFETY_CAR) { -- execute(TC_CAM_MSD_INA_BV_08()); -- } -- -- execute(TC_CAM_MSD_GFQ_TI_01()); -- execute(TC_CAM_MSD_GFQ_TI_02()); -- execute(TC_CAM_MSD_GFQ_TI_03()); -- execute(TC_CAM_MSD_GFQ_BV_04()); -- execute(TC_CAM_MSD_GFQ_BV_05()); -- execute(TC_CAM_MSD_GFQ_BV_06()); -- execute(TC_CAM_MSD_GFQ_TI_07()); -- execute(TC_CAM_MSD_GFQ_TI_08()); -- -- execute(TC_CAM_MSD_PAR_BV_01()); -- execute(TC_CAM_MSD_PAR_BV_02()); -- execute(TC_CAM_MSD_PAR_BV_03()); -- -- if (PICS_IS_IUT_SECURED) { -+ if (not PICS_IS_IUT_SECURED) { -+ /*execute(TC_CAM_MSD_FMT_BV_01());*/ -+ if (not PICS_RSU) { -+ /*execute(TC_CAM_MSD_FMT_BV_02()); -+ execute(TC_CAM_MSD_FMT_BV_03());*/ -+ /*execute(TC_CAM_MSD_FMT_BV_04()); -+ execute(TC_CAM_MSD_FMT_BV_05()); -+ execute(TC_CAM_MSD_INA_BV_01_01()); -+ execute(TC_CAM_MSD_INA_BV_01_02()); -+ execute(TC_CAM_MSD_INA_BV_01_03()); -+ execute(TC_CAM_MSD_INA_BV_01_04()); -+ execute(TC_CAM_MSD_INA_BV_01_05()); -+ execute(TC_CAM_MSD_INA_BV_01_06()); -+ execute(TC_CAM_MSD_INA_BV_01_07()); -+ execute(TC_CAM_MSD_INA_BV_01_08()); -+ execute(TC_CAM_MSD_INA_BV_01_09()); -+ execute(TC_CAM_MSD_INA_BV_01_10()); -+ execute(TC_CAM_MSD_INA_BV_01_11()); -+ execute(TC_CAM_MSD_INA_BV_01_12()); -+ execute(TC_CAM_MSD_INA_BV_01_13()); -+ execute(TC_CAM_MSD_INA_BV_01_14()); -+ execute(TC_CAM_MSD_INA_BV_01_15()); -+ execute(TC_CAM_MSD_INA_BV_01_16()); -+ execute(TC_CAM_MSD_INA_BV_01_17()); -+ execute(TC_CAM_MSD_INA_BV_01_18()); -+ execute(TC_CAM_MSD_INA_BV_01_19()); -+ execute(TC_CAM_MSD_INA_BV_01_20()); -+ execute(TC_CAM_MSD_INA_BV_01_21()); -+ execute(TC_CAM_MSD_INA_BV_01_22()); -+ execute(TC_CAM_MSD_INA_BV_01_23()); -+ execute(TC_CAM_MSD_INA_BV_01_24()); -+ execute(TC_CAM_MSD_INA_BV_01_25()); -+ execute(TC_CAM_MSD_INA_BV_01_26()); -+ execute(TC_CAM_MSD_INA_BV_01_27()); -+ execute(TC_CAM_MSD_INA_BV_01_28()); -+ execute(TC_CAM_MSD_INA_BV_01_29()); -+ execute(TC_CAM_MSD_INA_BV_01_30()); -+ execute(TC_CAM_MSD_INA_BV_01_31()); -+ execute(TC_CAM_MSD_INA_BV_01_32()); -+ execute(TC_CAM_MSD_INA_BV_01_33()); -+ execute(TC_CAM_MSD_INA_BV_01_34()); -+ execute(TC_CAM_MSD_INA_BV_01_35());*/ -+ } - if (PICS_PUBLICTRANS) { -- execute(TC_CAM_MSD_SSP_BO_02()); -+ execute(TC_CAM_MSD_INA_BV_02()); - } - if (PICS_SPECIALTRANS) { -+ execute(TC_CAM_MSD_INA_BV_03()); -+ } -+ if (PICS_DANGEROUSGOODS) { -+ execute(TC_CAM_MSD_INA_BV_04()); -+ } -+ if (PICS_ROADWORKS) { -+ execute(TC_CAM_MSD_INA_BV_05()); -+ } -+ if (PICS_RESCUE) { -+ execute(TC_CAM_MSD_INA_BV_06()); -+ } -+ if (PICS_EMERGENCY) { -+ execute(TC_CAM_MSD_INA_BV_07()); -+ } -+ if (PICS_SAFETY_CAR) { -+ execute(TC_CAM_MSD_INA_BV_08()); -+ } -+ -+ /*execute(TC_CAM_MSD_GFQ_TI_01()); -+ execute(TC_CAM_MSD_GFQ_TI_02());*/ -+ /*execute(TC_CAM_MSD_GFQ_TI_03()); -+ execute(TC_CAM_MSD_GFQ_BV_04()); -+ execute(TC_CAM_MSD_GFQ_BV_05()); -+ execute(TC_CAM_MSD_GFQ_BV_06()); -+ execute(TC_CAM_MSD_GFQ_TI_07()); -+ execute(TC_CAM_MSD_GFQ_TI_08()); -+ -+ execute(TC_CAM_MSD_PAR_BV_01()); -+ execute(TC_CAM_MSD_PAR_BV_02()); -+ execute(TC_CAM_MSD_PAR_BV_03());*/ -+ } else { -+ if (PICS_PUBLICTRANS and PICS_SPECIALVEHICLECONTAINER) { - execute(TC_CAM_MSD_SSP_BO_02()); - } -+ if (PICS_SPECIALTRANS and PICS_SPECIALVEHICLECONTAINER) { -+ execute(TC_CAM_MSD_SSP_BO_03()); -+ } - } - } - - if(PICS_CAM_RECEPTION) { -- execute(TC_CAM_MSP_BV_01()); -- -- if (PICS_IS_IUT_SECURED) { -- execute(TC_CAM_MSP_SSP_BV_02()); -+ if (not PICS_IS_IUT_SECURED) { -+ execute(TC_CAM_MSP_BV_01()); -+ } else { -+ /*execute(TC_CAM_MSP_SSP_BV_02());*/ - execute(TC_CAM_MSP_SSP_BV_03()); - } - } Index: AtsCAM/ItsCam_TpFunctions.ttcn =================================================================== ---- AtsCAM/ItsCam_TpFunctions.ttcn (revision 2577) +--- AtsCAM/ItsCam_TpFunctions.ttcn (revision 2612) +++ AtsCAM/ItsCam_TpFunctions.ttcn (working copy) @@ -1061,7 +1061,7 @@ f_CAM_MSD_INA_BV_01( @@ -283,522 +97,19 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn camPort.send( v_camReq ) ; f_sleep(PX_TNOAC); -Index: AtsDENM/ItsDenm_TestControl.ttcn -=================================================================== ---- AtsDENM/ItsDenm_TestControl.ttcn (revision 2577) -+++ AtsDENM/ItsDenm_TestControl.ttcn (working copy) -@@ -17,16 +17,16 @@ - control { - - if(PICS_DENM_GENERATION) { -- execute(TC_DEN_MSGF_BV_01()); -- execute(TC_DEN_MSGF_BV_02()); -+ /*execute(TC_DEN_MSGF_BV_01()); -+ execute(TC_DEN_MSGF_BV_02());*/ - -- execute(TC_DEN_EVGN_BV_01()); -- execute(TC_DEN_EVGN_BV_02()); -- execute(TC_DEN_EVGN_BV_03()); -+ /*execute(TC_DEN_EVGN_BV_01()); -+ execute(TC_DEN_EVGN_BV_02());*/ -+ /*execute(TC_DEN_EVGN_BV_03()); - execute(TC_DEN_EVGN_BV_04()); - execute(TC_DEN_EVGN_BV_05()); - execute(TC_DEN_EVGN_BV_07()); -- execute(TC_DEN_EVGN_BV_10()); -+ execute(TC_DEN_EVGN_BV_10());*/ - } - - if(PICS_DENM_UPDATE) { -@@ -54,42 +54,42 @@ - } - - if(PICS_DENM_REPETITION) { -- execute(TC_DEN_EVRP_TI_01()); -+ /*execute(TC_DEN_EVRP_TI_01()); - execute(TC_DEN_EVRP_BV_02()); - execute(TC_DEN_EVRP_BV_03()); - execute(TC_DEN_EVRP_BV_04()); - execute(TC_DEN_EVRP_BV_05()); -- execute(TC_DEN_EVRP_BV_06()); -- execute(TC_DEN_EVRP_BV_08()); -+ execute(TC_DEN_EVRP_BV_06());*/ -+ /*execute(TC_DEN_EVRP_BV_08()); - execute(TC_DEN_EVRP_BV_09()); - execute(TC_DEN_EVRP_BV_10()); -- execute(TC_DEN_EVRP_BV_11()); -+ execute(TC_DEN_EVRP_BV_11());*/ - } - - if(PICS_DENM_GENERATION) { -- execute(TC_DEN_PAR_BV_01()); -- execute(TC_DEN_PAR_BV_02()); -+ /*execute(TC_DEN_PAR_BV_01()); -+ execute(TC_DEN_PAR_BV_02());*/ - } - - if(PICS_IS_IUT_SECURED) { -- execute(TC_DEN_SSP_BV_01()); -- execute(TC_DEN_SSP_BV_02()); -+ /*execute(TC_DEN_SSP_BV_01()); -+ execute(TC_DEN_SSP_BV_02());*/ - } - - if(PICS_DENM_RECEPTION) { -- execute(TC_DEN_MSRV_BV_01()); -+ /*execute(TC_DEN_MSRV_BV_01()); - execute(TC_DEN_MSRV_BV_02()); - execute(TC_DEN_MSRV_BO_03()); - execute(TC_DEN_MSRV_BO_04()); - execute(TC_DEN_MSRV_BO_05()); - execute(TC_DEN_MSRV_BO_06()); -- execute(TC_DEN_MSRV_BV_07()); -+ execute(TC_DEN_MSRV_BV_07());*/ - - if(PICS_IS_IUT_SECURED) { -- execute(TC_DEN_MSRV_BO_08_01()); -- execute(TC_DEN_MSRV_BO_08_02()); -+ /*execute(TC_DEN_MSRV_BO_08_01()); -+ execute(TC_DEN_MSRV_BO_08_02());*/ - -- execute(TC_DEN_MSRV_BO_09_01()); -+ /*execute(TC_DEN_MSRV_BO_09_01());*/ - execute(TC_DEN_MSRV_BO_09_02()); - } - if(PICS_IMPACT_REDUCTION) { -Index: AtsDENM/ItsDenm_TpFunctions.ttcn -=================================================================== ---- AtsDENM/ItsDenm_TpFunctions.ttcn (revision 2577) -+++ AtsDENM/ItsDenm_TpFunctions.ttcn (working copy) -@@ -802,9 +802,12 @@ - f_utTriggerEvent(m_utTriggerEvent(v_situation)); - f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd); - v_timestampIts := f_getCurrentTime(); -+ log("v_timestampIts: ", v_timestampIts); - v_actionId := v_denmInd.msgIn.denm.management.actionID; - v_referenceTime1 := v_denmInd.msgIn.denm.management.referenceTime; -+ log("v_referenceTime1: ", v_referenceTime1); - v_diff := v_timestampIts - v_referenceTime1; -+ log("v_diff: ", v_diff); - f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); - - // Test Body -@@ -827,7 +830,9 @@ - ) -> value v_denmInd { - tc_ac.stop; - v_timestampIts := f_getCurrentTime(); -+ log("v_timestampIts: ", v_timestampIts); - v_msgtimestamp := v_denmInd.msgIn.denm.management.referenceTime; -+ log("v_msgtimestamp: ", v_msgtimestamp); - if ( ( ( v_timestampIts + v_diff ) > v_msgtimestamp ) and ( v_msgtimestamp > v_referenceTime1 ) ) { - log("*** " & testcasename() & ": PASS: Successfully received expected DENM. ***"); - f_selfOrClientSyncAndVerdict(c_tbDone, e_success); -@@ -1535,8 +1540,7 @@ - const float c_upperRepetitionInterval := int2float(c_repetitionInterval)*1.05; - // Local variables - var template (value) SituationContainer v_situation := m_situation(CauseCodeType_vehicleBreakdown_, VehicleBreakdownSubCauseCode_unavailable_); -- var template (present) DenmInd v_expectedDenmInd := -- mw_denmInd(mw_denmPdu(mw_denm( mw_denmMgmtCon( mw_actionId, -, -, c_validityDuration)))); -+ var template (present) DenmInd v_expectedDenmInd := mw_denmInd(mw_denmPdu(mw_denm( mw_denmMgmtCon( mw_actionId, -, -, c_validityDuration)))); - var ActionID v_actionId; - var DenmInd v_denmInd; - // Local timers -@@ -2901,6 +2905,16 @@ - m_denmLocation_zeroDelta - ) - ); -+ f_sleep(PX_LOOP); -+ v_actionId := f_sendDenMessage( -+ m_denm( -+ m_denmMgmtCon( -+ m_tsActionId -+ ), -+ p_situation, -+ m_denmLocation_zeroDelta -+ ) -+ ); - - f_sleep(PX_TNOAC); - for ( i := 0; i < lengthof(vc_utEvents) and not match(v_actionId, vc_utEvents[i].denMsg.denm.management.actionID); i := i + 1) { -@@ -2924,7 +2938,7 @@ - function f_DEN_MSRV_BO_08_01 () runs on ItsDenm { - - f_DEN_MSRV_BO_08_XX( -- "CERT_TS_DENM_01", -+ "CERT_TS_DENM_BO_01_AT", - m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_unavailable_) - ); - } -@@ -2932,7 +2946,7 @@ - function f_DEN_MSRV_BO_08_02 () runs on ItsDenm { - - f_DEN_MSRV_BO_08_XX( -- "CERT_TS_DENM_02", -+ "CERT_TS_DENM_BO_02_AT", - m_situation(CauseCodeType_accident_, AccidentSubCauseCode_unavailable_) - ); - } -@@ -2980,6 +2994,7 @@ - ); - - f_sleep(1.0); -+ vc_utEvents := {}; - - // instruct adapter to use p_certName to sign message - if(e_success != f_acTriggerSecEvent(m_acEnableSecurity(p_certName))) { -@@ -3025,7 +3040,7 @@ - function f_DEN_MSRV_BO_09_01 () runs on ItsDenm { - - f_DEN_MSRV_BO_09_XX( -- "CERT_TS_DENM_01", -+ "CERT_TS_DENM_BO_01_AT", - m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_unavailable_), - m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_trafficJamIncreasing_) - ); -@@ -3034,7 +3049,7 @@ - function f_DEN_MSRV_BO_09_02 () runs on ItsDenm { - - f_DEN_MSRV_BO_09_XX( -- "CERT_TS_DENM_02", -+ "CERT_TS_DENM_BO_02_AT", - m_situation(CauseCodeType_accident_, AccidentSubCauseCode_unavailable_), - m_situation(CauseCodeType_accident_, AccidentSubCauseCode_multiVehicleAccident_) - ); -Index: AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn -=================================================================== ---- AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn (revision 2577) -+++ AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn (working copy) -@@ -6,6 +6,8 @@ - * - */ - module ItsGeoNetworking_TestControl { -+ // LibCommon -+ import from LibCommon_Time all; - - // ATS GeoNetworking - import from ItsGeoNetworking_TestCases {testcase all}; -@@ -20,47 +22,47 @@ - /* FDV */ - - if(PICS_GN_BASIC_HEADER) { -- execute(TC_GEONW_FDV_BAH_BV_01()); -+ /*execute(TC_GEONW_FDV_BAH_BV_01());*/ - execute(TC_GEONW_FDV_BAH_BI_02()); - } - - if(PICS_GN_COMMON_HEADER) { -- execute(TC_GEONW_FDV_COH_BV_01()); -+ /*execute(TC_GEONW_FDV_COH_BV_01()); - execute(TC_GEONW_FDV_COH_BV_02()); -- execute(TC_GEONW_FDV_COH_BV_03()); -- execute(TC_GEONW_FDV_COH_BO_04()); -+ execute(TC_GEONW_FDV_COH_BV_03());*/ -+ /*execute(TC_GEONW_FDV_COH_BO_04());*/ - } - - if(PICS_GN_BEACON_SRC) { -- execute(TC_GEONW_FDV_BEA_BV_01()); -+ /*execute(TC_GEONW_FDV_BEA_BV_01()); - execute(TC_GEONW_FDV_BEA_BV_02()); -- execute(TC_GEONW_FDV_BEA_BV_03()); -- execute(TC_GEONW_FDV_BEA_BV_04()); -+ execute(TC_GEONW_FDV_BEA_BV_03());*/ -+ /*execute(TC_GEONW_FDV_BEA_BV_04());*/ - } - - if(PICS_GN_GUC_SRC) { -- execute(TC_GEONW_FDV_GUC_BV_01()); -+ /*execute(TC_GEONW_FDV_GUC_BV_01());*/ - } - - if(PICS_GN_GBC_SRC) { -- execute(TC_GEONW_FDV_GBC_BV_01()); -+ /*execute(TC_GEONW_FDV_GBC_BV_01());*/ - } - - if(PICS_GN_GAC_SRC) { -- execute(TC_GEONW_FDV_GAC_BV_01()); -+ /*execute(TC_GEONW_FDV_GAC_BV_01());*/ - } - - if(PICS_GN_SHB_SRC) { -- execute(TC_GEONW_FDV_SHB_BV_01()); -+ /*execute(TC_GEONW_FDV_SHB_BV_01());*/ - } - - if(PICS_GN_TSB_SRC) { -- execute(TC_GEONW_FDV_TSB_BV_01()); -+ /*execute(TC_GEONW_FDV_TSB_BV_01());*/ - } - - /* PON/LOT */ - -- if(PICS_GN_GUC_SRC and PICS_GN_BEACON_DST) { -+ /*if(PICS_GN_GUC_SRC and PICS_GN_BEACON_DST) { - execute(TC_GEONW_PON_LOT_BV_01()); - } - -@@ -130,24 +132,24 @@ - - if(PICS_GN_LS_REP_DST) { - execute(TC_GEONW_PON_LOT_BV_05_07()); -- } -+ }*/ - - /* PON/LPV */ - -- if(PICS_GN_BEACON_SRC) { -+ /*if(PICS_GN_BEACON_SRC) { - execute(TC_GEONW_PON_LPV_BV_01()); -- } -+ }*/ - - /* PON/SQN */ - - if(PICS_GN_GBC_SRC) { -- execute(TC_GEONW_PON_SQN_BV_01()); -- execute(TC_GEONW_PON_SQN_BV_02()); -+ /*execute(TC_GEONW_PON_SQN_BV_01()); -+ execute(TC_GEONW_PON_SQN_BV_02());*/ - } - - /* PON/LOS */ - -- if(PICS_GN_LS_REQ_SRC) { -+ /*if(PICS_GN_LS_REQ_SRC) { - execute(TC_GEONW_PON_LOS_BV_01()); - execute(TC_GEONW_PON_LOS_BV_02()); - if(PICS_GN_LS_REP_DST) { -@@ -179,11 +181,11 @@ - execute(TC_GEONW_PON_LOS_BV_15()); - execute(TC_GEONW_PON_LOS_BV_16()); - execute(TC_GEONW_PON_LOS_BV_17()); -- } -+ }*/ - - /* PON/FPB */ - -- if(PICS_GN_GUC_SRC) { -+ /*if(PICS_GN_GUC_SRC) { - execute(TC_GEONW_PON_FPB_BV_01()); - execute(TC_GEONW_PON_FPB_BV_02()); - execute(TC_GEONW_PON_FPB_BV_03()); -@@ -238,11 +240,11 @@ - - if(PICS_GN_TSB_SRC) { - execute(TC_GEONW_PON_FPB_BV_12_04()); -- } -+ }*/ - - /* PON/GNA */ - -- if(PICS_GN_ADDR_AUTO) { -+ /*if(PICS_GN_ADDR_AUTO) { - if (PICS_GN_LOCAL_ADDR_CONF_METHOD == e_auto) { - execute(TC_GEONW_PON_GNA_BV_01()); - } -@@ -250,18 +252,18 @@ - - if(PICS_GN_DAD) { - execute(TC_GEONW_PON_GNA_BV_02()); -- } -+ }*/ - - /* PON/BEA */ - -- if(PICS_GN_BEACON_SRC) { -+ /*if(PICS_GN_BEACON_SRC) { - execute(TC_GEONW_PON_BEA_TI_01()); - execute(TC_GEONW_PON_BEA_TI_02()); -- } -+ }*/ - - /* PON/GUC */ - -- if(PICS_GN_GUC_SRC) { -+ /*if(PICS_GN_GUC_SRC) { - if ((PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_unspecified)) { - execute(TC_GEONW_PON_GUC_BV_01()); - } -@@ -297,11 +299,11 @@ - if ((PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_unspecified)) { - execute(TC_GEONW_PON_GUC_BO_13()); - } -- } -+ }*/ - - /* PON/GBC */ - -- if(PICS_GN_GBC_SRC) { -+ /*if(PICS_GN_GBC_SRC) { - execute(TC_GEONW_PON_GBC_BV_01()); - if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_advanced)) { - execute(TC_GEONW_PON_GBC_BV_02()); -@@ -335,11 +337,11 @@ - if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) { - execute(TC_GEONW_PON_GBC_BO_10()); - } -- } -+ }*/ - - /* PON/TSB */ - -- if(PICS_GN_TSB_SRC) { -+ /*if(PICS_GN_TSB_SRC) { - execute(TC_GEONW_PON_TSB_BV_01()); - } - -@@ -352,20 +354,20 @@ - if(PICS_GN_TSB_DST) { - execute(TC_GEONW_PON_TSB_BV_06()); - execute(TC_GEONW_PON_TSB_BO_07()); -- } -+ }*/ - - /* PON/SHB */ - - if(PICS_GN_SHB_SRC) { -- execute(TC_GEONW_PON_SHB_BV_01()); -+ /*execute(TC_GEONW_PON_SHB_BV_01());*/ - } - if(PICS_GN_SHB_DST) { -- execute(TC_GEONW_PON_SHB_BV_02()); -+ /*execute(TC_GEONW_PON_SHB_BV_02());*/ - } - - /* PON/GAC */ - -- if(PICS_GN_GAC_SRC) { -+ /*if(PICS_GN_GAC_SRC) { - execute(TC_GEONW_PON_GAC_BV_01()); - if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) { - execute(TC_GEONW_PON_GAC_BV_02()); -@@ -388,11 +390,11 @@ - execute(TC_GEONW_PON_GAC_BV_08()); - execute(TC_GEONW_PON_GAC_BO_09()); - execute(TC_GEONW_PON_GAC_BV_10()); -- } -+ }*/ - - /* PON/BCA */ - -- if(PICS_GN_GBC_FWD) { -+ /*if(PICS_GN_GBC_FWD) { - if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_cbf) { - execute(TC_GEONW_PON_BCA_BV_01()); - execute(TC_GEONW_PON_BCA_BV_02()); -@@ -403,11 +405,11 @@ - execute(TC_GEONW_PON_BCA_BV_07()); - execute(TC_GEONW_PON_BCA_BV_08()); - } -- } -+ }*/ - - /* PON/BAA */ - -- if(PICS_GN_GBC_FWD) { -+ /*if(PICS_GN_GBC_FWD) { - if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_advanced) { - execute(TC_GEONW_PON_BAA_BV_01()); - execute(TC_GEONW_PON_BAA_BV_02()); -@@ -421,11 +423,11 @@ - execute(TC_GEONW_PON_BAA_BV_10()); - execute(TC_GEONW_PON_BAA_BV_11()); - } -- } -+ }*/ - - /* CAP */ - -- if(PICS_GN_LS_REQ_SRC) { -+ /*if(PICS_GN_LS_REQ_SRC) { - execute(TC_GEONW_CAP_LOS_BV_01()); - } - -@@ -435,7 +437,7 @@ - - if(PICS_GN_GBC_FWD) { - execute(TC_GEONW_CAP_FPB_BV_02()); -- } -+ }*/ - - } - -Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn -=================================================================== ---- AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn (revision 2578) -+++ AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn (working copy) -@@ -527,7 +527,7 @@ - altitudeValue := AltitudeValue_referenceEllipsoidSurface_, - altitudeConfidence := unavailable - } -- } -+ } // End of PICS_UC7_COLLISION_POINT - - } // End of group camUseCase7 - -@@ -5638,7 +5638,7 @@ - group generationFrequencies { - - /** -- * @desc CAM frequency timer -+ * @desc Beacon frequency timer - */ - modulepar float PICS_BEACON_FREQUENCY := 1.0; - -Index: AtsSecurity/AtsSecurity_Pics.ttcn3 -=================================================================== ---- AtsSecurity/AtsSecurity_Pics.ttcn3 (revision 2579) -+++ AtsSecurity/AtsSecurity_Pics.ttcn3 (working copy) -@@ -15,6 +15,6 @@ - /** - * @desc Set to true to enable restrictions of TS 103 097 v1.2.5 - */ -- modulepar boolean PICS_PLUGTEST_VERSION := false; -+ modulepar boolean PICS_PLUGTEST_VERSION := true; - - } // End of module AtsSecurity_Pics -Index: AtsSecurity/AtsSecurity_TestCases.ttcn3 -=================================================================== ---- AtsSecurity/AtsSecurity_TestCases.ttcn3 (revision 2582) -+++ AtsSecurity/AtsSecurity_TestCases.ttcn3 (working copy) -@@ -1803,9 +1803,10 @@ - log("*** " & testcasename() & ": PASS: Generation time within certificate validity ***"); - f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success); - } -+ } else { -+ log("*** " & testcasename() & ": FAIL: Generation time not within certificate validity ***"); -+ f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error); - } -- log("*** " & testcasename() & ": FAIL: Generation time not within certificate validity ***"); -- f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error); - } - [] geoNetworkingPort.receive( - mw_geoNwInd( -Index: AtsSecurity/AtsSecurity_TestControl.ttcn3 +Index: AtsSecurity/ItsSecurity_TestControl.ttcn =================================================================== ---- AtsSecurity/AtsSecurity_TestControl.ttcn3 (revision 2579) -+++ AtsSecurity/AtsSecurity_TestControl.ttcn3 (working copy) -@@ -11,7 +11,7 @@ - import from LibItsGeoNetworking_Pics all; - - // ItsSecurity -- import from ItsSecurity_TestCases all; -+ import from AtsSecurity_TestCases all; - import from LibItsSecurity_Pics all; - - // Test Execution -@@ -22,16 +22,16 @@ +--- AtsSecurity/ItsSecurity_TestControl.ttcn (revision 2612) ++++ AtsSecurity/ItsSecurity_TestControl.ttcn (working copy) +@@ -22,35 +22,35 @@ * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2 Sending behaviour */ if (PICS_GN_SECURITY) { - execute(TC_SEC_ITSS_SND_MSG_01_01_BV()); -- execute(TC_SEC_ITSS_SND_MSG_04_01_BV()); -- execute(TC_SEC_ITSS_SND_MSG_04_02_BV()); -- execute(TC_SEC_ITSS_SND_MSG_05_01_BV()); + /*execute(TC_SEC_ITSS_SND_MSG_01_01_BV()); -+ execute(TC_SEC_ITSS_SND_MSG_04_01_BV()); Signature/Hash issue -+ execute(TC_SEC_ITSS_SND_MSG_04_02_BV());*/ + execute(TC_SEC_ITSS_SND_MSG_04_01_BV()); + execute(TC_SEC_ITSS_SND_MSG_04_02_BV()); +- execute(TC_SEC_ITSS_SND_MSG_05_01_BV()); + /*execute(TC_SEC_ITSS_SND_MSG_05_01_BV());*/ /** @@ -810,17 +121,19 @@ Index: AtsSecurity/AtsSecurity_TestControl.ttcn3 execute(TC_SEC_ITSS_SND_CAM_02_01_BV()); execute(TC_SEC_ITSS_SND_CAM_05_01_BV()); execute(TC_SEC_ITSS_SND_CAM_05_02_BV()); -@@ -39,16 +39,17 @@ - execute(TC_SEC_ITSS_SND_CAM_07_01_TI()); + execute(TC_SEC_ITSS_SND_CAM_06_01_BV()); +- execute(TC_SEC_ITSS_SND_CAM_07_01_TI()); ++ execute(TC_SEC_ITSS_SND_CAM_07_01_TI());*/ execute(TC_SEC_ITSS_SND_CAM_08_01_BV()); - execute(TC_SEC_ITSS_SND_CAM_09_01_BV()); -+ execute(TC_SEC_ITSS_SND_CAM_09_02_BV()); Missing certificate CERT_TS_A_1_AT +- execute(TC_SEC_ITSS_SND_CAM_09_01_BV()); ++ /*execute(TC_SEC_ITSS_SND_CAM_09_01_BV()); + execute(TC_SEC_ITSS_SND_CAM_09_02_BV()); execute(TC_SEC_ITSS_SND_CAM_10_01_BV()); execute(TC_SEC_ITSS_SND_CAM_12_01_BV()); -- execute(TC_SEC_ITSS_SND_CAM_14_01_BV()); + execute(TC_SEC_ITSS_SND_CAM_14_01_BV()); + execute(TC_SEC_ITSS_SND_CAM_15_01_BV()); - execute(TC_SEC_ITSS_SND_CAM_16_01_BV()); -+ execute(TC_SEC_ITSS_SND_CAM_14_01_BV());*/ -+ /*execute(TC_SEC_ITSS_SND_CAM_16_01_BV()); Signature issue*/ ++ execute(TC_SEC_ITSS_SND_CAM_16_01_BV());*/ /** * @desc Sending behaviour test cases for DENM profile @@ -831,7 +144,7 @@ Index: AtsSecurity/AtsSecurity_TestControl.ttcn3 execute(TC_SEC_ITSS_SND_DENM_02_01_BV()); execute(TC_SEC_ITSS_SND_DENM_03_01_BV()); execute(TC_SEC_ITSS_SND_DENM_04_01_BV()); -@@ -94,13 +95,13 @@ +@@ -96,13 +96,13 @@ } execute(TC_SEC_ITSS_SND_GENMSG_06_01_BV()); execute(TC_SEC_ITSS_SND_GENMSG_07_01_BV()); @@ -847,7 +160,7 @@ Index: AtsSecurity/AtsSecurity_TestControl.ttcn3 execute(TC_SEC_ITSS_SND_CERT_01_02_BV()); execute(TC_SEC_ITSS_SND_CERT_02_01_BV()); if (PICS_CERTIFICATE_SELECTION) { -@@ -128,24 +129,24 @@ +@@ -130,24 +130,24 @@ execute(TC_SEC_ITSS_SND_CERT_10_02_BV()); execute(TC_SEC_ITSS_SND_CERT_11_01_BV()); execute(TC_SEC_ITSS_SND_CERT_11_02_BV()); @@ -876,7 +189,7 @@ Index: AtsSecurity/AtsSecurity_TestControl.ttcn3 execute(TC_SEC_ITSS_SND_CERT_AT_02_01_BV()); execute(TC_SEC_ITSS_SND_CERT_AT_03_01_BV()); execute(TC_SEC_ITSS_SND_CERT_AT_04_01_BV()); -@@ -152,7 +153,7 @@ +@@ -154,7 +154,7 @@ execute(TC_SEC_ITSS_SND_CERT_AT_05_01_BV()); execute(TC_SEC_ITSS_SND_CERT_AT_07_01_BV()); execute(TC_SEC_ITSS_SND_CERT_AT_08_01_BV()); @@ -885,16 +198,16 @@ Index: AtsSecurity/AtsSecurity_TestControl.ttcn3 } /** -@@ -165,7 +166,7 @@ +@@ -166,7 +166,7 @@ + * @desc Sending behaviour test cases for CAM profile * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.3.2 CAM Profile */ - execute(TC_SEC_ITSS_RCV_CAM_01_01_BV()); -- execute(TC_SEC_ITSS_RCV_CAM_01_02_BV()); -+ /*execute(TC_SEC_ITSS_RCV_CAM_01_02_BV()); +- execute(TC_SEC_ITSS_RCV_CAM_01_01_BV()); ++ /*execute(TC_SEC_ITSS_RCV_CAM_01_01_BV()); + execute(TC_SEC_ITSS_RCV_CAM_01_02_BV()); execute(TC_SEC_ITSS_RCV_CAM_01_03_BV()); execute(TC_SEC_ITSS_RCV_CAM_02_01_BO()); - execute(TC_SEC_ITSS_RCV_CAM_02_02_BO()); -@@ -212,13 +213,13 @@ +@@ -214,13 +214,13 @@ execute(TC_SEC_ITSS_RCV_CAM_13_03_BO()); execute(TC_SEC_ITSS_RCV_CAM_13_04_BO()); execute(TC_SEC_ITSS_RCV_CAM_13_05_BO()); @@ -910,7 +223,7 @@ Index: AtsSecurity/AtsSecurity_TestControl.ttcn3 execute(TC_SEC_ITSS_RCV_DENM_01_02_BV()); execute(TC_SEC_ITSS_RCV_DENM_01_03_BV()); execute(TC_SEC_ITSS_RCV_DENM_01_04_BV()); -@@ -278,12 +279,12 @@ +@@ -280,12 +280,12 @@ execute(TC_SEC_ITSS_RCV_DENM_13_03_BO()); execute(TC_SEC_ITSS_RCV_DENM_13_04_BO()); execute(TC_SEC_ITSS_RCV_DENM_13_05_BO()); @@ -925,16 +238,14 @@ Index: AtsSecurity/AtsSecurity_TestControl.ttcn3 execute(TC_SEC_ITSS_RCV_GENMSG_01_01_BV()); execute(TC_SEC_ITSS_RCV_GENMSG_01_02_BV()); execute(TC_SEC_ITSS_RCV_GENMSG_01_03_BV()); -@@ -341,7 +342,7 @@ - execute(TC_SEC_ITSS_RCV_GENMSG_13_03_BO()); +@@ -344,13 +344,13 @@ execute(TC_SEC_ITSS_RCV_GENMSG_13_04_BO()); execute(TC_SEC_ITSS_RCV_GENMSG_13_05_BO()); -- execute(TC_SEC_ITSS_RCV_GENMSG_13_06_BO()); -+ execute(TC_SEC_ITSS_RCV_GENMSG_13_06_BO());*/ - } + execute(TC_SEC_ITSS_RCV_GENMSG_13_06_BO()); +- } ++ }*/ /** -@@ -348,7 +349,7 @@ * @desc Receiving behaviour test cases for certificates profile * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.3.5 Profiles for certificates */ @@ -943,16 +254,12 @@ Index: AtsSecurity/AtsSecurity_TestControl.ttcn3 execute(TC_SEC_ITSS_RCV_CERT_01_02_BO()); execute(TC_SEC_ITSS_RCV_CERT_01_03_BO()); execute(TC_SEC_ITSS_RCV_CERT_01_04_BO()); -@@ -436,8 +437,8 @@ +@@ -437,7 +437,7 @@ + execute(TC_SEC_ITSS_RCV_CERT_17_04_BO()); execute(TC_SEC_ITSS_RCV_CERT_18_01_BO()); execute(TC_SEC_ITSS_RCV_CERT_18_02_BO()); - execute(TC_SEC_ITSS_RCV_CERT_19_01_BO()); -- } -+ }*/ +- execute(TC_SEC_ITSS_RCV_CERT_19_01_BO()); ++ execute(TC_SEC_ITSS_RCV_CERT_19_01_BO());*/ + } } // End of 'control' statement - --} // End of module ItsSecurity_TestControl -\ No newline at end of file -+} // End of module AtsSecurity_TestControl -\ No newline at end of file -- GitLab