titanization_ats.patch 435 KB
Newer Older
garciay's avatar
garciay committed
Index: AtsCAM/ItsCam_TpFunctions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsCAM/ItsCam_TpFunctions.ttcn	(revision 2639)
garciay's avatar
garciay committed
+++ AtsCAM/ItsCam_TpFunctions.ttcn	(working copy)
garciay's avatar
garciay committed
@@ -30,6 +30,7 @@
     import from LibItsCommon_Templates all;
     import from LibItsCommon_Functions all;
     import from LibItsCommon_Pixits all;
+    import from LibItsCommon_ASN1_NamedNumbers all;
     
     // LibItsCam
     import from LibItsCam_TestSystem all;
garciay's avatar
garciay committed
@@ -406,7 +407,7 @@
garciay's avatar
garciay committed
                     }
                     
                     for (v_cnt:=0; v_cnt<lengthof(p_utTriggers); v_cnt:=v_cnt+1) {
-                        f_utTriggerEvent(p_utTriggers[v_cnt]);
+                        f_utTriggerEvent(valueof(p_utTriggers[v_cnt]));
                         
                         tc_ac.start;
                         alt {
garciay's avatar
garciay committed
@@ -561,7 +562,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Brake pedal being deactivated", 
                         { m_setAccelerationControlStatus(AccelerationControl_brakePedalEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_brakePedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_brakePedalActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_brakePedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_brakePedalActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_brakePedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_brakePedalActive_Off ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -633,7 +636,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Gas pedal being deactivated", 
                         { m_setAccelerationControlStatus(AccelerationControl_gasPedalEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_gasPedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_gasPedalActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_gasPedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_gasPedalActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_gasPedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_gasPedalActive_Off ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -705,7 +710,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Emergency brake being deactivated", 
                         { m_setAccelerationControlStatus(AccelerationControl_emergencyBrakeEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_emergencyBrakeActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_emergencyBrakeActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_emergencyBrakeActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_emergencyBrakeActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_emergencyBrakeActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_emergencyBrakeActive_Off ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -777,7 +784,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Collision warning being deactivated",
                         { m_setAccelerationControlStatus(AccelerationControl_collisionWarningEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_collisionWarningActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_collisionWarningActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_collisionWarningActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_collisionWarningActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_collisionWarningActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_collisionWarningActive_Off ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -849,7 +858,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "ACC being deactivated",
                         { m_setAccelerationControlStatus(AccelerationControl_accEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_accActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_accActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_accActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_accActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_accActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_accActive_Off ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -921,7 +932,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Cruise control being deactivated",
                         { m_setAccelerationControlStatus(AccelerationControl_cruiseControlEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_cruiseControl_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_cruiseControl_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_cruiseControl_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_cruiseControl_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_cruiseControl_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_cruiseControl_Off ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -993,7 +1006,9 @@
                     f_CAM_MSD_INA_BV_01( 
                         "Speed limiter control being deactivated", 
                         { m_setAccelerationControlStatus(AccelerationControl_speedLimiterEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_speedLimiterActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_speedLimiterActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_speedLimiterActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_speedLimiterActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_speedLimiterActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_speedLimiterActive_Off ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -1065,7 +1080,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Low beam headlights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_lowBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_lowBeamLightsOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_lowBeamLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOff ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -1137,7 +1154,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "High beam headlights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_highBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_highBeamLightsOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_highBeamLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOff ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -1209,7 +1228,9 @@
                     f_CAM_MSD_INA_BV_01( 
                         "Left turn signal being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_leftTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_leftTurnSignalOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_leftTurnSignalOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOff ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -1281,7 +1302,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Right turn signal being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_rightTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_rightTurnSignalOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_rightTurnSignalOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOff ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -1353,7 +1376,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Daytime running lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_daytimeRunningLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_daytimeRunningLightsOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_daytimeRunningLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOff ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -1425,7 +1450,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Reverese light being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_reverseLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_reverseLightOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_reverseLightOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOff ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -1497,7 +1524,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Fog lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_fogLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_fogLightOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_fogLightOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOff ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -1569,7 +1598,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Parking lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_parkingLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_parkingLightsOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_parkingLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOff ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
Index: AtsDENM/ItsDenm_TpFunctions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsDENM/ItsDenm_TpFunctions.ttcn	(revision 2639)
garciay's avatar
garciay committed
+++ AtsDENM/ItsDenm_TpFunctions.ttcn	(working copy)
garciay's avatar
garciay committed
@@ -22,6 +22,7 @@
     import from LibItsCommon_TypesAndValues all;
     import from LibItsCommon_Templates all;
     import from LibItsCommon_Functions all;
+    import from LibItsCommon_ASN1_NamedNumbers all;
     
     // LibIts
     import from DENM_PDU_Descriptions language "ASN.1:1997" all;
garciay's avatar
garciay committed
@@ -262,7 +263,7 @@
garciay's avatar
garciay committed
               // Preamble
               f_prInitialState();
               for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) {
-                  f_utTriggerEvent(m_utTriggerEvent(v_situations[i]));
+                  f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i])));
                   f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
                   v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID;
               }
garciay's avatar
garciay committed
@@ -269,7 +270,7 @@
garciay's avatar
garciay committed
               f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
               
               // Test Body
-              f_utTriggerEvent(m_utTriggerEvent(v_situations[lengthof(v_situations) - 1]));
+              f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[lengthof(v_situations) - 1])));
               f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
               v_actionIds[lengthof(v_actionIds) - 1] := v_denmInd.msgIn.denm.management.actionID;
               
garciay's avatar
garciay committed
@@ -453,7 +454,7 @@
garciay's avatar
garciay committed
               // Preamble
               f_prInitialState();
               for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) {
-                  f_utTriggerEvent(m_utTriggerEvent(v_situations[i]));
+                  f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i])));
                   f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
                   v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID;
                   v_timestampIts := v_denmInd.msgIn.denm.management.referenceTime;
garciay's avatar
garciay committed
@@ -461,7 +462,7 @@
garciay's avatar
garciay committed
               f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
               
               // Test Body
-              f_utTriggerEvent(m_utTriggerEvent(v_situations[lengthof(v_situations) - 1]));
+              f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[lengthof(v_situations) - 1])));
               
               tc_ac.start;
               alt {
garciay's avatar
garciay committed
@@ -536,7 +537,7 @@
garciay's avatar
garciay committed
               // Preamble
               f_prInitialState();
               for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) {
-                  f_utTriggerEvent(m_utTriggerEvent(v_situations[i]));
+                  f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i])));
                   f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
                   f_poCancelEvent(e_iut, v_denmInd.msgIn.denm.management.actionID);
               }
garciay's avatar
garciay committed
@@ -545,7 +546,7 @@
garciay's avatar
garciay committed
               f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
               
               // Test Body
-              f_utTriggerEvent(m_utTriggerEvent(v_situations[lengthof(v_situations) - 1]));
+              f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[lengthof(v_situations) - 1])));
               
               tc_ac.start;
               alt {
garciay's avatar
garciay committed
@@ -1260,7 +1261,7 @@
garciay's avatar
garciay committed
               // Preamble
               f_prInitialState();
               for (i := 0; i < lengthof(v_situations); i := i + 1) {
-                  f_utTriggerEvent(m_utTriggerEvent(v_situations[i]));
+                  f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i])));
                   f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
                   v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID;
               }
garciay's avatar
garciay committed
Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn	(revision 2639)
garciay's avatar
garciay committed
+++ AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn	(working copy)
garciay's avatar
garciay committed
@@ -27,7 +27,8 @@
garciay's avatar
garciay committed
     import from LibItsGeoNetworking_Templates all;
     import from LibItsGeoNetworking_TypesAndValues all;
     import from LibItsGeoNetworking_Pics all;
garciay's avatar
garciay committed
-	import from LibItsGeoNetworking_Pixits all;
+    import from LibItsGeoNetworking_Pixits all;
+    import from LibItsGeoNetworking_EncdecDeclarations all;
 
     // 6.2.1
     group geoFormatingAndDataValidity {
garciay's avatar
garciay committed
@@ -111,7 +112,7 @@
garciay's avatar
garciay committed
                 f_prNeighbour();
                 v_gnPacket := m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB));
                 
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                 
                 f_sleep(PX_TAC);
                 
garciay's avatar
garciay committed
@@ -129,7 +130,7 @@
garciay's avatar
garciay committed
                 // Test Body
                 v_gnPacket.basicHeader.version := valueof(v_gnPacket.basicHeader.version) + 1;
                 
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                 
                 f_sleep(PX_TAC);
                 
garciay's avatar
garciay committed
@@ -225,8 +226,8 @@
garciay's avatar
garciay committed
                 // Preamble
                 f_prNeighbour();
                 if ( not f_utTriggerEvent(m_generateShbMessageWithPayload(v_payload)) ) {
-                	log("*** " & testcasename() & ": INCONC: Trigger failed ***");
-                	f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
+                    log("*** " & testcasename() & ": INCONC: Trigger failed ***");
+                    f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
                 }
                 f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                 
garciay's avatar
garciay committed
@@ -384,7 +385,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwTsbPacket(
                                     vc_localSeqNumber,
garciay's avatar
garciay committed
@@ -395,7 +396,7 @@
garciay's avatar
garciay committed
                                 v_hopLimit
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
@@ -1383,7 +1384,7 @@
garciay's avatar
garciay committed
                         f_prNeighbour();
                     }
                     else {
-						f_prNonNeighbour();
+                        f_prNonNeighbour();
                     }
                     
                     return v_longPosVectorNode;
garciay's avatar
garciay committed
@@ -1396,7 +1397,7 @@
garciay's avatar
garciay committed
                     
                     //preamble part II
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet, -, c_hopLimit1))
+                        valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet, -, c_hopLimit1)))
                     );
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                 } // end f_TP_GEONW_PON_LOT_BV_03_pre_2
garciay's avatar
garciay committed
@@ -1460,7 +1461,7 @@
garciay's avatar
garciay committed
                 
                 // Preamble
                 f_prDefault(); // NodeB will send Beacon only once
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1)));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1))));
                 f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                 
                 // Test Body
garciay's avatar
garciay committed
@@ -1721,7 +1722,7 @@
garciay's avatar
garciay committed
                     f_prDefault();
                     
                     // Act as a neighbor and send one beacon
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1)));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1))));
                 } // end f_TP_GEONW_PON_LOT_BV_05_pre_1
                 
                 /**
garciay's avatar
garciay committed
@@ -1731,7 +1732,7 @@
garciay's avatar
garciay committed
                     
                     //preamble part II
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet))
+                        valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet)))
                     );
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                 } // end f_TP_GEONW_PON_LOT_BV_05_pre_2
garciay's avatar
garciay committed
@@ -1996,10 +1997,10 @@
garciay's avatar
garciay committed
                         }
                         else {
                             v_expectedSequenceNumber := v_expectedSequenceNumber + 1;
-				            if ( not  f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) {
-				                log("*** " & testcasename() & ": INCONC: Trigger failed ***");
-				                f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-				            }
+                            if ( not  f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) {
+                                log("*** " & testcasename() & ": INCONC: Trigger failed ***");
+                                f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
+                            }
                             tc_ac.start;
                             repeat;
                         }
garciay's avatar
garciay committed
@@ -2189,7 +2190,7 @@
garciay's avatar
garciay committed
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwLsReplyPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
@@ -2198,7 +2199,7 @@
garciay's avatar
garciay committed
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
garciay's avatar
garciay committed
@@ -2279,12 +2280,12 @@
garciay's avatar
garciay committed
                         if ( v_firstLsRequestReceived == true ) {
                             log("*** " & testcasename() & ": Second LsRequest received ***");
                             tc_ac.stop;
-                            f_sendGeoNetMessage ( m_geoNwReq_linkLayerBroadcast(
+                            f_sendGeoNetMessage ( valueof( m_geoNwReq_linkLayerBroadcast(
                                                     m_geoNwPdu (
                                                         m_geoNwLsReplyPacket(
                                                             v_longPosVectorNodeA,
                                                             f_longPosVector2ShortPosVector(v_longPosVectorIut),
-                                                            vc_localSeqNumber ) ) ) );
+                                                            vc_localSeqNumber ) ) ) ) );
                             f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                         }
                         else {
garciay's avatar
garciay committed
@@ -2428,7 +2429,7 @@
garciay's avatar
garciay committed
                 }
                 
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwLsReplyPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
@@ -2437,7 +2438,7 @@
garciay's avatar
garciay committed
                             )
                         )
                     )
-                );
+                ));
                 
                 // Check for messages send to Tester
                 tc_noac.start;
garciay's avatar
garciay committed
@@ -2566,7 +2567,7 @@
garciay's avatar
garciay committed
                 f_prNeighbour();
                  if ( not f_utTriggerEvent(m_generateGeoUnicastMessageWithLifetime(
                     v_longPosVectorNodeA.gnAddr,
-			                    float2int(int2float(v_maxNbrRetrans + 2) * f_getLsRetransmitTimer() * 1000.0))) ) {
+                                float2int(int2float(v_maxNbrRetrans + 2) * f_getLsRetransmitTimer() * 1000.0))) ) {
                     log("*** " & testcasename() & ": INCONC: Trigger failed ***");
                     f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
                 }
garciay's avatar
garciay committed
@@ -2771,7 +2772,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwLsRequestPacket(
                                     v_longPosVectorNodeB,
garciay's avatar
garciay committed
@@ -2780,7 +2781,7 @@
garciay's avatar
garciay committed
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
@@ -2903,7 +2904,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwLsRequestPacket(
                                     f_getPosition(c_compNodeA),
garciay's avatar
garciay committed
@@ -2914,7 +2915,7 @@
garciay's avatar
garciay committed
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -3017,7 +3018,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwLsReplyPacket(
                                     f_getPosition(c_compNodeA),
garciay's avatar
garciay committed
@@ -3028,7 +3029,7 @@
garciay's avatar
garciay committed
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
@@ -3081,7 +3082,7 @@
garciay's avatar
garciay committed
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
@@ -3090,7 +3091,7 @@
garciay's avatar
garciay committed
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
garciay's avatar
garciay committed
@@ -3169,7 +3170,7 @@
garciay's avatar
garciay committed
                 f_sleepIgnoreDef(int2float(v_lt2));
                 
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwLsReplyPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
@@ -3178,7 +3179,7 @@
garciay's avatar
garciay committed
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
garciay's avatar
garciay committed
@@ -3314,7 +3315,7 @@
garciay's avatar
garciay committed
                 // Test Body
                 if (tc_wait.running) {
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeA,
garciay's avatar
garciay committed
@@ -3323,7 +3324,7 @@
garciay's avatar
garciay committed
                                 )
                             )
                         )
-                    );
+                    ));
                     tc_wait.stop;
                     
                     tc_noac.start;
garciay's avatar
garciay committed
@@ -3396,7 +3397,7 @@
garciay's avatar
garciay committed
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
@@ -3405,7 +3406,7 @@
garciay's avatar
garciay committed
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
garciay's avatar
garciay committed
@@ -3471,7 +3472,7 @@
garciay's avatar
garciay committed
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
@@ -3480,7 +3481,7 @@
garciay's avatar
garciay committed
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_noac.start;
                 alt {
garciay's avatar
garciay committed
@@ -3550,7 +3551,7 @@
garciay's avatar
garciay committed
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
@@ -3559,7 +3560,7 @@
garciay's avatar
garciay committed
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_noac.start;
                 alt {
garciay's avatar
garciay committed
@@ -3681,22 +3682,22 @@
garciay's avatar
garciay committed
                     f_prNeighbour();
                     
                     // Make sure IUT has LocE for NodeA by sending unsolicited LS_REPLY
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
                         m_geoNwLsReplyPacket(
                             v_longPosVectorNodeA,
                             f_longPosVector2ShortPosVector(v_longPosVectorIut),
                             vc_localSeqNumber
                         )
-                    )));
+                    ))));
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
                     // /!\ This pre-condition has impact on test body
-	                if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(v_longPosVectorNodeA.gnAddr)) ) {
-	                    log("*** " & testcasename() & ": INCONC: Trigger failed ***");
-	                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-	                }
+                    if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(v_longPosVectorNodeA.gnAddr)) ) {
+                        log("*** " & testcasename() & ": INCONC: Trigger failed ***");
+                        f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
+                    }
                     tc_noac.start;
                     alt {
                         [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(?))) {
garciay's avatar
garciay committed
@@ -3727,7 +3728,9 @@
                     // Local variables
                     var ItsGeoNetworking v_nodeB;
                     var ItsGeoNetworking v_nodeC;
-                    const UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
+//FIXME RGY c_sequenceNumberC shall not be constant as calls a function returning a variable
+//                    const UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
+                    var UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
                     
                     // Test control
                     if (not PICS_GN_GUC_SRC) {
garciay's avatar
garciay committed
@@ -3816,7 +3819,7 @@
garciay's avatar
garciay committed
                     vc_localSeqNumber := p_sequenceNumberC;
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
@@ -3827,7 +3830,7 @@
garciay's avatar
garciay committed
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
garciay's avatar
garciay committed
@@ -3851,7 +3854,9 @@
                     // Local variables
                     var ItsGeoNetworking v_nodeB;
                     var ItsGeoNetworking v_nodeC;
-                    const UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
+//FIXME RGY c_sequenceNumberC shall not be constant as calls a function returning a variable
+//                    const UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
+                    var UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
                     const integer c_messageCount := 2;
                     
                     // Test control
garciay's avatar
garciay committed
@@ -3953,7 +3958,7 @@
garciay's avatar
garciay committed
                     
                     for(i:=0; i < vc_multipleMessagesCount; i:=i+1) {
                         f_sendGeoNetMessage(
-                            m_geoNwReq_linkLayerBroadcast(
+                            valueof(m_geoNwReq_linkLayerBroadcast(
                                 m_geoNwPdu(
                                     m_geoNwUnicastPacket(
                                         v_longPosVectorNodeC,
garciay's avatar
garciay committed
@@ -3962,7 +3967,7 @@
garciay's avatar
garciay committed
                                     )
                                 )
                             )
-                        );
+                        ));
                     }
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
garciay's avatar
garciay committed
@@ -4067,7 +4072,7 @@
garciay's avatar
garciay committed
                     f_prNeighbour();
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
@@ -4078,7 +4083,7 @@
garciay's avatar
garciay committed
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
garciay's avatar
garciay committed
@@ -4249,10 +4254,10 @@
garciay's avatar
garciay committed
                     f_prDefault();
                     vc_multipleMessagesCount := p_messageCount;
                     for(i:=0; i < vc_multipleMessagesCount; i:=i+1) {
-	                    if(not f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) {
-	                        log("*** " & testcasename() & ": INCONC: Trigger failed ***");
-	                        f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
-	                    }
+                        if(not f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) {
+                            log("*** " & testcasename() & ": INCONC: Trigger failed ***");
+                            f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
+                        }
                     }
 
                     tc_ac.start(1.0);
garciay's avatar
garciay committed
@@ -4577,13 +4582,13 @@
garciay's avatar
garciay committed
                     f_prNeighbour();
                     
                     // Make sure IUT has LocE for NodeA by sending unsolicited LS_REPLY
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
                         m_geoNwLsReplyPacket(
                             v_longPosVectorNodeA,
                             f_longPosVector2ShortPosVector(v_longPosVectorIut),
                             vc_localSeqNumber
                         )
-                    )));
+                    ))));
                     
                     if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(v_longPosVectorNodeA.gnAddr)) ) {
                         log("*** " & testcasename() & ": INCONC: Trigger failed ***");
garciay's avatar
garciay committed
@@ -4807,13 +4812,13 @@
garciay's avatar
garciay committed
                     // Preamble
                     f_prNonNeighbour();
                     // Make sure IUT has LocE for NodeA by sending unsolicited LS_REPLY
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
                         m_geoNwLsReplyPacket(
                             v_longPosVectorNodeA,
                             f_longPosVector2ShortPosVector(v_longPosVectorIut),
                             vc_localSeqNumber
                         )
-                    )));
+                    ))));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
@@ -5422,7 +5427,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
@@ -5437,7 +5442,7 @@
garciay's avatar
garciay committed
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
 
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
@@ -5555,7 +5560,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwAnycastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
@@ -5566,7 +5571,7 @@
garciay's avatar
garciay committed
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
@@ -5684,7 +5689,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
@@ -5695,7 +5700,7 @@
garciay's avatar
garciay committed
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
@@ -5813,7 +5818,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwTsbPacket(
                                     vc_localSeqNumber,
garciay's avatar
garciay committed
@@ -5825,7 +5830,7 @@
garciay's avatar
garciay committed
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
@@ -5974,7 +5979,7 @@
garciay's avatar
garciay committed
                 
                 // Test Body
                 v_longPosVectorNodeB.gnAddr := v_iutGnAddress;
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB), -, c_hopLimit1)));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB), -, c_hopLimit1))));
                 
                 f_sleep(0.5);
                 
garciay's avatar
garciay committed
@@ -6344,7 +6349,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
@@ -6357,7 +6362,7 @@
garciay's avatar
garciay committed
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
garciay's avatar
garciay committed
@@ -6436,7 +6441,7 @@
garciay's avatar
garciay committed
                     f_prNeighbour();
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeA,
garciay's avatar
garciay committed
@@ -6447,7 +6452,7 @@
garciay's avatar
garciay committed
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
@@ -6511,7 +6516,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
@@ -6525,7 +6530,7 @@
garciay's avatar
garciay committed
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
garciay's avatar
garciay committed
@@ -6629,7 +6634,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
@@ -6642,7 +6647,7 @@
garciay's avatar
garciay committed
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
garciay's avatar
garciay committed
@@ -6687,7 +6692,7 @@
garciay's avatar
garciay committed
                                       vc_localSeqNumber
                                   )
                               );
-                f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(v_gnPacket, -, f_getIutMacAddress()));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_withLinkLayerDestination(v_gnPacket, -, f_getIutMacAddress())));
                 
                 f_sleep(PX_TAC);
                 
garciay's avatar
garciay committed
@@ -6833,7 +6838,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
@@ -6846,7 +6851,7 @@
garciay's avatar
garciay committed
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     log("*** " & testcasename() & ": INFO: Message sent ***");
                     f_selfOrClientSyncAndVerdict(c_msgSent, e_success);
                     
garciay's avatar
garciay committed
@@ -6959,7 +6964,7 @@
garciay's avatar
garciay committed
                         ) {
                             tc_ac.stop;
                             if(t_toCbf.running) {
-                            	t_toCbf.stop;
+                                t_toCbf.stop;
                                 log("*** " & testcasename() & ": FAIL: IUT re-broadcasted the packet too early ***");
                                 f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                             }
garciay's avatar
garciay committed
@@ -6998,7 +7003,7 @@
garciay's avatar
garciay committed
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
@@ -7011,7 +7016,7 @@
garciay's avatar
garciay committed
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     log("*** " & testcasename() & ": INFO: Message sent ***");
                     f_selfOrClientSyncAndVerdict(c_msgSent, e_success);
                     
garciay's avatar
garciay committed
@@ -7108,7 +7113,7 @@
garciay's avatar
garciay committed
                     f_sleepIgnoreDef(int2float(f_getGeoUnicastCbfMaxTime())/2000.0);
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
@@ -7121,7 +7126,7 @@
garciay's avatar
garciay committed
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
@@ -7166,7 +7171,7 @@
garciay's avatar
garciay committed
                     // Test Body
                     //Note: Sending of the GUC packet move to test body in contrast to the test purpose due to time critical behaviour
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
@@ -7179,7 +7184,7 @@
garciay's avatar
garciay committed
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
@@ -7315,7 +7320,7 @@