Update AtsPki (312dc93b) · Commits · ITS - Intelligent Transport Systems / ITS

ttcn/AtsPki/ItsPki_Functions.ttcn

+2 −2

ttcn/AtsPki/ItsPki_TestCases.ttcn

+18 −18

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,7 @@ module ItsPki_TestCases {
	import from ItsPki_Functions all;		import from ItsPki_Functions all;
	import from ItsPki_TestSystem all;		import from ItsPki_TestSystem all;

	testcase TC_SEC_PKI_SND_EA_01_BV() runs on ItsSecurityBaseComponent system ItsPkiSystem {		testcase TC_SEC_PKI_SND_EA_01_BV() runs on ItsGeoNetworking system ItsPkiSystem {

	// Local variables		// Local variables
	var LongPosVector v_longPosVectorIut;		var LongPosVector v_longPosVectorIut;
	@@ -90,7 +90,7 @@ module ItsPki_TestCases {
	f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

	// Test Body		// Test Body
	v_securedGnPdu := f_sendEnrollmentRequest(		f_sendEnrollmentRequest(
	m_innerEcRequest(		m_innerEcRequest(
	"TODO",		"TODO",
	m_publicKeys(		m_publicKeys(

ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn

+30 −3

Original line number	Original line	Diff line number	Diff line
	@@ -883,12 +883,38 @@ module ItsRSUsSimulator_Functions {

	altstep a_process_cf_ut_command() runs on ItsRSUsSimulator {		altstep a_process_cf_ut_command() runs on ItsRSUsSimulator {
	var UtGnInitialize v_utGnInitialize;		var UtGnInitialize v_utGnInitialize;
			var UtGnTrigger v_utGnTrigger;

	[] cfPort.receive(UtGnInitialize:?) -> value v_utGnInitialize {		[] cfPort.receive(UtGnInitialize:?) -> value v_utGnInitialize {
	log("v_utGnInitialize = ", v_utGnInitialize);		log("v_utGnInitialize = ", v_utGnInitialize);
	cfPort.send(UtGnResults: { utGnInitializeResult := true } );		cfPort.send(UtGnResults: { utGnInitializeResult := true } );
	repeat;		repeat;
	}		}
			[] cfPort.receive(UtGnTrigger:?) -> value v_utGnTrigger {
			log("v_utGnTrigger = ", v_utGnTrigger);
			if (ischosen(v_utGnTrigger.geoUnicast)) {
			var GnNonSecuredPacket v_geoNwUnicastPacket := valueof(
			m_geoNwUnicastPacket_with_payload(
			vc_longPosVectorRsu,
			f_getIutShortPosVector(),
			f_incLocalSeqNumber(),
			c_defaultHopLimit,
			v_utGnTrigger.geoUnicast.trafficClass,
			v_utGnTrigger.geoUnicast.payload
			));
			var GeoNetworkingPdu v_geoNwPdu := valueof(
			m_geoNwPdu(
			v_geoNwUnicastPacket,
			v_utGnTrigger.geoUnicast.lifetime,
			c_defaultHopLimit
			)
			);
			// FIXME Check what to do with GN_Address v_geoNwPdu.gnPacket.packet.extendedHeader.geoUnicastHeader. := v_utGnTrigger.geoUnicast.gnAddress;
			geoNetworkingPort.send(m_geoNwReq_linkLayerBroadcast(v_geoNwPdu));
			}
			cfPort.send(UtGnResults: { utGnTriggerResult := true } );
			repeat;
			}
	[vc_cam == true] cfPort.receive(UtCamInitialize:?) {		[vc_cam == true] cfPort.receive(UtCamInitialize:?) {
	cfPort.send(UtCamResults: { utCamInitializeResult := true } );		cfPort.send(UtCamResults: { utCamInitializeResult := true } );
	repeat;		repeat;
	@@ -902,9 +928,10 @@ module ItsRSUsSimulator_Functions {
	cfPort.send(UtDenmResults: { utDenmInitializeResult := true } );		cfPort.send(UtDenmResults: { utDenmInitializeResult := true } );
	repeat;		repeat;
	}		}
	/* [PICS_GENERATE_DENM == true] utPort.receive(UtDenmInitialize:?) { */		[vc_denm == true] utPort.receive(UtDenmInitialize:?) {
	/* utPort.send(UtDenmResults: { utDenmInitializeResult := true }); */		utPort.send(UtDenmResults: { utDenmInitializeResult := true });
	/* } */		repeat;
			}
	[] cfPort.receive {		[] cfPort.receive {
	// Ignore it		// Ignore it
	log("* " & testcasename() & ": INFO: Unexpected CF message received *");		log("* " & testcasename() & ": INFO: Unexpected CF message received *");

ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,7 @@ module ItsRSUsSimulator_TestSystem {
	out		out
	CfInitialize, CfResult, UtGnResults, UtCamResults, UtDenmResults;		CfInitialize, CfResult, UtGnResults, UtCamResults, UtDenmResults;
	in		in
	CfEvent, CfEventInd, UtGnInitialize, UtCamInitialize, UtDenmInitialize, UtCamTrigger		CfEvent, CfEventInd, UtGnInitialize, UtCamInitialize, UtDenmInitialize, UtGnTrigger, UtCamTrigger
	} // End of ConfigRsuSimulatorPort		} // End of ConfigRsuSimulatorPort

	} // End of group configRsuSimulatorPort		} // End of group configRsuSimulatorPort

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,7 @@ module ItsPki_Functions {
	in template (value) HeaderInfo p_headerInfo,		in template (value) HeaderInfo p_headerInfo,
	in SignerIdentifier p_signerIdentifier,		in SignerIdentifier p_signerIdentifier,
	in boolean p_addMissingHeaders := true		in boolean p_addMissingHeaders := true
	) runs on ItsGeoNetworking return GeoNetworkingPdu {		) runs on ItsGeoNetworking {
	// Local variables		// Local variables
	var GnNonSecuredPacket v_gnNonSecuredPacket;		var GnNonSecuredPacket v_gnNonSecuredPacket;
	var GeoNetworkingPdu v_securedGnPdu;		var GeoNetworkingPdu v_securedGnPdu;
	@@ -112,7 +112,7 @@ module ItsPki_Functions {
	in SignerIdentifier p_signerIdentifierType,		in SignerIdentifier p_signerIdentifierType,
	in charstring p_certificateName := ""/*,		in charstring p_certificateName := ""/*,
	in boolean p_addMissingHeaders := true*/		in boolean p_addMissingHeaders := true*/
	) runs on ItsSecurityBaseComponent return boolean {		) runs on ItsGeoNetworking return boolean {
	// Local variables		// Local variables
	var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;		var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;