Add PX_CERT_FOR_TA to indicate which certificate the Test Adapter shall use (48752d73) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Functions.ttcn

+28 −26

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ module LibItsCam_Functions {
	import from LibItsCam_Templates all;		import from LibItsCam_Templates all;
	import from LibItsCam_TypesAndValues all;		import from LibItsCam_TypesAndValues all;
	import from LibItsCam_Pics all;		import from LibItsCam_Pics all;
			import from LibItsCam_Pixits all;

	group utFuntions {		group utFuntions {

	@@ -213,7 +214,7 @@ module LibItsCam_Functions {
	if (PICS_GNSS_SCENARIO_SUPPORT==true) {		if (PICS_GNSS_SCENARIO_SUPPORT==true) {
	f_acTriggerGnssEvent(m_loadScenario(p_scenario));		f_acTriggerGnssEvent(m_loadScenario(p_scenario));
	}		}
	} // end f_acLoadScenario		} // End of function f_acLoadScenario

	/**		/**
	* @desc Starts a loaded scenario		* @desc Starts a loaded scenario
	@@ -224,7 +225,7 @@ module LibItsCam_Functions {
	f_acTriggerGnssEvent(m_startScenario);		f_acTriggerGnssEvent(m_startScenario);
	vc_scenarioStarted := true;		vc_scenarioStarted := true;
	}		}
	} // end f_acStartScenario		} // End of function f_acStartScenario

	/**		/**
	* @desc Stops a loaded scenario		* @desc Stops a loaded scenario
	@@ -235,7 +236,7 @@ module LibItsCam_Functions {
	f_acTriggerGnssEvent(m_stopScenario);		f_acTriggerGnssEvent(m_stopScenario);
	vc_scenarioStarted := false;		vc_scenarioStarted := false;
	}		}
	} // end f_acStopScenario		} // End of function f_acStopScenario

	function f_acAwaitDistanceCovered(float p_distanceToCover) runs on ItsCam return FncRetCode {		function f_acAwaitDistanceCovered(float p_distanceToCover) runs on ItsCam return FncRetCode {
	var FncRetCode v_ret := e_success;		var FncRetCode v_ret := e_success;
	@@ -261,21 +262,21 @@ module LibItsCam_Functions {

	}		}
	return v_ret;		return v_ret;
	} // end f_acAwaitDistanceCovered		} // End of function f_acAwaitDistanceCovered

	function f_acChangeSpeed(SpeedValue p_deltaSpeedValue) runs on ItsCam {		function f_acChangeSpeed(SpeedValue p_deltaSpeedValue) runs on ItsCam {

	if (PICS_GNSS_SCENARIO_SUPPORT==true and vc_scenarioStarted==true) {		if (PICS_GNSS_SCENARIO_SUPPORT==true and vc_scenarioStarted==true) {
	f_acTriggerGnssEvent(m_changeScenarioSpeed(p_deltaSpeedValue));		f_acTriggerGnssEvent(m_changeScenarioSpeed(p_deltaSpeedValue));
	}		}
	} // end f_acChangeSpeed		} // End of function f_acChangeSpeed

	function f_acChangeHeading(HeadingValue p_deltaHeadingValue) runs on ItsCam {		function f_acChangeHeading(HeadingValue p_deltaHeadingValue) runs on ItsCam {

	if (PICS_GNSS_SCENARIO_SUPPORT==true and vc_scenarioStarted==true) {		if (PICS_GNSS_SCENARIO_SUPPORT==true and vc_scenarioStarted==true) {
	f_acTriggerGnssEvent(m_changeScenarioHeading(p_deltaHeadingValue));		f_acTriggerGnssEvent(m_changeScenarioHeading(p_deltaHeadingValue));
	}		}
	} // end f_acChangeHeading		} // End of function f_acChangeHeading

	} // End of group adapterControl		} // End of group adapterControl

	@@ -283,9 +284,10 @@ module LibItsCam_Functions {

	/**		/**
	* @desc Setups default configuration		* @desc Setups default configuration
			* @param p_certificateId The certificate identifier the TA shall use in case of secured IUT
	*/		*/
	function f_cfUp(		function f_cfUp(
	in charstring p_certificateId := "CERT_TS_A_AT" // TODO To be refined		in charstring p_certificateId := PX_CERT_FOR_TA
	) runs on ItsCam {		) runs on ItsCam {

	map(self:utPort, system:utPort);		map(self:utPort, system:utPort);
	@@ -296,7 +298,7 @@ module LibItsCam_Functions {
	// Initialise secured mode		// Initialise secured mode
	f_initialiseSecuredMode(p_certificateId);		f_initialiseSecuredMode(p_certificateId);

	} // end f_cfUp		} // End of function f_cfUp

	/**		/**
	* @desc Deletes default configuration		* @desc Deletes default configuration
	@@ -311,7 +313,7 @@ module LibItsCam_Functions {
	unmap(self:camPort, system:camPort);		unmap(self:camPort, system:camPort);
	f_disconnect4SelfOrClientSync();		f_disconnect4SelfOrClientSync();

	} // end f_cfDown		} // End of function f_cfDown

	} // end of camConfigurationFunctions		} // end of camConfigurationFunctions

	@@ -376,12 +378,12 @@ module LibItsCam_Functions {
	* @remark No specific actions specified in the base standard		* @remark No specific actions specified in the base standard
	*/		*/
	function f_prInitialState(		function f_prInitialState(
	Scenario p_scenario := e_staticPosition,		in Scenario p_scenario := e_staticPosition,
	boolean p_awaitInitialCAM := true,		in boolean p_awaitInitialCAM := true,
	template (value) UtInitialize p_init := m_camInitialize		in template (value) UtInitialize p_camInitialize := m_camInitialize
	) runs on ItsCam {		) runs on ItsCam {

	f_utInitializeIut(p_init);		f_utInitializeIut(p_camInitialize);

	f_prDefault();		f_prDefault();

	@@ -405,10 +407,10 @@ module LibItsCam_Functions {
	log("* " & testcasename() & ": INCONC: Initial CAM not received *");		log("* " & testcasename() & ": INCONC: Initial CAM not received *");
	f_selfOrClientSyncAndVerdictPreamble("error", e_timeout);		f_selfOrClientSyncAndVerdictPreamble("error", e_timeout);
	}		}
	}		} // End of 'alt' statement
	}		}

	} // end f_prInitialState		} // End of function f_prInitialState

	} // end of preambles		} // end of preambles

ttcn/CAM/LibItsCam_Pixits.ttcn

+13 −8

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,11 @@ module LibItsCam_Pixits {
	// LibItsSecurity		// LibItsSecurity
	import from LibItsSecurity_TypesAndValues all;		import from LibItsSecurity_TypesAndValues all;

			/**
			* @desc The certificate identifier the TA shall use in case of secured IUT
			*/
			modulepar charstring PX_CERT_FOR_TA := "CERT_TS_A_AT";

	modulepar Oct8 PX_CERT_IUT_CAM_01 := '0000000000000000'O;		modulepar Oct8 PX_CERT_IUT_CAM_01 := '0000000000000000'O;

	modulepar Oct8 PX_CERT_IUT_CAM_02 := '0000000000000000'O;		modulepar Oct8 PX_CERT_IUT_CAM_02 := '0000000000000000'O;

Admin message