Commit 0bee296d authored by garciay's avatar garciay
Browse files

Remove PICS_RSU

IS PICS reviews
Remove some TODOs
parent 5b8db9db
This source diff could not be displayed because it is too large. You can view the blob instead.
Index: AtsCAM/ItsCam_TpFunctions.ttcn Index: AtsCAM/ItsCam_TpFunctions.ttcn
=================================================================== ===================================================================
--- AtsCAM/ItsCam_TpFunctions.ttcn (revision 2630) --- AtsCAM/ItsCam_TpFunctions.ttcn (revision 2639)
+++ AtsCAM/ItsCam_TpFunctions.ttcn (working copy) +++ AtsCAM/ItsCam_TpFunctions.ttcn (working copy)
@@ -26,6 +26,7 @@ @@ -30,6 +30,7 @@
import from LibItsCommon_Templates all; import from LibItsCommon_Templates all;
import from LibItsCommon_Functions all; import from LibItsCommon_Functions all;
import from LibItsCommon_Pixits all; import from LibItsCommon_Pixits all;
...@@ -10,7 +10,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -10,7 +10,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
// LibItsCam // LibItsCam
import from LibItsCam_TestSystem all; import from LibItsCam_TestSystem all;
@@ -401,7 +402,7 @@ @@ -406,7 +407,7 @@
} }
for (v_cnt:=0; v_cnt<lengthof(p_utTriggers); v_cnt:=v_cnt+1) { for (v_cnt:=0; v_cnt<lengthof(p_utTriggers); v_cnt:=v_cnt+1) {
...@@ -19,7 +19,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -19,7 +19,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
tc_ac.start; tc_ac.start;
alt { alt {
@@ -557,7 +558,9 @@ @@ -561,7 +562,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Brake pedal being deactivated", "Brake pedal being deactivated",
{ m_setAccelerationControlStatus(AccelerationControl_brakePedalEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) }, { m_setAccelerationControlStatus(AccelerationControl_brakePedalEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
...@@ -30,7 +30,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -30,7 +30,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -629,7 +632,9 @@ @@ -633,7 +636,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Gas pedal being deactivated", "Gas pedal being deactivated",
{ m_setAccelerationControlStatus(AccelerationControl_gasPedalEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) }, { m_setAccelerationControlStatus(AccelerationControl_gasPedalEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
...@@ -41,7 +41,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -41,7 +41,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -701,7 +706,9 @@ @@ -705,7 +710,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Emergency brake being deactivated", "Emergency brake being deactivated",
{ m_setAccelerationControlStatus(AccelerationControl_emergencyBrakeEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) }, { m_setAccelerationControlStatus(AccelerationControl_emergencyBrakeEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
...@@ -52,7 +52,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -52,7 +52,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -773,7 +780,9 @@ @@ -777,7 +784,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Collision warning being deactivated", "Collision warning being deactivated",
{ m_setAccelerationControlStatus(AccelerationControl_collisionWarningEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) }, { m_setAccelerationControlStatus(AccelerationControl_collisionWarningEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
...@@ -63,7 +63,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -63,7 +63,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -845,7 +854,9 @@ @@ -849,7 +858,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"ACC being deactivated", "ACC being deactivated",
{ m_setAccelerationControlStatus(AccelerationControl_accEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) }, { m_setAccelerationControlStatus(AccelerationControl_accEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
...@@ -74,7 +74,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -74,7 +74,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -917,7 +928,9 @@ @@ -921,7 +932,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Cruise control being deactivated", "Cruise control being deactivated",
{ m_setAccelerationControlStatus(AccelerationControl_cruiseControlEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) }, { m_setAccelerationControlStatus(AccelerationControl_cruiseControlEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
...@@ -85,7 +85,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -85,7 +85,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -989,7 +1002,9 @@ @@ -993,7 +1006,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Speed limiter control being deactivated", "Speed limiter control being deactivated",
{ m_setAccelerationControlStatus(AccelerationControl_speedLimiterEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) }, { m_setAccelerationControlStatus(AccelerationControl_speedLimiterEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
...@@ -96,7 +96,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -96,7 +96,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -1061,7 +1076,9 @@ @@ -1065,7 +1080,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Low beam headlights being deactivated", "Low beam headlights being deactivated",
{ m_setExteriorLightsStatus(ExteriorLights_lowBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) }, { m_setExteriorLightsStatus(ExteriorLights_lowBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
...@@ -107,7 +107,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -107,7 +107,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -1133,7 +1150,9 @@ @@ -1137,7 +1154,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"High beam headlights being deactivated", "High beam headlights being deactivated",
{ m_setExteriorLightsStatus(ExteriorLights_highBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) }, { m_setExteriorLightsStatus(ExteriorLights_highBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
...@@ -118,7 +118,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -118,7 +118,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -1205,7 +1224,9 @@ @@ -1209,7 +1228,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Left turn signal being deactivated", "Left turn signal being deactivated",
{ m_setExteriorLightsStatus(ExteriorLights_leftTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) }, { m_setExteriorLightsStatus(ExteriorLights_leftTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
...@@ -129,7 +129,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -129,7 +129,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -1277,7 +1298,9 @@ @@ -1281,7 +1302,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Right turn signal being deactivated", "Right turn signal being deactivated",
{ m_setExteriorLightsStatus(ExteriorLights_rightTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) }, { m_setExteriorLightsStatus(ExteriorLights_rightTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
...@@ -140,7 +140,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -140,7 +140,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -1349,7 +1372,9 @@ @@ -1353,7 +1376,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Daytime running lights being deactivated", "Daytime running lights being deactivated",
{ m_setExteriorLightsStatus(ExteriorLights_daytimeRunningLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) }, { m_setExteriorLightsStatus(ExteriorLights_daytimeRunningLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
...@@ -151,7 +151,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -151,7 +151,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -1421,7 +1446,9 @@ @@ -1425,7 +1450,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Reverese light being deactivated", "Reverese light being deactivated",
{ m_setExteriorLightsStatus(ExteriorLights_reverseLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) }, { m_setExteriorLightsStatus(ExteriorLights_reverseLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
...@@ -162,7 +162,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -162,7 +162,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -1493,7 +1520,9 @@ @@ -1497,7 +1524,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Fog lights being deactivated", "Fog lights being deactivated",
{ m_setExteriorLightsStatus(ExteriorLights_fogLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) }, { m_setExteriorLightsStatus(ExteriorLights_fogLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
...@@ -173,7 +173,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -173,7 +173,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
); );
// Postamble // Postamble
@@ -1565,7 +1594,9 @@ @@ -1569,7 +1598,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Parking lights being deactivated", "Parking lights being deactivated",
{ m_setExteriorLightsStatus(ExteriorLights_parkingLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) }, { m_setExteriorLightsStatus(ExteriorLights_parkingLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
...@@ -186,9 +186,9 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -186,9 +186,9 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
// Postamble // Postamble
Index: AtsDENM/ItsDenm_TpFunctions.ttcn Index: AtsDENM/ItsDenm_TpFunctions.ttcn
=================================================================== ===================================================================
--- AtsDENM/ItsDenm_TpFunctions.ttcn (revision 2630) --- AtsDENM/ItsDenm_TpFunctions.ttcn (revision 2639)
+++ AtsDENM/ItsDenm_TpFunctions.ttcn (working copy) +++ AtsDENM/ItsDenm_TpFunctions.ttcn (working copy)
@@ -18,6 +18,7 @@ @@ -22,6 +22,7 @@
import from LibItsCommon_TypesAndValues all; import from LibItsCommon_TypesAndValues all;
import from LibItsCommon_Templates all; import from LibItsCommon_Templates all;
import from LibItsCommon_Functions all; import from LibItsCommon_Functions all;
...@@ -196,7 +196,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn ...@@ -196,7 +196,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn
// LibIts // LibIts
import from DENM_PDU_Descriptions language "ASN.1:1997" all; import from DENM_PDU_Descriptions language "ASN.1:1997" all;
@@ -256,7 +257,7 @@ @@ -262,7 +263,7 @@
// Preamble // Preamble
f_prInitialState(); f_prInitialState();
for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) { for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) {
...@@ -205,7 +205,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn ...@@ -205,7 +205,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn
f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd); f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID; v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID;
} }
@@ -263,7 +264,7 @@ @@ -269,7 +270,7 @@
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
// Test Body // Test Body
...@@ -214,7 +214,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn ...@@ -214,7 +214,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn
f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd); f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
v_actionIds[lengthof(v_actionIds) - 1] := v_denmInd.msgIn.denm.management.actionID; v_actionIds[lengthof(v_actionIds) - 1] := v_denmInd.msgIn.denm.management.actionID;
@@ -447,7 +448,7 @@ @@ -453,7 +454,7 @@
// Preamble // Preamble
f_prInitialState(); f_prInitialState();
for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) { for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) {
...@@ -223,7 +223,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn ...@@ -223,7 +223,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn
f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd); f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID; v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID;
v_timestampIts := v_denmInd.msgIn.denm.management.referenceTime; v_timestampIts := v_denmInd.msgIn.denm.management.referenceTime;
@@ -455,7 +456,7 @@ @@ -461,7 +462,7 @@
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
// Test Body // Test Body
...@@ -232,7 +232,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn ...@@ -232,7 +232,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn
tc_ac.start; tc_ac.start;
alt { alt {
@@ -530,7 +531,7 @@ @@ -536,7 +537,7 @@
// Preamble // Preamble
f_prInitialState(); f_prInitialState();
for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) { for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) {
...@@ -241,7 +241,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn ...@@ -241,7 +241,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn
f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd); f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
f_poCancelEvent(e_iut, v_denmInd.msgIn.denm.management.actionID); f_poCancelEvent(e_iut, v_denmInd.msgIn.denm.management.actionID);
} }
@@ -539,7 +540,7 @@ @@ -545,7 +546,7 @@
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
// Test Body // Test Body
...@@ -250,7 +250,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn ...@@ -250,7 +250,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn
tc_ac.start; tc_ac.start;
alt { alt {
@@ -1254,7 +1255,7 @@ @@ -1260,7 +1261,7 @@
// Preamble // Preamble
f_prInitialState(); f_prInitialState();
for (i := 0; i < lengthof(v_situations); i := i + 1) { for (i := 0; i < lengthof(v_situations); i := i + 1) {
...@@ -261,9 +261,9 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn ...@@ -261,9 +261,9 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn
} }
Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
=================================================================== ===================================================================
--- AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (revision 2630) --- AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (revision 2639)
+++ AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (working copy) +++ AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (working copy)
@@ -23,7 +23,8 @@ @@ -27,7 +27,8 @@
import from LibItsGeoNetworking_Templates all; import from LibItsGeoNetworking_Templates all;
import from LibItsGeoNetworking_TypesAndValues all; import from LibItsGeoNetworking_TypesAndValues all;
import from LibItsGeoNetworking_Pics all; import from LibItsGeoNetworking_Pics all;
...@@ -273,7 +273,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -273,7 +273,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
// 6.2.1 // 6.2.1
group geoFormatingAndDataValidity { group geoFormatingAndDataValidity {
@@ -107,7 +108,7 @@ @@ -111,7 +112,7 @@
f_prNeighbour(); f_prNeighbour();
v_gnPacket := m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB)); v_gnPacket := m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB));
...@@ -282,7 +282,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -282,7 +282,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
f_sleep(PX_TAC); f_sleep(PX_TAC);
@@ -125,7 +126,7 @@ @@ -129,7 +130,7 @@
// Test Body // Test Body
v_gnPacket.basicHeader.version := valueof(v_gnPacket.basicHeader.version) + 1; v_gnPacket.basicHeader.version := valueof(v_gnPacket.basicHeader.version) + 1;
...@@ -291,7 +291,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -291,7 +291,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
f_sleep(PX_TAC); f_sleep(PX_TAC);
@@ -221,8 +222,8 @@ @@ -225,8 +226,8 @@
// Preamble // Preamble
f_prNeighbour(); f_prNeighbour();
if ( not f_utTriggerEvent(m_generateShbMessageWithPayload(v_payload)) ) { if ( not f_utTriggerEvent(m_generateShbMessageWithPayload(v_payload)) ) {
...@@ -302,7 +302,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -302,7 +302,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
} }
f_selfOrClientSyncAndVerdict(c_prDone, e_success); f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -380,7 +381,7 @@ @@ -384,7 +385,7 @@
// Test Body // Test Body
f_sendGeoNetMessage( f_sendGeoNetMessage(
...@@ -311,7 +311,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -311,7 +311,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
m_geoNwPdu( m_geoNwPdu(
m_geoNwTsbPacket( m_geoNwTsbPacket(
vc_localSeqNumber, vc_localSeqNumber,
@@ -391,7 +392,7 @@ @@ -395,7 +396,7 @@
v_hopLimit v_hopLimit
) )
) )
...@@ -320,7 +320,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -320,7 +320,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
tc_noac.start; tc_noac.start;
alt { alt {
@@ -1379,7 +1380,7 @@ @@ -1383,7 +1384,7 @@
f_prNeighbour(); f_prNeighbour();
} }
else { else {
...@@ -329,7 +329,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -329,7 +329,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
} }
return v_longPosVectorNode; return v_longPosVectorNode;
@@ -1392,7 +1393,7 @@ @@ -1396,7 +1397,7 @@
//preamble part II //preamble part II
f_sendGeoNetMessage( f_sendGeoNetMessage(
...@@ -338,7 +338,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -338,7 +338,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
); );
f_selfOrClientSyncAndVerdict(c_prDone, e_success); f_selfOrClientSyncAndVerdict(c_prDone, e_success);
} // end f_TP_GEONW_PON_LOT_BV_03_pre_2 } // end f_TP_GEONW_PON_LOT_BV_03_pre_2
@@ -1456,7 +1457,7 @@ @@ -1460,7 +1461,7 @@
// Preamble // Preamble
f_prDefault(); // NodeB will send Beacon only once f_prDefault(); // NodeB will send Beacon only once
...@@ -347,7 +347,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -347,7 +347,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
f_selfOrClientSyncAndVerdict(c_prDone, e_success); f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body // Test Body
@@ -1717,7 +1718,7 @@ @@ -1721,7 +1722,7 @@
f_prDefault(); f_prDefault();
// Act as a neighbor and send one beacon // Act as a neighbor and send one beacon
...@@ -356,7 +356,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -356,7 +356,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
} // end f_TP_GEONW_PON_LOT_BV_05_pre_1 } // end f_TP_GEONW_PON_LOT_BV_05_pre_1
/** /**
@@ -1727,7 +1728,7 @@ @@ -1731,7 +1732,7 @@
//preamble part II //preamble part II
f_sendGeoNetMessage( f_sendGeoNetMessage(
...@@ -365,7 +365,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -365,7 +365,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
); );
f_selfOrClientSyncAndVerdict(c_prDone, e_success); f_selfOrClientSyncAndVerdict(c_prDone, e_success);
} // end f_TP_GEONW_PON_LOT_BV_05_pre_2 } // end f_TP_GEONW_PON_LOT_BV_05_pre_2
@@ -1992,10 +1993,10 @@ @@ -1996,10 +1997,10 @@
} }
else { else {
v_expectedSequenceNumber := v_expectedSequenceNumber + 1; v_expectedSequenceNumber := v_expectedSequenceNumber + 1;
...@@ -380,7 +380,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -380,7 +380,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
tc_ac.start; tc_ac.start;
repeat; repeat;
} }
@@ -2185,7 +2186,7 @@ @@ -2189,7 +2190,7 @@
// Test Body // Test Body
f_sendGeoNetMessage( f_sendGeoNetMessage(
...@@ -389,7 +389,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -389,7 +389,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
m_geoNwPdu( m_geoNwPdu(
m_geoNwLsReplyPacket( m_geoNwLsReplyPacket(
v_longPosVectorNodeA, v_longPosVectorNodeA,
@@ -2194,7 +2195,7 @@ @@ -2198,7 +2199,7 @@
) )
) )
) )
...@@ -398,7 +398,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -398,7 +398,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
tc_ac.start; tc_ac.start;
alt { alt {
@@ -2275,12 +2276,12 @@ @@ -2279,12 +2280,12 @@
if ( v_firstLsRequestReceived == true ) { if ( v_firstLsRequestReceived == true ) {
log("*** " & testcasename() & ": Second LsRequest received ***"); log("*** " & testcasename() & ": Second LsRequest received ***");
tc_ac.stop; tc_ac.stop;
...@@ -413,7 +413,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -413,7 +413,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
f_selfOrClientSyncAndVerdict(c_prDone, e_success); f_selfOrClientSyncAndVerdict(c_prDone, e_success);
} }
else { else {
@@ -2424,7 +2425,7 @@ @@ -2428,7 +2429,7 @@
} }
f_sendGeoNetMessage( f_sendGeoNetMessage(
...@@ -422,7 +422,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -422,7 +422,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
m_geoNwPdu( m_geoNwPdu(
m_geoNwLsReplyPacket( m_geoNwLsReplyPacket(
v_longPosVectorNodeA, v_longPosVectorNodeA,
@@ -2433,7 +2434,7 @@ @@ -2437,7 +2438,7 @@
) )
) )
) )
...@@ -431,7 +431,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -431,7 +431,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
// Check for messages send to Tester // Check for messages send to Tester
tc_noac.start; tc_noac.start;
@@ -2562,7 +2563,7 @@ @@ -2566,7 +2567,7 @@
f_prNeighbour(); f_prNeighbour();
if ( not f_utTriggerEvent(m_generateGeoUnicastMessageWithLifetime( if ( not f_utTriggerEvent(m_generateGeoUnicastMessageWithLifetime(
v_longPosVectorNodeA.gnAddr, v_longPosVectorNodeA.gnAddr,
...@@ -440,7 +440,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -440,7 +440,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
log("*** " & testcasename() & ": INCONC: Trigger failed ***"); log("*** " & testcasename() & ": INCONC: Trigger failed ***");
f_selfOrClientSyncAndVerdict(c_prDone, e_timeout); f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
} }
@@ -2767,7 +2768,7 @@ @@ -2771,7 +2772,7 @@
// Test Body // Test Body
f_sendGeoNetMessage( f_sendGeoNetMessage(
...@@ -449,7 +449,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -449,7 +449,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
m_geoNwPdu( m_geoNwPdu(
m_geoNwLsRequestPacket( m_geoNwLsRequestPacket(
v_longPosVectorNodeB, v_longPosVectorNodeB,
@@ -2776,7 +2777,7 @@ @@ -2780,7 +2781,7 @@
) )
) )
) )
...@@ -458,7 +458,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -458,7 +458,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
tc_noac.start; tc_noac.start;
alt { alt {
@@ -2899,7 +2900,7 @@ @@ -2903,7 +2904,7 @@
// Test Body // Test Body
f_sendGeoNetMessage( f_sendGeoNetMessage(
...@@ -467,7 +467,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -467,7 +467,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
m_geoNwPdu( m_geoNwPdu(
m_geoNwLsRequestPacket( m_geoNwLsRequestPacket(
f_getPosition(c_compNodeA), f_getPosition(c_compNodeA),
@@ -2910,7 +2911,7 @@ @@ -2914,7 +2915,7 @@
c_defaultHopLimit c_defaultHopLimit
) )
) )
...@@ -476,7 +476,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -476,7 +476,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
f_selfOrClientSyncAndVerdict(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
// Postamble // Postamble
@@ -3013,7 +3014,7 @@ @@ -3017,7 +3018,7 @@
// Test Body // Test Body
f_sendGeoNetMessage( f_sendGeoNetMessage(
...@@ -485,7 +485,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -485,7 +485,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
m_geoNwPdu( m_geoNwPdu(
m_geoNwLsReplyPacket( m_geoNwLsReplyPacket(
f_getPosition(c_compNodeA), f_getPosition(c_compNodeA),
@@ -3024,7 +3025,7 @@ @@ -3028,7 +3029,7 @@
c_defaultHopLimit c_defaultHopLimit
) )
) )
...@@ -494,7 +494,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -494,7 +494,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
f_selfOrClientSyncAndVerdict(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);