Commit 964ca145 authored by garciay's avatar garciay
Browse files

Merge with C2C project

parent 4ebfb17a
...@@ -29,8 +29,8 @@ module ItsCam_TpFunctions { ...@@ -29,8 +29,8 @@ module ItsCam_TpFunctions {
import from LibItsCam_Functions all; import from LibItsCam_Functions all;
import from LibItsCam_Templates all; import from LibItsCam_Templates all;
import from LibItsCam_TypesAndValues all; import from LibItsCam_TypesAndValues all;
import from LibItsCam_Pics {modulepar all;} import from LibItsCam_Pics all;
import from LibItsCam_Pixits {modulepar all;} import from LibItsCam_Pixits all;
// ASN.1 // ASN.1
import from ITS_Container language "ASN.1:1997" all; import from ITS_Container language "ASN.1:1997" all;
import from CAM_PDU_Descriptions language "ASN.1:1997" all; import from CAM_PDU_Descriptions language "ASN.1:1997" all;
......
...@@ -76,7 +76,7 @@ module ItsIpv6OverGeoNetworking_TestCases { ...@@ -76,7 +76,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration // Test component configuration
f_cf01UpGn6(); 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_addressesIut := f_getAddresses(c_compIut);
v_addressesNodeB := f_getAddresses(c_compNodeB); v_addressesNodeB := f_getAddresses(c_compNodeB);
...@@ -180,7 +180,7 @@ module ItsIpv6OverGeoNetworking_TestCases { ...@@ -180,7 +180,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration // Test component configuration
f_cf01UpGn6(); 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_addressesIut := f_getAddresses(c_compIut);
// Test adapter configuration // Test adapter configuration
...@@ -287,7 +287,7 @@ module ItsIpv6OverGeoNetworking_TestCases { ...@@ -287,7 +287,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration // Test component configuration
f_cf01UpGn6(); 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_addressesIut := f_getAddresses(c_compIut);
// Test adapter configuration // Test adapter configuration
...@@ -401,7 +401,7 @@ module ItsIpv6OverGeoNetworking_TestCases { ...@@ -401,7 +401,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration // Test component configuration
f_cf01UpGn6(); 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_addressesIut := f_getAddresses(c_compIut);
v_longPosVectorNodeA := f_getPosition(c_compNodeA); v_longPosVectorNodeA := f_getPosition(c_compNodeA);
v_addressesNodeA := f_getAddresses(c_compNodeA); v_addressesNodeA := f_getAddresses(c_compNodeA);
...@@ -532,7 +532,7 @@ module ItsIpv6OverGeoNetworking_TestCases { ...@@ -532,7 +532,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration // Test component configuration
f_cf01UpGn6(); 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_addressesIut := f_getAddresses(c_compIut);
v_longPosVectorNodeB := f_getPosition(c_compNodeB); v_longPosVectorNodeB := f_getPosition(c_compNodeB);
v_addressesNodeB := f_getAddresses(c_compNodeB); v_addressesNodeB := f_getAddresses(c_compNodeB);
...@@ -667,7 +667,7 @@ module ItsIpv6OverGeoNetworking_TestCases { ...@@ -667,7 +667,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration // Test component configuration
f_cf01UpGn6(); 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_addressesIut := f_getAddresses(c_compIut);
v_longPosVectorNodeA := f_getPosition(c_compNodeA); v_longPosVectorNodeA := f_getPosition(c_compNodeA);
v_addressesNodeA := f_getAddresses(c_compNodeA); v_addressesNodeA := f_getAddresses(c_compNodeA);
...@@ -706,7 +706,7 @@ module ItsIpv6OverGeoNetworking_TestCases { ...@@ -706,7 +706,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
mw_geoNwInd( mw_geoNwInd(
mw_geoNwPdu( mw_geoNwPdu(
mw_geoNwUnicastPacketWithNextHeader( 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 e_ipv6
) )
...@@ -801,7 +801,7 @@ module ItsIpv6OverGeoNetworking_TestCases { ...@@ -801,7 +801,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration // Test component configuration
f_cf01UpGn6(); 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_addressesIut := f_getAddresses(c_compIut);
v_longPosVectorNodeA := f_getPosition(c_compNodeA); v_longPosVectorNodeA := f_getPosition(c_compNodeA);
v_addressesNodeA := f_getAddresses(c_compNodeA); v_addressesNodeA := f_getAddresses(c_compNodeA);
...@@ -839,7 +839,7 @@ module ItsIpv6OverGeoNetworking_TestCases { ...@@ -839,7 +839,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
mw_geoNwInd( mw_geoNwInd(
mw_geoNwPdu( mw_geoNwPdu(
mw_geoNwUnicastPacketWithNextHeader( 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 e_ipv6
) )
...@@ -929,7 +929,7 @@ module ItsIpv6OverGeoNetworking_TestCases { ...@@ -929,7 +929,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
// Test component configuration // Test component configuration
f_cf01UpGn6(); 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_addressesIut := f_getAddresses(c_compIut);
v_longPosVectorNodeB := f_getPosition(c_compNodeB); v_longPosVectorNodeB := f_getPosition(c_compNodeB);
v_addressesNodeB := f_getAddresses(c_compNodeB); v_addressesNodeB := f_getAddresses(c_compNodeB);
......
...@@ -37,7 +37,7 @@ module AtsSecurity_Templates { ...@@ -37,7 +37,7 @@ module AtsSecurity_Templates {
template (present) Payload mw_secCamPayload := { template (present) Payload mw_secCamPayload := {
decodedPayload := { decodedPayload := {
btpPacket := mw_btpA( btpPacket := mw_btpB(
PX_DESTINATION_PORT, PX_DESTINATION_PORT,
?, ?,
mw_btpCamPayload mw_btpCamPayload
......
...@@ -93,8 +93,8 @@ module ItsSecurity_TestCases { ...@@ -93,8 +93,8 @@ module ItsSecurity_TestCases {
var LongPosVector v_longPosVectorIut; var LongPosVector v_longPosVectorIut;
// Test control // Test control
if (not(PICS_GN_SECURITY)) { if (not(PICS_GN_SECURITY) or not(PICS_ITS_AID_OTHER_PROFILE)) {
log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***"); log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_AID_OTHER_PROFILE' required for executing the TC ***");
stop; stop;
} }
...@@ -632,6 +632,7 @@ module ItsSecurity_TestCases { ...@@ -632,6 +632,7 @@ module ItsSecurity_TestCases {
for (var integer v_counter := 1; v_counter < lengthof(v_headersFields); v_counter := v_counter + 1) { for (var integer v_counter := 1; v_counter < lengthof(v_headersFields); v_counter := v_counter + 1) {
// Check forbidden header // Check forbidden header
// FIXME: 'generation_time_with_confidence' does not exist. is it e_generation_time_standard_deviation ?
if (match(v_headersFields[v_counter].type_, e_generation_time_standard_deviation)) { if (match(v_headersFields[v_counter].type_, e_generation_time_standard_deviation)) {
log("*** " & testcasename() & ": FAIL: Forbidden header present"); log("*** " & testcasename() & ": FAIL: Forbidden header present");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error); f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
...@@ -740,7 +741,7 @@ module ItsSecurity_TestCases { ...@@ -740,7 +741,7 @@ module ItsSecurity_TestCases {
mw_header_field_signer_info_certificate mw_header_field_signer_info_certificate
)))) { )))) {
tc_ac.stop; tc_ac.stop;
t_minTransInterval.start; // Removed in C2C t_minTransInterval.start;
log("*** " & testcasename() & ": INFO: Initial conditions: First CAM message with certificate received ***"); log("*** " & testcasename() & ": INFO: Initial conditions: First CAM message with certificate received ***");
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
} }
...@@ -10712,7 +10713,7 @@ module ItsSecurity_TestCases { ...@@ -10712,7 +10713,7 @@ module ItsSecurity_TestCases {
/** /**
* @desc Check that IUT discards Secured CAM if the generation_time is more than 5 minute in the past (C2C only) * @desc Check that IUT discards Secured CAM if the generation_time is more than 5 minute in the past (C2C only)
* <pre> * <pre>
* Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE * Pics Selection: PICS_GN_SECURITY
* Config Id: CF01 * Config Id: CF01
* Initial conditions: * Initial conditions:
* with { * with {
...@@ -10742,8 +10743,8 @@ module ItsSecurity_TestCases { ...@@ -10742,8 +10743,8 @@ module ItsSecurity_TestCases {
var GnRawPayload v_sentRawPayload; var GnRawPayload v_sentRawPayload;
// Test adapter configuration // Test adapter configuration
if (not(PICS_GN_SECURITY) or not(PICS_ITS_C2C_MODE)) { if (not(PICS_GN_SECURITY)) {
log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***"); log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
stop; stop;
} }
...@@ -10790,7 +10791,7 @@ module ItsSecurity_TestCases { ...@@ -10790,7 +10791,7 @@ module ItsSecurity_TestCases {
/** /**
* @desc Check that IUT discards Secured CAM if the generation_time is more than 5 minute in the future(C2C only) * @desc Check that IUT discards Secured CAM if the generation_time is more than 5 minute in the future(C2C only)
* <pre> * <pre>
* Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE * Pics Selection: PICS_GN_SECURITY
* Config Id: CF01 * Config Id: CF01
* Initial conditions: * Initial conditions:
* with { * with {
...@@ -10820,8 +10821,8 @@ module ItsSecurity_TestCases { ...@@ -10820,8 +10821,8 @@ module ItsSecurity_TestCases {
var GnRawPayload v_sentRawPayload; var GnRawPayload v_sentRawPayload;
// Test adapter configuration // Test adapter configuration
if (not(PICS_GN_SECURITY) or not(PICS_ITS_C2C_MODE)) { if (not(PICS_GN_SECURITY)) {
log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***"); log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
stop; stop;
} }
...@@ -15527,7 +15528,7 @@ module ItsSecurity_TestCases { ...@@ -15527,7 +15528,7 @@ module ItsSecurity_TestCases {
/** /**
* @desc Check that IUT discards a Secured DENM if the generation_time is more than 10 minute in the past (C2C only) * @desc Check that IUT discards a Secured DENM if the generation_time is more than 10 minute in the past (C2C only)
* <pre> * <pre>
* Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE * Pics Selection: PICS_GN_SECURITY
* Config Id: CF01 * Config Id: CF01
* Initial conditions: * Initial conditions:
* with { * with {
...@@ -15558,8 +15559,8 @@ module ItsSecurity_TestCases { ...@@ -15558,8 +15559,8 @@ module ItsSecurity_TestCases {
var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB); // Use NodeB var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB); // Use NodeB
// Test adapter configuration // Test adapter configuration
if (not(PICS_GN_SECURITY) or not(PICS_ITS_C2C_MODE)) { if (not(PICS_GN_SECURITY)) {
log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***"); log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
stop; stop;
} }
...@@ -15606,7 +15607,7 @@ module ItsSecurity_TestCases { ...@@ -15606,7 +15607,7 @@ module ItsSecurity_TestCases {
/** /**
* @desc Check that IUT discards a Secured DENM if the generation_time is more than 10 minute in the future(C2C only) * @desc Check that IUT discards a Secured DENM if the generation_time is more than 10 minute in the future(C2C only)
* <pre> * <pre>
* Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE * Pics Selection: PICS_GN_SECURITY
* Config Id: CF01 * Config Id: CF01
* Initial conditions: * Initial conditions:
* with { * with {
...@@ -15637,8 +15638,8 @@ module ItsSecurity_TestCases { ...@@ -15637,8 +15638,8 @@ module ItsSecurity_TestCases {
var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB); // Use NodeB var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB); // Use NodeB
// Test adapter configuration // Test adapter configuration
if (not(PICS_GN_SECURITY) or not(PICS_ITS_C2C_MODE)) { if (not(PICS_GN_SECURITY)) {
log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***"); log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
stop; stop;
} }
...@@ -16159,7 +16160,7 @@ module ItsSecurity_TestCases { ...@@ -16159,7 +16160,7 @@ module ItsSecurity_TestCases {
/** /**
* @desc Check that IUT accepts a Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is 29.9 km (C2C only) * @desc Check that IUT accepts a Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is 29.9 km (C2C only)
* <pre> * <pre>
* Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE * Pics Selection: PICS_GN_SECURITY
* Config Id: CF01 * Config Id: CF01
* Expected behavior: * Expected behavior:
* with { * with {
...@@ -16193,8 +16194,8 @@ module ItsSecurity_TestCases { ...@@ -16193,8 +16194,8 @@ module ItsSecurity_TestCases {
// Test control // Test control
if (not(PICS_GN_SECURITY) or not(PICS_ITS_C2C_MODE)) { if (not(PICS_GN_SECURITY)) {
log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***"); log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
stop; stop;
} }
...@@ -16253,7 +16254,7 @@ module ItsSecurity_TestCases { ...@@ -16253,7 +16254,7 @@ module ItsSecurity_TestCases {
/** /**
* @desc Check that IUT discards Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is more than 30 km * @desc Check that IUT discards Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is more than 30 km
* <pre> * <pre>
* Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE * Pics Selection: PICS_GN_SECURITY
* Config Id: CF01 * Config Id: CF01
* Expected behavior: * Expected behavior:
* with { * with {
...@@ -16287,8 +16288,8 @@ module ItsSecurity_TestCases { ...@@ -16287,8 +16288,8 @@ module ItsSecurity_TestCases {
// Test control // Test control
if (not(PICS_GN_SECURITY) or not (PICS_ITS_C2C_MODE)) { if (not(PICS_GN_SECURITY)) {
log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY and PICS_ITS_C2C_MODE' required for executing the TC ***"); log("*** " & testcasename() & ":ERROR: 'PICS_GN_SECURITY' required for executing the TC ***");
stop; stop;
} }
...@@ -18013,7 +18014,7 @@ module ItsSecurity_TestCases { ...@@ -18013,7 +18014,7 @@ module ItsSecurity_TestCases {
mw_geoNwSecPdu( mw_geoNwSecPdu(
mdw_securedMessage_dummy, mdw_securedMessage_dummy,
mw_geoNwBroadcastPacketWithArea( mw_geoNwBroadcastPacketWithArea(
mw_longPosVectorPosition_withDelta( mw_longPosVectorPosition(
v_longPosVectorNodeB v_longPosVectorNodeB
), ),
?, ?,
...@@ -18064,7 +18065,7 @@ module ItsSecurity_TestCases { ...@@ -18064,7 +18065,7 @@ module ItsSecurity_TestCases {
mw_geoNwSecPdu( mw_geoNwSecPdu(
mdw_securedMessage_dummy, mdw_securedMessage_dummy,
mw_geoNwBroadcastPacketWithArea( mw_geoNwBroadcastPacketWithArea(
mw_longPosVectorPosition_withDelta( mw_longPosVectorPosition(
v_longPosVectorIut v_longPosVectorIut
), ),
?, ?,
...@@ -20995,7 +20996,7 @@ module ItsSecurity_TestCases { ...@@ -20995,7 +20996,7 @@ module ItsSecurity_TestCases {
/** /**
* @desc Check that IUT discards Secured GN Message if the generation_time is more than 10 minute in the past (C2C only) * @desc Check that IUT discards Secured GN Message if the generation_time is more than 10 minute in the past (C2C only)
* <pre> * <pre>
* Pics Selection: PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE * Pics Selection: PICS_GN_SECURITY and PICS_GN_GBC_SRC
* Config Id: CF01 * Config Id: CF01
* Initial conditions: * Initial conditions:
* with { * with {
...@@ -21024,8 +21025,8 @@ module ItsSecurity_TestCases { ...@@ -21024,8 +21025,8 @@ module ItsSecurity_TestCases {
var ItsGeoNetworking v_nodeD; var ItsGeoNetworking v_nodeD;
// Test control // Test control
if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC) or not(PICS_ITS_C2C_MODE)) { if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC)) {
log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE' required for executing the TC ***"); log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC' required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -21092,7 +21093,7 @@ module ItsSecurity_TestCases { ...@@ -21092,7 +21093,7 @@ module ItsSecurity_TestCases {
/** /**
* @desc Check that IUT discards Secured GN Message if the generation_time is more than 10 minute in the future(C2C only) * @desc Check that IUT discards Secured GN Message if the generation_time is more than 10 minute in the future(C2C only)
* <pre> * <pre>
* Pics Selection: PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE * Pics Selection: PICS_GN_SECURITY and PICS_GN_GBC_SRC
* Config Id: CF01 * Config Id: CF01
* Initial conditions: * Initial conditions:
* with { * with {
...@@ -21121,8 +21122,8 @@ module ItsSecurity_TestCases { ...@@ -21121,8 +21122,8 @@ module ItsSecurity_TestCases {
var ItsGeoNetworking v_nodeD; var ItsGeoNetworking v_nodeD;
// Test control // Test control
if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC) or not(PICS_ITS_C2C_MODE)) { if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC)) {
log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE' required for executing the TC ***"); log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC' required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -21519,8 +21520,8 @@ module ItsSecurity_TestCases { ...@@ -21519,8 +21520,8 @@ module ItsSecurity_TestCases {
var ItsGeoNetworking v_nodeD; var ItsGeoNetworking v_nodeD;
// Test control // Test control
if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC) or not(PICS_ITS_C2C_MODE)) { if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC)) {
log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE' required for executing the TC ***"); log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC' required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -21547,7 +21548,7 @@ module ItsSecurity_TestCases { ...@@ -21547,7 +21548,7 @@ module ItsSecurity_TestCases {
/** /**
* @desc Check that IUT accepts a Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is 29.9 km (C2C only) * @desc Check that IUT accepts a Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is 29.9 km (C2C only)
* <pre> * <pre>
* Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE * Pics Selection: PICS_GN_SECURITY
* Config Id: CF01 * Config Id: CF01
* Expected behavior: * Expected behavior:
* with { * with {
...@@ -21604,7 +21605,7 @@ module ItsSecurity_TestCases { ...@@ -21604,7 +21605,7 @@ module ItsSecurity_TestCases {
/** /**
* @desc Check that IUT discards Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is more than 30 km * @desc Check that IUT discards Secured DENM if the distance between the current position of IUT and the value of optional HeaderField generation_location is more than 30 km
* <pre> * <pre>
* Pics Selection: PICS_GN_SECURITY and PICS_ITS_C2C_MODE * Pics Selection: PICS_GN_SECURITY
* Config Id: CF01 * Config Id: CF01
* Expected behavior: * Expected behavior:
* with { * with {
...@@ -21633,8 +21634,8 @@ module ItsSecurity_TestCases { ...@@ -21633,8 +21634,8 @@ module ItsSecurity_TestCases {
var ItsGeoNetworking v_nodeD; var ItsGeoNetworking v_nodeD;
// Test control // Test control
if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC) or not(PICS_ITS_C2C_MODE)) { if (not(PICS_GN_SECURITY) or not(PICS_GN_GBC_SRC)) {
log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC and PICS_ITS_C2C_MODE' required for executing the TC ***"); log("*** " & testcasename() & ": 'PICS_GN_SECURITY and PICS_GN_GBC_SRC' required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -190,10 +190,6 @@ module ItsSecurity_TestControl { ...@@ -190,10 +190,6 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_CAM_05_05_BO()); 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_01_BO());
execute(TC_SEC_ITSS_RCV_CAM_06_02_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_01_BO());
execute(TC_SEC_ITSS_RCV_CAM_07_02_BO()); execute(TC_SEC_ITSS_RCV_CAM_07_02_BO());
execute(TC_SEC_ITSS_RCV_CAM_09_02_BO()); execute(TC_SEC_ITSS_RCV_CAM_09_02_BO());
...@@ -250,10 +246,6 @@ module ItsSecurity_TestControl { ...@@ -250,10 +246,6 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_DENM_05_04_BO()); 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_01_BO());
execute(TC_SEC_ITSS_RCV_DENM_06_02_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_01_BO());
execute(TC_SEC_ITSS_RCV_DENM_07_02_BO()); execute(TC_SEC_ITSS_RCV_DENM_07_02_BO());
if (PICS_USE_CIRCULAR_REGION) { if (PICS_USE_CIRCULAR_REGION) {
...@@ -268,10 +260,6 @@ module ItsSecurity_TestControl { ...@@ -268,10 +260,6 @@ module ItsSecurity_TestControl {
if (PICS_USE_IDENTIFIED_REGION) { if (PICS_USE_IDENTIFIED_REGION) {
execute(TC_SEC_ITSS_RCV_DENM_08_04_BO()); 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_02_BO());
execute(TC_SEC_ITSS_RCV_DENM_09_03_BO()); execute(TC_SEC_ITSS_RCV_DENM_09_03_BO());
execute(TC_SEC_ITSS_RCV_DENM_09_04_BO()); execute(TC_SEC_ITSS_RCV_DENM_09_04_BO());
...@@ -322,10 +310,6 @@ module ItsSecurity_TestControl { ...@@ -322,10 +310,6 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_GENMSG_05_04_BO()); 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_01_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_06_02_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()); execute(TC_SEC_ITSS_RCV_GENMSG_07_01_BO());
if (PICS_USE_CIRCULAR_REGION) { if (PICS_USE_CIRCULAR_REGION) {
execute(TC_SEC_ITSS_RCV_GENMSG_08_01_BO()); execute(TC_SEC_ITSS_RCV_GENMSG_08_01_BO());
...@@ -339,10 +323,6 @@ module ItsSecurity_TestControl { ...@@ -339,10 +323,6 @@ module ItsSecurity_TestControl {
if (PICS_USE_IDENTIFIED_REGION) { if (PICS_USE_IDENTIFIED_REGION) {
execute(TC_SEC_ITSS_RCV_GENMSG_08_04_BO()); 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_02_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_09_03_BO()); execute(TC_SEC_ITSS_RCV_GENMSG_09_03_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_09_04_BO()); execute(TC_SEC_ITSS_RCV_GENMSG_09_04_BO());
......
...@@ -16,7 +16,7 @@ module ItsSrem_TestControl { ...@@ -16,7 +16,7 @@ module ItsSrem_TestControl {
// Test Execution // Test Execution
control { control {
if (not PICS_RSU) { if (not PICS_RSU_ROLE) {
if (PICS_SREM_GENERATION) { if (PICS_SREM_GENERATION) {
...@@ -36,7 +36,7 @@ module ItsSrem_TestControl { ...@@ -36,7 +36,7 @@ module ItsSrem_TestControl {
} }