From 5d0799204fcebd917a88c26aa65479a53b98d304 Mon Sep 17 00:00:00 2001 From: garciay Date: Fri, 19 Aug 2016 05:02:34 +0000 Subject: [PATCH] Upgrade Certificate from H:\STF517 Validate RSUsimulator against AtsSremSsem in non secured mode --- data/gencerts.cfg | 11 +++++++--- data/profiles/CERT_IUT_E_AT.xml | 2 +- data/profiles/CERT_TS_09_01_BV_AT.xml | 2 +- data/profiles/CERT_TS_09_02_BV_AT.xml | 2 +- data/profiles/CERT_TS_09_03_BV_AT.xml | 2 +- data/profiles/CERT_TS_09_04_BV_AT.xml | 2 +- data/profiles/CERT_TS_09_05_BV_AT.xml | 2 +- data/profiles/CERT_TS_09_06_BV_AT.xml | 2 +- data/profiles/CERT_TS_09_08_BO_AA.xml | 2 +- data/profiles/CERT_TS_09_08_BO_AT.xml | 2 +- data/profiles/CERT_TS_09_09_BO_AA.xml | 2 +- data/profiles/CERT_TS_09_09_BO_AT.xml | 2 +- data/profiles/CERT_TS_E1_AA.xml | 2 +- data/profiles/CERT_TS_E_AA.xml | 2 +- data/profiles/CERT_TS_E_AT.xml | 2 +- data/profiles/CERT_TS_MSG_13_06_BO_AT.xml | 6 ++--- data/profiles/Makefile | 5 +++-- .../ItsRSUsSimulator_Functions.ttcn | 6 ++--- .../ItsRSUsSimulator_Templates.ttcn | 22 +++++++++++++++++++ .../ItsRSUsSimulator_TestCases.ttcn | 11 +++------- 20 files changed, 55 insertions(+), 34 deletions(-) diff --git a/data/gencerts.cfg b/data/gencerts.cfg index 184045324..6a94750e0 100644 --- a/data/gencerts.cfg +++ b/data/gencerts.cfg @@ -5,12 +5,17 @@ reuse=yes format=hex # Reference time point. The begining of the current year is used by default -#reftime=2015-01-01 +#reftime=2016-01-01 # location of the IUT position -reflocation=51.4744200:5.6240500 +reflocation= 43.552545:10.300891 # custom AID to be used to test GenericMessageProfile macro=CAM:36 macro=DENM:37 -macro=GENERIC:39 +macro=GENERIC:38 + +# local region: Italy +macro=RGN_LOCAL:380 +# Other region: France +macro=RGN_OTHER:250 diff --git a/data/profiles/CERT_IUT_E_AT.xml b/data/profiles/CERT_IUT_E_AT.xml index f7be1b55a..e9755cc9f 100644 --- a/data/profiles/CERT_IUT_E_AT.xml +++ b/data/profiles/CERT_IUT_E_AT.xml @@ -22,7 +22,7 @@ - + diff --git a/data/profiles/CERT_TS_09_01_BV_AT.xml b/data/profiles/CERT_TS_09_01_BV_AT.xml index 19b38841a..0899040f4 100644 --- a/data/profiles/CERT_TS_09_01_BV_AT.xml +++ b/data/profiles/CERT_TS_09_01_BV_AT.xml @@ -25,7 +25,7 @@ - + diff --git a/data/profiles/CERT_TS_09_02_BV_AT.xml b/data/profiles/CERT_TS_09_02_BV_AT.xml index 4e6d6e0ba..c2f6a16c2 100644 --- a/data/profiles/CERT_TS_09_02_BV_AT.xml +++ b/data/profiles/CERT_TS_09_02_BV_AT.xml @@ -25,7 +25,7 @@ - + diff --git a/data/profiles/CERT_TS_09_03_BV_AT.xml b/data/profiles/CERT_TS_09_03_BV_AT.xml index 3bef41498..d675d0f7c 100644 --- a/data/profiles/CERT_TS_09_03_BV_AT.xml +++ b/data/profiles/CERT_TS_09_03_BV_AT.xml @@ -23,7 +23,7 @@ - + diff --git a/data/profiles/CERT_TS_09_04_BV_AT.xml b/data/profiles/CERT_TS_09_04_BV_AT.xml index c90445687..9ba21e57f 100644 --- a/data/profiles/CERT_TS_09_04_BV_AT.xml +++ b/data/profiles/CERT_TS_09_04_BV_AT.xml @@ -22,7 +22,7 @@ - + diff --git a/data/profiles/CERT_TS_09_05_BV_AT.xml b/data/profiles/CERT_TS_09_05_BV_AT.xml index b61d66d96..4895e4770 100644 --- a/data/profiles/CERT_TS_09_05_BV_AT.xml +++ b/data/profiles/CERT_TS_09_05_BV_AT.xml @@ -22,7 +22,7 @@ - + diff --git a/data/profiles/CERT_TS_09_06_BV_AT.xml b/data/profiles/CERT_TS_09_06_BV_AT.xml index 10d0b1b77..fd3c2cdd9 100644 --- a/data/profiles/CERT_TS_09_06_BV_AT.xml +++ b/data/profiles/CERT_TS_09_06_BV_AT.xml @@ -26,7 +26,7 @@ - + diff --git a/data/profiles/CERT_TS_09_08_BO_AA.xml b/data/profiles/CERT_TS_09_08_BO_AA.xml index dc49d31a7..ba562bbd0 100644 --- a/data/profiles/CERT_TS_09_08_BO_AA.xml +++ b/data/profiles/CERT_TS_09_08_BO_AA.xml @@ -23,7 +23,7 @@ - + diff --git a/data/profiles/CERT_TS_09_08_BO_AT.xml b/data/profiles/CERT_TS_09_08_BO_AT.xml index 9e425ba18..92e74119c 100644 --- a/data/profiles/CERT_TS_09_08_BO_AT.xml +++ b/data/profiles/CERT_TS_09_08_BO_AT.xml @@ -23,7 +23,7 @@ - + diff --git a/data/profiles/CERT_TS_09_09_BO_AA.xml b/data/profiles/CERT_TS_09_09_BO_AA.xml index 736eacfe7..c2ccd68a1 100644 --- a/data/profiles/CERT_TS_09_09_BO_AA.xml +++ b/data/profiles/CERT_TS_09_09_BO_AA.xml @@ -23,7 +23,7 @@ - + diff --git a/data/profiles/CERT_TS_09_09_BO_AT.xml b/data/profiles/CERT_TS_09_09_BO_AT.xml index 277ab9094..16c8555c0 100644 --- a/data/profiles/CERT_TS_09_09_BO_AT.xml +++ b/data/profiles/CERT_TS_09_09_BO_AT.xml @@ -23,7 +23,7 @@ - + diff --git a/data/profiles/CERT_TS_E1_AA.xml b/data/profiles/CERT_TS_E1_AA.xml index 19cf4ef4f..61a3f6c2e 100644 --- a/data/profiles/CERT_TS_E1_AA.xml +++ b/data/profiles/CERT_TS_E1_AA.xml @@ -27,7 +27,7 @@ - + diff --git a/data/profiles/CERT_TS_E_AA.xml b/data/profiles/CERT_TS_E_AA.xml index 739e6966d..ac711eb8b 100644 --- a/data/profiles/CERT_TS_E_AA.xml +++ b/data/profiles/CERT_TS_E_AA.xml @@ -27,7 +27,7 @@ - + diff --git a/data/profiles/CERT_TS_E_AT.xml b/data/profiles/CERT_TS_E_AT.xml index 44665bd09..b488b7335 100644 --- a/data/profiles/CERT_TS_E_AT.xml +++ b/data/profiles/CERT_TS_E_AT.xml @@ -27,7 +27,7 @@ - + diff --git a/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml b/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml index fb6f7dada..4fc76fba5 100644 --- a/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml +++ b/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml @@ -1,6 +1,4 @@ - 2 @@ -26,7 +24,7 @@ - + diff --git a/data/profiles/Makefile b/data/profiles/Makefile index b7a6b751f..a8306f744 100644 --- a/data/profiles/Makefile +++ b/data/profiles/Makefile @@ -1,4 +1,5 @@ outdir=../certificates +config=../gencerts.cfg installdir=C:\Users\filatov\Documents\Dropbox\Yann\certificates\PLU distzip=$(outdir)/plu_ts_certificates.zip @@ -8,9 +9,9 @@ distzip=$(outdir)/plu_ts_certificates.zip depdir=.deps keydir=$(outdir) -GENOPTS := -C config.cfg +GENOPTS := -C "$(config)" +itscertgen="../../itscertgen.exe" -itscertgen="../itscertgen.exe" profiles := $(wildcard CERT_*.xml) profiles_iut_at := $(wildcard CERT_IUT_*AT.xml) profiles_other := $(filter-out $(profiles_iut_at), $(profiles)) diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn index b925a2dd2..07f72d080 100644 --- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn +++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn @@ -416,7 +416,6 @@ module ItsRSUsSimulator_Functions { if (ispresent(p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload)) { if (ischosen(p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload.sremPacket)) { var SignalRequestMessage v_signalRequestMessage := p_geoNetworkingPdu.gnPacket.packet.payload.decodedPayload.btpPacket.payload.decodedPayload.sremPacket.srm; - var template (value) SSEM v_ssem := vc_rsuMessagesValueList[PX_RSU_ID - 1].ssem; var template (value) Payload v_payload; log(v_signalRequestMessage); @@ -427,8 +426,9 @@ module ItsRSUsSimulator_Functions { bit2oct( encvalue( valueof( - v_ssem - ))), + m_ssem( + v_signalRequestMessage + )))), PICS_SSEM_BTP_DESTINATION_PORT, PICS_SSEM_BTP_SOURCE_PORT ) diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn index 5167929ea..b4d37036e 100644 --- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn +++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn @@ -95,6 +95,28 @@ module ItsRSUsSimulator_Templates { } } + /** + * @desc Receive template for GeoNetworking Unicast Packet + * @param p_destinationShortPosVec Short position vector of destination + * @param p_seqNumber Sequence number of GeoUnicast packet + * @param p_nextHeader Id of next header + */ + template (present) GnNonSecuredPacket mw_geoNwTsbPacketWithNextHeader_srem( + in template (present) UInt16 p_seqNumber := ?, + in template (present) LongPosVector p_sourceLongPosVec := ?, + in template (value) NextHeader p_nextHeader + ) modifies mw_geoNwTsbPacketWithNextHeader := { + payload := { + decodedPayload := { + btpPacket := mw_btpB( + PICS_SREM_BTP_DESTINATION_PORT, + PICS_SREM_BTP_SOURCE_PORT, + ? + ) + }, + rawPayload := ? + } + } } // End of group geoNetworkingTemplates diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn index 275cf4797..df871e3d9 100644 --- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn +++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn @@ -54,18 +54,13 @@ module ItsRSUsSimulator_TestCases { if (ispresent(vc_rsuMessagesValueList[PX_RSU_ID - 1].ivim)) { tc_ivim.start; } - log("Expected SREM:", mw_geoNwInd( - mw_geoNwPdu( - mw_geoNwBroadcastPacketWithNextHeader_srem( - ?, - ?, - e_btpB - )))); + alt { [] geoNetworkingPort.receive( mw_geoNwInd( mw_geoNwPdu( - mw_geoNwBroadcastPacketWithNextHeader_srem( + // FIXM Geobroadcast or TSB? mw_geoNwBroadcastPacketWithNextHeader_srem + mw_geoNwTsbPacketWithNextHeader_srem( ?, ?, e_btpB -- GitLab