Commit d8021f75 authored by berge's avatar berge

Merged branches/Security/ttcn (r1471-1819) to trunk.

parent b91fc291
......@@ -2817,7 +2817,7 @@ module ItsCam_TestCases {
//change again the yaw rate value and set the expectation to the measured value
v_yawRateVal := v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.yawRate.yawRateValue;
if (valueof(v_yawRateVal)>=32767) {
v_yawRateVal := -32767;
v_yawRateVal := -32766;
}
else {
v_yawRateVal := v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.yawRate.yawRateValue+c_yawRateValOffset;
......
......@@ -1976,7 +1976,7 @@ module ItsDenm_TestCases {
m_situation(c_causeSlowVehicle, c_subCauseCode_Unavailable)
};
var ActionID v_unknownActionId;
var ActionIDList v_actionIds := {mw_actionId(f_getIutStationId()), mw_actionId(f_getIutStationId())};
var ActionIDList v_actionIds;
var DenmInd v_denmInd;
var integer i;
......@@ -1997,12 +1997,12 @@ module ItsDenm_TestCases {
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
// Test Body
v_unknownActionId := m_actionId(
v_unknownActionId := valueof(m_actionId(
f_increaseSequenceNumber(
v_actionIds[lengthof(v_actionIds)].sequenceNumber
),
f_getIutStationId()
);
));
f_utTerminateEvent(m_utEventCancellation(v_unknownActionId));
tc_ac.start;
......@@ -2088,7 +2088,7 @@ module ItsDenm_TestCases {
};
var SequenceNumber v_sequenceNumber := v_initialSequenceNumber;
var ActionID v_unknownActionId;
var ActionIDList v_actionIds := {mw_actionId(f_getIutStationId()), mw_actionId(f_getIutStationId())};
var ActionIDList v_actionIds;
var DenmInd v_denmInd;
var integer i;
......@@ -2116,12 +2116,12 @@ module ItsDenm_TestCases {
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
// Test Body
v_unknownActionId := m_actionId(
v_unknownActionId := valueof(m_actionId(
f_increaseSequenceNumber(
v_actionIds[lengthof(v_actionIds)].sequenceNumber
),
f_getTsStationId()
);
));
f_utTerminateEvent(m_utEventCancellation(v_unknownActionId));
tc_ac.start;
......@@ -3368,7 +3368,7 @@ module ItsDenm_TestCases {
v_actionId := f_sendDenMessage(v_denm);
f_sleep(1.0);
v_detectionTime2 := v_denm.management.detectionTime - 1000;
v_detectionTime2 := valueof(v_denm.management.detectionTime) - 1000;
v_actionId := f_sendDenMessage(
m_denm(
m_denmMgmtCon(
......@@ -3478,7 +3478,7 @@ module ItsDenm_TestCases {
v_actionId := f_sendDenMessage(v_denm);
f_sleep(1.0);
v_detectionTime2 := v_denm.management.detectionTime + 1000;
v_detectionTime2 := valueof(v_denm.management.detectionTime) + 1000;
v_actionId := f_sendDenMessage(
m_denm(
m_denmMgmtCon(
......
......@@ -10,7 +10,7 @@ module ItsGeoNetworking_TestControl {
// ATS GeoNetworking
import from ItsGeoNetworking_TestCases {testcase all};
// LibIts
// LibItsGeoNetworking
import from LibItsGeoNetworking_Pics all;
import from LibItsGeoNetworking_TypesAndValues all;
......
This diff is collapsed.
/**
* @author ETSI / STF481
* @version $URL$
* $Id$
* @desc Module containing templates for secured GeoNetworking ATS
*
*/
module AtsSecurity_Templates {
// // LibIts
// import from DENM_PDU_Descriptions language "ASN.1:1997" all;
// import from ITS_Container language "ASN.1:1997" all;
//
// LibItsBtp
import from LibItsBtp_TypesAndValues all;
import from LibItsBtp_Templates all;
import from LibItsBtp_Pixits all;
// LibItsGeoNet
import from LibItsGeoNetworking_TypesAndValues all;
import from LibItsGeoNetworking_Templates all;
template (present) BtpPayload mw_btpCamPayload := {
decodedPayload := {
camPacket := ?
},
rawPayload := ?
} // End of template mw_btpCamPayload
template (present) BtpPayload mw_btpDenmPayload := {
decodedPayload := {
denmPacket := ?
},
rawPayload := ?
} // End of template mw_btpDenmPayload
template (present) Payload mw_secCamPayload := {
decodedPayload := {
btpPacket := mw_btpA(
PX_DESTINATION_PORT,
?,
mw_btpCamPayload
)
},
rawPayload := ?
} // End of template mw_secCamPayload
template (present) Payload mw_secDenmPayload := {
decodedPayload := {
btpPacket := mw_btpB(
PX_DESTINATION_PORT,
?,
mw_btpDenmPayload
)
},
rawPayload := ?
} // End of template mw_secCamPayload
} // End of module AtsSecurity_Templates
\ No newline at end of file
/**
* @author ETSI / STF481
* @version $URL$
* $Id$
* @desc Module containing t fest system description for the secured GN ATS
*
*/
module AtsSecurity_TestSystem {
import from LibItsCommon_TestSystem all;
import from LibItsCam_TestSystem all;
import from LibItsDenm_TestSystem all;
import from LibItsGeoNetworking_TestSystem all;
/**
* @desc Secured GN test system description
* @member acPort Test Adapter control port
* @member geoNetworkingPort GeoNetworking port
* @member utPort GeoNetworking UT port
* @member denmUtPort DENM UT port
* @member cammUtPort CAM UT port
*/
type component ItsSecSystem {
port AdapterControlPort acPort;
// NT2 ports
port LibItsGeoNetworking_TestSystem.UpperTesterPort utPort;
port GeoNetworkingPort geoNetworkingPort;
// FA ports
port LibItsDenm_TestSystem.UpperTesterPort denmUtPort;
port LibItsCam_TestSystem.UpperTesterPort camUtPort;
} // end ItsGeoNetworkingSystem
} // End of module AtsSecurity_TestSystem
\ No newline at end of file
This diff is collapsed.
/**
* @author ETSI / STF481
* @version $URL$
* $Id$
* @desc Test Control file for Security Protocol
*
*/
module ItsSecurity_TestControl {
// ItsSecurity
import from ItsSecurity_TestCases all;
// Test Execution
control {
execute(TC_SEC_ITSS_SND_MSG_01());
execute(TC_SEC_ITSS_SND_MSG_04_01());
execute(TC_SEC_ITSS_SND_MSG_04_02());
execute(TC_SEC_ITSS_SND_MSG_05_01());
execute(TC_SEC_ITSS_SND_CAM_05_01());
execute(TC_SEC_ITSS_SND_CAM_06_01());
execute(TC_SEC_ITSS_SND_CAM_06_02());
execute(TC_SEC_ITSS_SND_CAM_07_01());
execute(TC_SEC_ITSS_SND_CAM_07a_01());
execute(TC_SEC_ITSS_SND_CAM_08_01());
execute(TC_SEC_ITSS_SND_CAM_09_01());
execute(TC_SEC_ITSS_SND_CAM_10_01());
execute(TC_SEC_ITSS_SND_CAM_11_01());
execute(TC_SEC_ITSS_SND_CAM_12_01());
execute(TC_SEC_ITSS_SND_CAM_14_01());
execute(TC_SEC_ITSS_SND_CAM_16_01());
execute(TC_SEC_ITSS_SND_DENM_02_01());
execute(TC_SEC_ITSS_SND_DENM_03_01());
execute(TC_SEC_ITSS_SND_DENM_04_01());
execute(TC_SEC_ITSS_SND_DENM_05_01());
execute(TC_SEC_ITSS_SND_DENM_05_03());
execute(TC_SEC_ITSS_SND_DENM_05_04());
execute(TC_SEC_ITSS_SND_DENM_05_05());
execute(TC_SEC_ITSS_SND_DENM_05_06());
execute(TC_SEC_ITSS_SND_DENM_06_01());
execute(TC_SEC_ITSS_SND_DENM_08_01());
execute(TC_SEC_ITSS_SND_DENM_10_01());
execute(TC_SEC_ITSS_SND_GENMSG_02_01());
execute(TC_SEC_ITSS_SND_GENMSG_03_01());
execute(TC_SEC_ITSS_SND_GENMSG_04_01());
execute(TC_SEC_ITSS_SND_GENMSG_05_01());
execute(TC_SEC_ITSS_SND_GENMSG_05_02());
execute(TC_SEC_ITSS_SND_GENMSG_05_03());
execute(TC_SEC_ITSS_SND_GENMSG_05_04());
execute(TC_SEC_ITSS_SND_GENMSG_05_05());
execute(TC_SEC_ITSS_SND_GENMSG_05_06());
execute(TC_SEC_ITSS_SND_GENMSG_06_01());
execute(TC_SEC_ITSS_SND_GENMSG_07_01());
execute(TC_SEC_ITSS_RCV_CAM_01_01_NB());
execute(TC_SEC_ITSS_RCV_CAM_01_02_NB());
execute(TC_SEC_ITSS_RCV_CAM_01_03_NB());
execute(TC_SEC_ITSS_RCV_CAM_02_01a_EB());
execute(TC_SEC_ITSS_RCV_CAM_02_01b_EB());
execute(TC_SEC_ITSS_RCV_CAM_04_01a_EB());
execute(TC_SEC_ITSS_RCV_CAM_04_01b_EB());
execute(TC_SEC_ITSS_RCV_CAM_04_01c_EB());
execute(TC_SEC_ITSS_RCV_CAM_04_02a_EB());
execute(TC_SEC_ITSS_RCV_CAM_04_03a_EB());
execute(TC_SEC_ITSS_RCV_CAM_04_05a_EB());
execute(TC_SEC_ITSS_RCV_CAM_04_05b_EB());
execute(TC_SEC_ITSS_RCV_CAM_07_01_EB());
execute(TC_SEC_ITSS_RCV_CAM_09_02_EB());
execute(TC_SEC_ITSS_RCV_CAM_09_03_EB());
execute(TC_SEC_ITSS_RCV_CAM_09_04_EB());
execute(TC_SEC_ITSS_RCV_CAM_09_05_EB());
execute(TC_SEC_ITSS_RCV_CAM_09_06_EB());
execute(TC_SEC_ITSS_RCV_CAM_10_01_EB());
execute(TC_SEC_ITSS_RCV_CAM_10_02_EB());
execute(TC_SEC_ITSS_RCV_CAM_11_01_EB());
execute(TC_SEC_ITSS_RCV_CAM_11_02_EB());
execute(TC_SEC_ITSS_RCV_CAM_12_01_EB());
execute(TC_SEC_ITSS_RCV_CAM_12_02_EB());
execute(TC_SEC_SND_CERT_01_01());
execute(TC_SEC_SND_CERT_01_02());
execute(TC_SEC_SND_CERT_02_01());
execute(TC_SEC_SND_CERT_04_01());
execute(TC_SEC_SND_CERT_04_02());
execute(TC_SEC_SND_CERT_05_01());
execute(TC_SEC_SND_CERT_05_02());
execute(TC_SEC_SND_CERT_06_01());
execute(TC_SEC_SND_CERT_06_02());
execute(TC_SEC_SND_CERT_06_03());
execute(TC_SEC_SND_CERT_06_04());
execute(TC_SEC_SND_CERT_07_01());
execute(TC_SEC_SND_CERT_09_01());
execute(TC_SEC_SND_CERT_09_02());
execute(TC_SEC_SND_CERT_AA_01_01());
execute(TC_SEC_SND_CERT_AA_02_01());
execute(TC_SEC_SND_CERT_AA_04_01());
execute(TC_SEC_SND_CERT_AA_05_01());
execute(TC_SEC_SND_CERT_AA_06_01());
execute(TC_SEC_SND_CERT_AA_08_01());
execute(TC_SEC_SND_CERT_AT_01_01());
execute(TC_SEC_SND_CERT_AT_02_01());
execute(TC_SEC_SND_CERT_AT_03_01());
execute(TC_SEC_SND_CERT_AT_04_01());
execute(TC_SEC_SND_CERT_AT_05_01());
execute(TC_SEC_SND_CERT_AT_07_01());
execute(TC_SEC_SND_CERT_AT_08_01());
execute(TC_SEC_SND_CERT_AT_09_01());
} // End of 'control' statement
} // End of module ItsSecurity_TestControl
\ No newline at end of file
Markdown is supported
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