Commit 964ca145 authored by garciay's avatar garciay

Merge with C2C project

parent 4ebfb17a
......@@ -29,8 +29,8 @@ module ItsCam_TpFunctions {
import from LibItsCam_Functions all;
import from LibItsCam_Templates all;
import from LibItsCam_TypesAndValues all;
import from LibItsCam_Pics {modulepar all;}
import from LibItsCam_Pixits {modulepar all;}
import from LibItsCam_Pics all;
import from LibItsCam_Pixits all;
// ASN.1
import from ITS_Container language "ASN.1:1997" all;
import from CAM_PDU_Descriptions language "ASN.1:1997" all;
......
......@@ -76,7 +76,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration
f_cf01UpGn6();
v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut));
v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut));
v_addressesIut := f_getAddresses(c_compIut);
v_addressesNodeB := f_getAddresses(c_compNodeB);
......@@ -180,7 +180,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration
f_cf01UpGn6();
v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut));
v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut));
v_addressesIut := f_getAddresses(c_compIut);
// Test adapter configuration
......@@ -287,7 +287,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration
f_cf01UpGn6();
v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut));
v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut));
v_addressesIut := f_getAddresses(c_compIut);
// Test adapter configuration
......@@ -401,7 +401,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration
f_cf01UpGn6();
v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut));
v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut));
v_addressesIut := f_getAddresses(c_compIut);
v_longPosVectorNodeA := f_getPosition(c_compNodeA);
v_addressesNodeA := f_getAddresses(c_compNodeA);
......@@ -532,7 +532,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration
f_cf01UpGn6();
v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut));
v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut));
v_addressesIut := f_getAddresses(c_compIut);
v_longPosVectorNodeB := f_getPosition(c_compNodeB);
v_addressesNodeB := f_getAddresses(c_compNodeB);
......@@ -667,7 +667,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration
f_cf01UpGn6();
v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut));
v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut));
v_addressesIut := f_getAddresses(c_compIut);
v_longPosVectorNodeA := f_getPosition(c_compNodeA);
v_addressesNodeA := f_getAddresses(c_compNodeA);
......@@ -706,7 +706,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
mw_geoNwInd(
mw_geoNwPdu(
mw_geoNwUnicastPacketWithNextHeader(
mw_shortPosVectorPosition_withDelta(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)), // On purpose: IUT should derive this value fron IPv6 address
mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)), // On purpose: IUT should derive this value fron IPv6 address
?,
e_ipv6
)
......@@ -801,7 +801,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration
f_cf01UpGn6();
v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut));
v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut));
v_addressesIut := f_getAddresses(c_compIut);
v_longPosVectorNodeA := f_getPosition(c_compNodeA);
v_addressesNodeA := f_getAddresses(c_compNodeA);
......@@ -839,7 +839,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
mw_geoNwInd(
mw_geoNwPdu(
mw_geoNwUnicastPacketWithNextHeader(
mw_shortPosVectorPosition_withDelta(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)), // On purpose: IUT should derive this value from SAP dest mac
mw_shortPosVectorPosition(f_longPosVector2ShortPosVector(v_longPosVectorNodeB)), // On purpose: IUT should derive this value from SAP dest mac
?,
e_ipv6
)
......@@ -929,7 +929,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration
f_cf01UpGn6();
v_longPosVectorIut := mw_longPosVectorPosition_withDelta(f_getPosition(c_compIut));
v_longPosVectorIut := mw_longPosVectorPosition(f_getPosition(c_compIut));
v_addressesIut := f_getAddresses(c_compIut);
v_longPosVectorNodeB := f_getPosition(c_compNodeB);
v_addressesNodeB := f_getAddresses(c_compNodeB);
......
......@@ -37,7 +37,7 @@ module AtsSecurity_Templates {
template (present) Payload mw_secCamPayload := {
decodedPayload := {
btpPacket := mw_btpA(
btpPacket := mw_btpB(
PX_DESTINATION_PORT,
?,
mw_btpCamPayload
......
......@@ -190,10 +190,6 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_CAM_05_05_BO());
execute(TC_SEC_ITSS_RCV_CAM_06_01_BO());
execute(TC_SEC_ITSS_RCV_CAM_06_02_BO());
if (PICS_ITS_C2C_MODE) {
execute(TC_SEC_ITSS_RCV_CAM_06_03_BO());
execute(TC_SEC_ITSS_RCV_CAM_06_04_BO());
}
execute(TC_SEC_ITSS_RCV_CAM_07_01_BO());
execute(TC_SEC_ITSS_RCV_CAM_07_02_BO());
execute(TC_SEC_ITSS_RCV_CAM_09_02_BO());
......@@ -250,10 +246,6 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_DENM_05_04_BO());
execute(TC_SEC_ITSS_RCV_DENM_06_01_BO());
execute(TC_SEC_ITSS_RCV_DENM_06_02_BO());
if (PICS_ITS_C2C_MODE) {
execute(TC_SEC_ITSS_RCV_DENM_06_03_BO());
execute(TC_SEC_ITSS_RCV_DENM_06_04_BO());
}
execute(TC_SEC_ITSS_RCV_DENM_07_01_BO());
execute(TC_SEC_ITSS_RCV_DENM_07_02_BO());
if (PICS_USE_CIRCULAR_REGION) {
......@@ -268,10 +260,6 @@ module ItsSecurity_TestControl {
if (PICS_USE_IDENTIFIED_REGION) {
execute(TC_SEC_ITSS_RCV_DENM_08_04_BO());
}
if (PICS_ITS_C2C_MODE) {
execute(TC_SEC_ITSS_RCV_DENM_08_05_BV());
execute(TC_SEC_ITSS_RCV_DENM_08_06_BO());
}
execute(TC_SEC_ITSS_RCV_DENM_09_02_BO());
execute(TC_SEC_ITSS_RCV_DENM_09_03_BO());
execute(TC_SEC_ITSS_RCV_DENM_09_04_BO());
......@@ -322,10 +310,6 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_GENMSG_05_04_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_06_01_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_06_02_BO());
if (PICS_ITS_C2C_MODE) {
execute(TC_SEC_ITSS_RCV_GENMSG_06_03_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_06_04_BO());
}
execute(TC_SEC_ITSS_RCV_GENMSG_07_01_BO());
if (PICS_USE_CIRCULAR_REGION) {
execute(TC_SEC_ITSS_RCV_GENMSG_08_01_BO());
......@@ -339,10 +323,6 @@ module ItsSecurity_TestControl {
if (PICS_USE_IDENTIFIED_REGION) {
execute(TC_SEC_ITSS_RCV_GENMSG_08_04_BO());
}
if (PICS_ITS_C2C_MODE) {
execute(TC_SEC_ITSS_RCV_GENMSG_08_05_BV());
execute(TC_SEC_ITSS_RCV_GENMSG_08_06_BO());
}
execute(TC_SEC_ITSS_RCV_GENMSG_09_02_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_09_03_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_09_04_BO());
......
......@@ -16,7 +16,7 @@ module ItsSrem_TestControl {
// Test Execution
control {
if (not PICS_RSU) {
if (not PICS_RSU_ROLE) {
if (PICS_SREM_GENERATION) {
......@@ -36,7 +36,7 @@ module ItsSrem_TestControl {
}
if (PICS_RSU) {
if (PICS_RSU_ROLE) {
if (PICS_SREM_GENERATION) {
......
......@@ -46,8 +46,8 @@ module ItsSrem_TpFunctions {
var SremInd v_sremInd;
// Test control
if (PICS_RSU or not PICS_SREM_GENERATION) {
log("*** " & testcasename() & ": not PICS_RSU and PICS_SREM_GENERATION required for executing the TC ***");
if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SREM_GENERATION required for executing the TC ***");
setverdict(inconc);
stop;
}
......@@ -99,8 +99,8 @@ module ItsSrem_TpFunctions {
var SremInd v_sremInd;
// Test control
if (PICS_RSU or not PICS_SREM_GENERATION) {
log("*** " & testcasename() & ": not PICS_RSU and PICS_SREM_GENERATION required for executing the TC ***");
if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SREM_GENERATION required for executing the TC ***");
setverdict(inconc);
stop;
}
......@@ -157,8 +157,8 @@ module ItsSrem_TpFunctions {
var integer i;
// Test control
if (PICS_RSU or not PICS_SREM_GENERATION) {
log("*** " & testcasename() & ": not PICS_RSU and PICS_SREM_GENERATION required for executing the TC ***");
if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SREM_GENERATION required for executing the TC ***");
setverdict(inconc);
stop;
}
......@@ -333,8 +333,8 @@ module ItsSrem_TpFunctions {
var SremInd v_sremInd;
// Test control
if (PICS_RSU or not PICS_SREM_GENERATION) {
log("*** " & testcasename() & ": not PICS_RSU and PICS_SREM_GENERATION required for executing the TC ***");
if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SREM_GENERATION required for executing the TC ***");
setverdict(inconc);
stop;
}
......@@ -417,8 +417,8 @@ module ItsSrem_TpFunctions {
var SsemReq v_ssemReq;
var integer i;
if (PICS_RSU or not PICS_SSEM_RECEPTION) {
log("*** " & testcasename() & ": not PICS_RSU and PICS_SSEM_RECEPTION required for executing the TC ***");
if (PICS_RSU_ROLE or not PICS_SSEM_RECEPTION) {
log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SSEM_RECEPTION required for executing the TC ***");
setverdict(inconc);
stop;
}
......@@ -470,8 +470,8 @@ module ItsSrem_TpFunctions {
// Local variables
// Test control
if (PICS_RSU or not PICS_SREM_GENERATION) {
log("*** " & testcasename() & ": not PICS_RSU and PICS_SREM_GENERATION required for executing the TC ***");
if (PICS_RSU_ROLE or not PICS_SREM_GENERATION) {
log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SREM_GENERATION required for executing the TC ***");
setverdict(inconc);
stop;
}
......@@ -532,8 +532,8 @@ module ItsSrem_TpFunctions {
var SremReq v_sremReq;
var integer i;
if (PICS_RSU or not PICS_SREM_RECEPTION) {
log("*** " & testcasename() & ": not PICS_RSU and PICS_SREM_RECEPTION required for executing the TC ***");
if (PICS_RSU_ROLE or not PICS_SREM_RECEPTION) {
log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SREM_RECEPTION required for executing the TC ***");
setverdict(inconc);
stop;
}
......
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