Commit 48752d73 authored by garciay's avatar garciay
Browse files

Add PX_CERT_FOR_TA to indicate which certificate the Test Adapter shall use

parent 57f9033e
......@@ -28,7 +28,8 @@ module LibItsCam_Functions {
import from LibItsCam_Templates all;
import from LibItsCam_TypesAndValues all;
import from LibItsCam_Pics all;
import from LibItsCam_Pixits all;
group utFuntions {
/**
......@@ -213,7 +214,7 @@ module LibItsCam_Functions {
if (PICS_GNSS_SCENARIO_SUPPORT==true) {
f_acTriggerGnssEvent(m_loadScenario(p_scenario));
}
} // end f_acLoadScenario
} // End of function f_acLoadScenario
/**
* @desc Starts a loaded scenario
......@@ -224,7 +225,7 @@ module LibItsCam_Functions {
f_acTriggerGnssEvent(m_startScenario);
vc_scenarioStarted := true;
}
} // end f_acStartScenario
} // End of function f_acStartScenario
/**
* @desc Stops a loaded scenario
......@@ -235,7 +236,7 @@ module LibItsCam_Functions {
f_acTriggerGnssEvent(m_stopScenario);
vc_scenarioStarted := false;
}
} // end f_acStopScenario
} // End of function f_acStopScenario
function f_acAwaitDistanceCovered(float p_distanceToCover) runs on ItsCam return FncRetCode {
var FncRetCode v_ret := e_success;
......@@ -261,21 +262,21 @@ module LibItsCam_Functions {
}
return v_ret;
} // end f_acAwaitDistanceCovered
} // End of function f_acAwaitDistanceCovered
function f_acChangeSpeed(SpeedValue p_deltaSpeedValue) runs on ItsCam {
if (PICS_GNSS_SCENARIO_SUPPORT==true and vc_scenarioStarted==true) {
f_acTriggerGnssEvent(m_changeScenarioSpeed(p_deltaSpeedValue));
}
} // end f_acChangeSpeed
} // End of function f_acChangeSpeed
function f_acChangeHeading(HeadingValue p_deltaHeadingValue) runs on ItsCam {
if (PICS_GNSS_SCENARIO_SUPPORT==true and vc_scenarioStarted==true) {
f_acTriggerGnssEvent(m_changeScenarioHeading(p_deltaHeadingValue));
}
} // end f_acChangeHeading
} // End of function f_acChangeHeading
} // End of group adapterControl
......@@ -283,9 +284,10 @@ module LibItsCam_Functions {
/**
* @desc Setups default configuration
* @param p_certificateId The certificate identifier the TA shall use in case of secured IUT
*/
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 {
map(self:utPort, system:utPort);
......@@ -296,7 +298,7 @@ module LibItsCam_Functions {
// Initialise secured mode
f_initialiseSecuredMode(p_certificateId);
} // end f_cfUp
} // End of function f_cfUp
/**
* @desc Deletes default configuration
......@@ -311,7 +313,7 @@ module LibItsCam_Functions {
unmap(self:camPort, system:camPort);
f_disconnect4SelfOrClientSync();
} // end f_cfDown
} // End of function f_cfDown
} // end of camConfigurationFunctions
......@@ -376,12 +378,12 @@ module LibItsCam_Functions {
* @remark No specific actions specified in the base standard
*/
function f_prInitialState(
Scenario p_scenario := e_staticPosition,
boolean p_awaitInitialCAM := true,
template (value) UtInitialize p_init := m_camInitialize
in Scenario p_scenario := e_staticPosition,
in boolean p_awaitInitialCAM := true,
in template (value) UtInitialize p_camInitialize := m_camInitialize
) runs on ItsCam {
f_utInitializeIut(p_init);
f_utInitializeIut(p_camInitialize);
f_prDefault();
......@@ -395,20 +397,20 @@ module LibItsCam_Functions {
f_acStartScenario();
if (p_awaitInitialCAM) {
tc_ac.start;
alt {
[] camPort.receive(mw_camInd ( mw_camMsg_any )){
tc_ac.stop;
log("*** " & testcasename() & ": INFO: Received initial CAM ***");
}
[] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Initial CAM not received ***");
f_selfOrClientSyncAndVerdictPreamble("error", e_timeout);
}
}
tc_ac.start;
alt {
[] camPort.receive(mw_camInd ( mw_camMsg_any )){
tc_ac.stop;
log("*** " & testcasename() & ": INFO: Received initial CAM ***");
}
[] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Initial CAM not received ***");
f_selfOrClientSyncAndVerdictPreamble("error", e_timeout);
}
} // End of 'alt' statement
}
} // end f_prInitialState
} // End of function f_prInitialState
} // end of preambles
......
......@@ -7,17 +7,22 @@
*/
module LibItsCam_Pixits {
// LibCommon
import from LibCommon_BasicTypesAndValues all;
import from LibCommon_DataStrings all;
// LibCommon
import from LibCommon_BasicTypesAndValues all;
import from LibCommon_DataStrings all;
// LibItsSecurity
import from LibItsSecurity_TypesAndValues all;
// LibItsSecurity
import from LibItsSecurity_TypesAndValues all;
modulepar Oct8 PX_CERT_IUT_CAM_01 := '0000000000000000'O;
/**
* @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_02 := '0000000000000000'O;
modulepar Oct8 PX_CERT_IUT_CAM_02 := '0000000000000000'O;
modulepar Oct8 PX_CERT_IUT_CAM_03 := '0000000000000000'O;
modulepar Oct8 PX_CERT_IUT_CAM_03 := '0000000000000000'O;
} // End of module LibItsSecurity_Pixits
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment