titanization_ats.patch 435 KB
Newer Older
garciay's avatar
garciay committed
1
Index: AtsCAM/ItsCam_TpFunctions.ttcn
2
===================================================================
garciay's avatar
garciay committed
3
--- AtsCAM/ItsCam_TpFunctions.ttcn	(revision 2639)
garciay's avatar
garciay committed
4
+++ AtsCAM/ItsCam_TpFunctions.ttcn	(working copy)
garciay's avatar
garciay committed
5
@@ -30,6 +30,7 @@
6 7 8 9 10 11 12
     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
13
@@ -406,7 +407,7 @@
garciay's avatar
garciay committed
14 15 16 17 18 19 20 21
                     }
                     
                     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
22
@@ -561,7 +562,9 @@
23 24 25 26 27 28 29 30 31 32
                     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
33
@@ -633,7 +636,9 @@
34 35 36 37 38 39 40 41 42 43
                     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
44
@@ -705,7 +710,9 @@
45 46 47 48 49 50 51 52 53 54
                     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
55
@@ -777,7 +784,9 @@
56 57 58 59 60 61 62 63 64 65
                     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
66
@@ -849,7 +858,9 @@
67 68 69 70 71 72 73 74 75 76
                     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
77
@@ -921,7 +932,9 @@
78 79 80 81 82 83 84 85 86 87
                     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
88
@@ -993,7 +1006,9 @@
89 90 91 92 93 94 95 96 97 98
                     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
99
@@ -1065,7 +1080,9 @@
100 101 102 103 104 105 106 107 108 109
                     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
110
@@ -1137,7 +1154,9 @@
111 112 113 114 115 116 117 118 119 120
                     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
121
@@ -1209,7 +1228,9 @@
122 123 124 125 126 127 128 129 130 131
                     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
132
@@ -1281,7 +1302,9 @@
133 134 135 136 137 138 139 140 141 142
                     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
143
@@ -1353,7 +1376,9 @@
144 145 146 147 148 149 150 151 152 153
                     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
154
@@ -1425,7 +1450,9 @@
155 156 157 158 159 160 161 162 163 164
                     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
165
@@ -1497,7 +1524,9 @@
166 167 168 169 170 171 172 173 174 175
                     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
176
@@ -1569,7 +1598,9 @@
177 178 179 180 181 182 183 184 185 186
                     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
187
Index: AtsDENM/ItsDenm_TpFunctions.ttcn
188
===================================================================
garciay's avatar
garciay committed
189
--- AtsDENM/ItsDenm_TpFunctions.ttcn	(revision 2639)
garciay's avatar
garciay committed
190
+++ AtsDENM/ItsDenm_TpFunctions.ttcn	(working copy)
garciay's avatar
garciay committed
191
@@ -22,6 +22,7 @@
192 193 194 195 196 197 198
     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
199
@@ -262,7 +263,7 @@
garciay's avatar
garciay committed
200 201 202 203 204 205 206 207
               // 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
208
@@ -269,7 +270,7 @@
garciay's avatar
garciay committed
209 210 211 212 213 214 215 216
               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
217
@@ -453,7 +454,7 @@
garciay's avatar
garciay committed
218 219 220 221 222 223 224 225
               // 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
226
@@ -461,7 +462,7 @@
garciay's avatar
garciay committed
227 228 229 230 231 232 233 234
               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
235
@@ -536,7 +537,7 @@
garciay's avatar
garciay committed
236 237 238 239 240 241 242 243
               // 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
244
@@ -545,7 +546,7 @@
garciay's avatar
garciay committed
245 246 247 248 249 250 251 252
               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
253
@@ -1260,7 +1261,7 @@
garciay's avatar
garciay committed
254 255 256 257 258 259 260 261
               // 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
262
Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
263
===================================================================
garciay's avatar
garciay committed
264
--- AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn	(revision 2639)
garciay's avatar
garciay committed
265
+++ AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn	(working copy)
garciay's avatar
garciay committed
266
@@ -27,7 +27,8 @@
garciay's avatar
garciay committed
267
     import from LibItsGeoNetworking_Templates all;
268 269
     import from LibItsGeoNetworking_TypesAndValues all;
     import from LibItsGeoNetworking_Pics all;
garciay's avatar
garciay committed
270 271
-	import from LibItsGeoNetworking_Pixits all;
+    import from LibItsGeoNetworking_Pixits all;
272 273 274 275
+    import from LibItsGeoNetworking_EncdecDeclarations all;
 
     // 6.2.1
     group geoFormatingAndDataValidity {
garciay's avatar
garciay committed
276
@@ -111,7 +112,7 @@
garciay's avatar
garciay committed
277 278 279 280 281 282 283 284
                 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
285
@@ -129,7 +130,7 @@
garciay's avatar
garciay committed
286 287 288 289 290 291 292 293
                 // 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
294
@@ -225,8 +226,8 @@
garciay's avatar
garciay committed
295 296 297 298 299 300 301 302 303 304
                 // 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
305
@@ -384,7 +385,7 @@
garciay's avatar
garciay committed
306 307 308 309 310 311 312 313
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwTsbPacket(
                                     vc_localSeqNumber,
garciay's avatar
garciay committed
314
@@ -395,7 +396,7 @@
garciay's avatar
garciay committed
315 316 317 318 319 320 321 322
                                 v_hopLimit
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
323
@@ -1383,7 +1384,7 @@
garciay's avatar
garciay committed
324 325 326 327 328 329 330 331
                         f_prNeighbour();
                     }
                     else {
-						f_prNonNeighbour();
+                        f_prNonNeighbour();
                     }
                     
                     return v_longPosVectorNode;
garciay's avatar
garciay committed
332
@@ -1396,7 +1397,7 @@
garciay's avatar
garciay committed
333 334 335 336 337 338 339 340
                     
                     //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
341
@@ -1460,7 +1461,7 @@
garciay's avatar
garciay committed
342 343 344 345 346 347 348 349
                 
                 // 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
350
@@ -1721,7 +1722,7 @@
garciay's avatar
garciay committed
351 352 353 354 355 356 357 358
                     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
359
@@ -1731,7 +1732,7 @@
garciay's avatar
garciay committed
360 361 362 363 364 365 366 367
                     
                     //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
368
@@ -1996,10 +1997,10 @@
garciay's avatar
garciay committed
369 370 371 372 373 374 375 376 377 378 379 380 381 382
                         }
                         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
383
@@ -2189,7 +2190,7 @@
garciay's avatar
garciay committed
384 385 386 387 388 389 390 391
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwLsReplyPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
392
@@ -2198,7 +2199,7 @@
garciay's avatar
garciay committed
393 394 395 396 397 398 399 400
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
garciay's avatar
garciay committed
401
@@ -2279,12 +2280,12 @@
garciay's avatar
garciay committed
402 403 404 405 406 407 408 409 410 411 412 413 414 415
                         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
416
@@ -2428,7 +2429,7 @@
garciay's avatar
garciay committed
417 418 419 420 421 422 423 424
                 }
                 
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwLsReplyPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
425
@@ -2437,7 +2438,7 @@
garciay's avatar
garciay committed
426 427 428 429 430 431 432 433
                             )
                         )
                     )
-                );
+                ));
                 
                 // Check for messages send to Tester
                 tc_noac.start;
garciay's avatar
garciay committed
434
@@ -2566,7 +2567,7 @@
garciay's avatar
garciay committed
435 436 437 438 439 440 441 442
                 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
443
@@ -2771,7 +2772,7 @@
garciay's avatar
garciay committed
444 445 446 447 448 449 450 451
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwLsRequestPacket(
                                     v_longPosVectorNodeB,
garciay's avatar
garciay committed
452
@@ -2780,7 +2781,7 @@
garciay's avatar
garciay committed
453 454 455 456 457 458 459 460
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
461
@@ -2903,7 +2904,7 @@
garciay's avatar
garciay committed
462 463 464 465 466 467 468 469
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwLsRequestPacket(
                                     f_getPosition(c_compNodeA),
garciay's avatar
garciay committed
470
@@ -2914,7 +2915,7 @@
garciay's avatar
garciay committed
471 472 473 474 475 476 477 478
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
479
@@ -3017,7 +3018,7 @@
garciay's avatar
garciay committed
480 481 482 483 484 485 486 487
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwLsReplyPacket(
                                     f_getPosition(c_compNodeA),
garciay's avatar
garciay committed
488
@@ -3028,7 +3029,7 @@
garciay's avatar
garciay committed
489 490 491 492 493 494 495 496
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
497
@@ -3081,7 +3082,7 @@
garciay's avatar
garciay committed
498 499 500 501 502 503 504 505
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
506
@@ -3090,7 +3091,7 @@
garciay's avatar
garciay committed
507 508 509 510 511 512 513 514
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
garciay's avatar
garciay committed
515
@@ -3169,7 +3170,7 @@
garciay's avatar
garciay committed
516 517 518 519 520 521 522 523
                 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
524
@@ -3178,7 +3179,7 @@
garciay's avatar
garciay committed
525 526 527 528 529 530 531 532
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
garciay's avatar
garciay committed
533
@@ -3314,7 +3315,7 @@
garciay's avatar
garciay committed
534 535 536 537 538 539 540 541
                 // 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
542
@@ -3323,7 +3324,7 @@
garciay's avatar
garciay committed
543 544 545 546 547 548 549 550
                                 )
                             )
                         )
-                    );
+                    ));
                     tc_wait.stop;
                     
                     tc_noac.start;
garciay's avatar
garciay committed
551
@@ -3396,7 +3397,7 @@
garciay's avatar
garciay committed
552 553 554 555 556 557 558 559
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
560
@@ -3405,7 +3406,7 @@
garciay's avatar
garciay committed
561 562 563 564 565 566 567 568
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
garciay's avatar
garciay committed
569
@@ -3471,7 +3472,7 @@
garciay's avatar
garciay committed
570 571 572 573 574 575 576 577
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
578
@@ -3480,7 +3481,7 @@
garciay's avatar
garciay committed
579 580 581 582 583 584 585 586
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_noac.start;
                 alt {
garciay's avatar
garciay committed
587
@@ -3550,7 +3551,7 @@
garciay's avatar
garciay committed
588 589 590 591 592 593 594 595
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
garciay's avatar
garciay committed
596
@@ -3559,7 +3560,7 @@
garciay's avatar
garciay committed
597 598 599 600 601 602 603 604
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_noac.start;
                 alt {
garciay's avatar
garciay committed
605
@@ -3681,22 +3682,22 @@
garciay's avatar
garciay committed
606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633
                     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
634
@@ -3727,7 +3728,9 @@
635 636 637 638 639 640 641 642 643 644
                     // 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
645
@@ -3816,7 +3819,7 @@
garciay's avatar
garciay committed
646 647 648 649 650 651 652 653
                     vc_localSeqNumber := p_sequenceNumberC;
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
654
@@ -3827,7 +3830,7 @@
garciay's avatar
garciay committed
655 656 657 658 659 660 661 662
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
garciay's avatar
garciay committed
663
@@ -3851,7 +3854,9 @@
664 665 666 667 668 669 670 671 672 673
                     // 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
674
@@ -3953,7 +3958,7 @@
garciay's avatar
garciay committed
675 676 677 678 679 680 681 682
                     
                     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
683
@@ -3962,7 +3967,7 @@
garciay's avatar
garciay committed
684 685 686 687 688 689 690 691
                                     )
                                 )
                             )
-                        );
+                        ));
                     }
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
garciay's avatar
garciay committed
692
@@ -4067,7 +4072,7 @@
garciay's avatar
garciay committed
693 694 695 696 697 698 699 700
                     f_prNeighbour();
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
701
@@ -4078,7 +4083,7 @@
garciay's avatar
garciay committed
702 703 704 705 706 707 708 709
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
garciay's avatar
garciay committed
710
@@ -4249,10 +4254,10 @@
garciay's avatar
garciay committed
711 712 713 714 715 716 717 718 719 720 721 722 723 724
                     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
725
@@ -4577,13 +4582,13 @@
garciay's avatar
garciay committed
726 727 728 729 730 731 732 733 734 735 736 737 738 739 740
                     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
741
@@ -4807,13 +4812,13 @@
garciay's avatar
garciay committed
742 743 744 745 746 747 748 749 750 751 752 753 754 755 756
                     // 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
757
@@ -5422,7 +5427,7 @@
garciay's avatar
garciay committed
758 759 760 761 762 763 764 765
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
766
@@ -5437,7 +5442,7 @@
garciay's avatar
garciay committed
767 768 769 770 771 772 773 774
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
 
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
775
@@ -5555,7 +5560,7 @@
garciay's avatar
garciay committed
776 777 778 779 780 781 782 783
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwAnycastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
784
@@ -5566,7 +5571,7 @@
garciay's avatar
garciay committed
785 786 787 788 789 790 791 792
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
793
@@ -5684,7 +5689,7 @@
garciay's avatar
garciay committed
794 795 796 797 798 799 800 801
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
802
@@ -5695,7 +5700,7 @@
garciay's avatar
garciay committed
803 804 805 806 807 808 809 810
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
811
@@ -5813,7 +5818,7 @@
garciay's avatar
garciay committed
812 813 814 815 816 817 818 819
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwTsbPacket(
                                     vc_localSeqNumber,
garciay's avatar
garciay committed
820
@@ -5825,7 +5830,7 @@
garciay's avatar
garciay committed
821 822 823 824 825 826 827 828
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
829
@@ -5974,7 +5979,7 @@
garciay's avatar
garciay committed
830 831 832 833 834 835 836 837
                 
                 // 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
838
@@ -6344,7 +6349,7 @@
garciay's avatar
garciay committed
839 840 841 842 843 844 845 846
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
847
@@ -6357,7 +6362,7 @@
garciay's avatar
garciay committed
848 849 850 851 852 853 854 855
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
garciay's avatar
garciay committed
856
@@ -6436,7 +6441,7 @@
garciay's avatar
garciay committed
857 858 859 860 861 862 863 864
                     f_prNeighbour();
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeA,
garciay's avatar
garciay committed
865
@@ -6447,7 +6452,7 @@
garciay's avatar
garciay committed
866 867 868 869 870 871 872 873
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
874
@@ -6511,7 +6516,7 @@
garciay's avatar
garciay committed
875 876 877 878 879 880 881 882
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
883
@@ -6525,7 +6530,7 @@
garciay's avatar
garciay committed
884 885 886 887 888 889 890 891
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
garciay's avatar
garciay committed
892
@@ -6629,7 +6634,7 @@
garciay's avatar
garciay committed
893 894 895 896 897 898 899 900
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
901
@@ -6642,7 +6647,7 @@
garciay's avatar
garciay committed
902 903 904 905 906 907 908 909
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
garciay's avatar
garciay committed
910
@@ -6687,7 +6692,7 @@
garciay's avatar
garciay committed
911 912 913 914 915 916 917 918
                                       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
919
@@ -6833,7 +6838,7 @@
garciay's avatar
garciay committed
920 921 922 923 924 925 926 927
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
928
@@ -6846,7 +6851,7 @@
garciay's avatar
garciay committed
929 930 931 932 933 934 935 936
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     log("*** " & testcasename() & ": INFO: Message sent ***");
                     f_selfOrClientSyncAndVerdict(c_msgSent, e_success);
                     
garciay's avatar
garciay committed
937
@@ -6959,7 +6964,7 @@
garciay's avatar
garciay committed
938 939 940 941 942 943 944 945
                         ) {
                             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
946
@@ -6998,7 +7003,7 @@
garciay's avatar
garciay committed
947 948 949 950 951 952 953 954
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
955
@@ -7011,7 +7016,7 @@
garciay's avatar
garciay committed
956 957 958 959 960 961 962 963
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     log("*** " & testcasename() & ": INFO: Message sent ***");
                     f_selfOrClientSyncAndVerdict(c_msgSent, e_success);
                     
garciay's avatar
garciay committed
964
@@ -7108,7 +7113,7 @@
garciay's avatar
garciay committed
965 966 967 968 969 970 971 972
                     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
973
@@ -7121,7 +7126,7 @@
garciay's avatar
garciay committed
974 975 976 977 978 979 980 981
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
982
@@ -7166,7 +7171,7 @@
garciay's avatar
garciay committed
983 984 985 986 987 988 989 990
                     // 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
991
@@ -7179,7 +7184,7 @@
garciay's avatar
garciay committed
992 993 994 995 996 997 998 999
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1000
@@ -7315,7 +7320,7 @@
garciay's avatar
garciay committed
1001 1002 1003 1004 1005 1006 1007 1008
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
1009
@@ -7328,7 +7333,7 @@
garciay's avatar
garciay committed
1010 1011 1012 1013 1014 1015 1016 1017
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     f_sleepIgnoreDef(int2float(f_getGeoUnicastCbfMaxTime())/2000.0);
                     
garciay's avatar
garciay committed
1018
@@ -7565,7 +7570,7 @@
garciay's avatar
garciay committed
1019 1020 1021 1022 1023 1024 1025 1026
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
1027
@@ -7578,7 +7583,7 @@
garciay's avatar
garciay committed
1028 1029 1030 1031 1032 1033 1034 1035
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1036
@@ -7618,7 +7623,7 @@
garciay's avatar
garciay committed
1037 1038 1039 1040 1041 1042 1043 1044
                     // Preamble
                     f_prNeighbour();
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
1045
@@ -7631,7 +7636,7 @@
garciay's avatar
garciay committed
1046 1047 1048 1049 1050 1051 1052 1053
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
1054
@@ -7728,8 +7733,8 @@
garciay's avatar
garciay committed
1055 1056 1057 1058 1059 1060 1061 1062 1063 1064
                     // Preamble
                     f_prNeighbour();
                     f_sleep(PX_TAC);
-	                v_sentRawPayload := f_adaptPayloadForUtInd_m(valueof(v_gnPacket.gnPacket.packet.payload));
-	                for(i:=0; i < lengthof(vc_utInds) and not match(vc_utInds[i].rawPayload, v_sentRawPayload); i:=i+1) {
+                    v_sentRawPayload := f_adaptPayloadForUtInd_m(valueof(v_gnPacket.gnPacket.packet.payload));
+                    for(i:=0; i < lengthof(vc_utInds) and not match(vc_utInds[i].rawPayload, v_sentRawPayload); i:=i+1) {
                         // empty on purpose 
                     }
                     if(i < lengthof(vc_utInds)) {
garciay's avatar
garciay committed
1065
@@ -7744,7 +7749,7 @@
garciay's avatar
garciay committed
1066 1067 1068 1069 1070 1071 1072 1073
                     }
                     
                     // Test Body
-                    f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(valueof(v_gnPacket), -, f_getIutMacAddress()));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_withLinkLayerDestination(v_gnPacket, -, f_getIutMacAddress())));
                    
                     f_sleep(PX_TAC);
                     
garciay's avatar
garciay committed
1074
@@ -7773,7 +7778,7 @@
garciay's avatar
garciay committed
1075 1076 1077 1078 1079 1080 1081 1082
                     // Preamble
                     f_prNeighbour();
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
garciay's avatar
garciay committed
1083
@@ -7786,7 +7791,7 @@
garciay's avatar
garciay committed
1084 1085 1086 1087 1088 1089 1090 1091
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
1092
@@ -7854,10 +7859,10 @@
garciay's avatar
garciay committed
1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
-	                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;
                     alt {
garciay's avatar
garciay committed
1107
@@ -8089,7 +8094,7 @@
garciay's avatar
garciay committed
1108 1109 1110 1111 1112 1113 1114 1115
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeB,
garciay's avatar
garciay committed
1116
@@ -8098,7 +8103,7 @@
garciay's avatar
garciay committed
1117 1118 1119 1120 1121 1122 1123 1124
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
1125
@@ -8219,7 +8224,7 @@
garciay's avatar
garciay committed
1126 1127 1128 1129 1130 1131 1132 1133
                                       -,
                                       c_defaultHopLimit
                                   );
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_gnPacket)));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
1134
@@ -8266,7 +8271,9 @@
1135 1136 1137 1138 1139 1140 1141 1142 1143 1144
                     
                     // Local variables
                     var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB);
-                    var template (present) GeoNetworkingInd v_msgInd;
+//FIXME RGY variable shall not be of template type, because a message is stored into it
+//                    var template (present) GeoNetworkingInd v_msgInd;
+                    var /*template (present)*/ GeoNetworkingInd v_msgInd;
                     
                     // Preamble
                     f_prNeighbour();
garciay's avatar
garciay committed
1145
@@ -8290,9 +8297,11 @@
garciay's avatar
garciay committed
1146 1147
                     // Test Body
                     // send geoBroadcast for second time (same source + same seq Nr + lower RHL)
1148
                     v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) - 1;
garciay's avatar
garciay committed
1149 1150
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_msgInd.msgIn)));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn)));
1151 1152 1153 1154 1155 1156 1157 1158
                     
-                    v_msgInd.msgIn.basicHeader.routerHopLimit := ?;
+//FIXME RGY variable is not used after asigning AnyValue;
+//          if a template is needed for some purpose a template variable should also be declared; see f_GEONW_PON_GBC_BO_06_nodeB
+//                    v_msgInd.msgIn.basicHeader.routerHopLimit := ?;
                     tc_noac.start;
                     alt {
                         [] a_receiveGeoBroadcast(
garciay's avatar
garciay committed
1159
@@ -8404,7 +8413,7 @@
garciay's avatar
garciay committed
1160 1161 1162 1163 1164 1165 1166 1167
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1168
@@ -8413,7 +8422,7 @@
garciay's avatar
garciay committed
1169 1170 1171 1172 1173 1174 1175 1176
                                 )
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
1177
@@ -8511,7 +8520,9 @@
1178 1179 1180 1181 1182 1183 1184 1185 1186 1187
                     
                     // Local variables
                     var LongPosVector v_longPosVectorNodeC := f_getPosition(c_compNodeC);
-                    var template (present) GeoNetworkingInd v_msgInd;
+                    var template (present) GeoNetworkingInd vt_msgInd;
+//FIXME RGY variable is declared to store the received message
+                    var GeoNetworkingInd v_msgInd;
                     
                     // Preamble
                     f_prNeighbour();
garciay's avatar
garciay committed
1188
@@ -8522,6 +8533,8 @@
1189 1190 1191 1192 1193 1194 1195 1196
                                 ?,
                                 f_getGeoBroadcastArea(c_area2)
                             )))) -> value v_msgInd {
+//FIXME RGY the received value stored in the template variable too
+                            vt_msgInd:= v_msgInd
                             tc_ac.stop;
                             log("*** " & testcasename() & ": PASS: Pre-conditions: GBC message correctly forwarded to area center ***");
                             f_selfOrClientSyncAndVerdict(c_prDone, e_success);
garciay's avatar
garciay committed
1197
@@ -8533,10 +8546,11 @@
1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210
                     }
                     
                     // Test Body
-                    v_msgInd.msgIn.basicHeader.routerHopLimit := ?;
+//FIXME RGY for the AnyValue the template varibale is used
+                    vt_msgInd.msgIn.basicHeader.routerHopLimit := ?;
                     tc_noac.start;
                     alt {
-                        [] geoNetworkingPort.receive(v_msgInd) {
+                        [] geoNetworkingPort.receive(vt_msgInd) {
                             tc_noac.stop;
                             log("*** " & testcasename() & ": FAIL: GBC message re-forwarded to area center ***");
                             f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
garciay's avatar
garciay committed
1211
@@ -8563,7 +8577,7 @@
garciay's avatar
garciay committed
1212 1213 1214 1215 1216 1217 1218 1219
                     // Preamble
                     f_prNeighbour();
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1220
@@ -8574,7 +8588,7 @@
garciay's avatar
garciay committed
1221 1222 1223 1224 1225 1226 1227 1228
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
1229
@@ -8615,7 +8629,7 @@
garciay's avatar
garciay committed
1230 1231 1232 1233 1234 1235 1236 1237
                     // Test Body
                     // send geoBroadcast for second time (same source + same seq Nr + lower RHL)
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1238
@@ -8626,7 +8640,7 @@
garciay's avatar
garciay committed
1239 1240 1241 1242 1243 1244 1245 1246
                                 c_defaultHopLimit - 1
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1247
@@ -8703,7 +8717,7 @@
garciay's avatar
garciay committed
1248 1249 1250 1251 1252 1253 1254 1255
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeB,
garciay's avatar
garciay committed
1256
@@ -8715,7 +8729,7 @@
garciay's avatar
garciay committed
1257 1258 1259 1260 1261 1262 1263 1264
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
1265
@@ -8830,7 +8844,7 @@
garciay's avatar
garciay committed
1266 1267 1268 1269 1270 1271 1272 1273
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeB,
garciay's avatar
garciay committed
1274
@@ -8841,7 +8855,7 @@
garciay's avatar
garciay committed
1275 1276 1277 1278 1279 1280 1281 1282
                                 c_hopLimit1
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1283
@@ -8933,7 +8947,7 @@
garciay's avatar
garciay committed
1284 1285 1286 1287 1288 1289 1290 1291
                                             f_getGeoBroadcastArea(c_area1)
                                         )
                                     );
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                 
                 f_sleep(PX_TAC);
                 
garciay's avatar
garciay committed
1292
@@ -9019,7 +9033,7 @@
garciay's avatar
garciay committed
1293 1294 1295 1296 1297 1298 1299 1300
                                             -,
                                             c_defaultHopLimit
                                         );
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_gnPacket)));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                     
                     // IUT should also rebroadcast the packet. Get ready
                     tc_ac.start;
garciay's avatar
garciay committed
1301
@@ -9039,14 +9053,14 @@
garciay's avatar
garciay committed
1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319
                     
                     f_sleep(PX_TAC);
                     
-	                v_sentRawPayload := f_adaptPayloadForUtInd_m(valueof(v_gnPacket.gnPacket.packet.payload));
-	                for(i:=0; i < lengthof(vc_utInds) and not match(vc_utInds[i].rawPayload, v_sentRawPayload); i:=i+1) {
+                    v_sentRawPayload := f_adaptPayloadForUtInd_m(valueof(v_gnPacket.gnPacket.packet.payload));
+                    for(i:=0; i < lengthof(vc_utInds) and not match(vc_utInds[i].rawPayload, v_sentRawPayload); i:=i+1) {
                         // empty on purpose 
                     }
                     if(i < lengthof(vc_utInds)) {
                         log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***");
-	                    //flush received upper indications 
-	                    vc_utInds := {};
+                        //flush received upper indications 
+                        vc_utInds := {};
                         f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     }
                     else {
garciay's avatar
garciay committed
1320
@@ -9078,7 +9092,9 @@
1321 1322 1323 1324 1325 1326 1327 1328 1329 1330
                     
                     // Local variables
                     var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB);
-                    var template (value) GeoNetworkingInd v_msgInd;
+//FIXME RGY variable shall not be of template type, because a message is stored into it
+//                    var template (value) GeoNetworkingInd v_msgInd;
+                    var GeoNetworkingInd v_msgInd;
                     var integer i;
                     
                     // Preamble
garciay's avatar
garciay committed
1331
@@ -9104,7 +9120,7 @@
garciay's avatar
garciay committed
1332 1333 1334 1335 1336 1337 1338 1339
                      
                     // Test Body
                     v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) / 2;
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn)));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
1340
@@ -9149,7 +9165,7 @@
garciay's avatar
garciay committed
1341 1342 1343 1344 1345 1346 1347 1348
                                             f_getGeoBroadcastArea(c_area2)
                                         )
                                     );
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                 
                 f_sleep(PX_TAC);
                 
garciay's avatar
garciay committed
1349
@@ -9383,7 +9399,7 @@
garciay's avatar
garciay committed
1350 1351 1352 1353 1354 1355 1356 1357
                         p_distanceTooBig
                     );
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1358
@@ -9392,7 +9408,7 @@
garciay's avatar
garciay committed
1359 1360 1361 1362 1363 1364 1365 1366
                                 )
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
1367
@@ -9569,7 +9585,7 @@
garciay's avatar
garciay committed
1368 1369 1370 1371 1372 1373 1374 1375
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1376
@@ -9578,7 +9594,7 @@
garciay's avatar
garciay committed
1377 1378 1379 1380 1381 1382 1383 1384
                                 )
                             )
                         )
-                    );
+                    ));
                     tc_ac.start;
                     alt {
                         [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
garciay's avatar
garciay committed
1385
@@ -9730,7 +9746,7 @@
garciay's avatar
garciay committed
1386 1387 1388 1389 1390 1391 1392 1393
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1394
@@ -9739,7 +9755,7 @@
garciay's avatar
garciay committed
1395 1396 1397 1398 1399 1400 1401 1402
                                 )
                             )
                         )
-                    );
+                    ));
                     tc_ac.start;
                     alt {
                         [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
garciay's avatar
garciay committed
1403
@@ -9937,7 +9953,7 @@
garciay's avatar
garciay committed
1404 1405 1406 1407 1408 1409 1410 1411
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwTsbPacket(
                                     vc_localSeqNumber,
garciay's avatar
garciay committed
1412
@@ -9947,7 +9963,7 @@
garciay's avatar
garciay committed
1413 1414 1415 1416 1417 1418 1419 1420
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
1421
@@ -10075,7 +10091,7 @@
garciay's avatar
garciay committed
1422 1423 1424 1425 1426 1427 1428 1429
                                       c_defaultHopLimit
                                   );
                     
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_gnPacket)));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                     v_gnPacket.basicHeader.routerHopLimit := ?;
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1430
@@ -10134,7 +10150,9 @@
1431 1432 1433 1434 1435 1436 1437 1438 1439 1440
                     
                     // Local variables
                     var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB);
-                    var template (value) GeoNetworkingInd v_msgInd;
+//FIXME RGY variable shall not be of template type, because a message is stored into it
+//                    var template (value) GeoNetworkingInd v_msgInd;                    
+                    var GeoNetworkingInd v_msgInd;
                     
                     // Preamble
                     f_prNeighbour();
garciay's avatar
garciay committed
1441
@@ -10162,7 +10180,7 @@
garciay's avatar
garciay committed
1442 1443 1444 1445 1446 1447 1448 1449
                     
                     // Test Body
                     v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) -1;
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn)));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1450
@@ -10208,7 +10226,7 @@
garciay's avatar
garciay committed
1451 1452 1453 1454 1455 1456 1457 1458
                     // Preamble
                     
                     // Start components
-                    v_nodeB := f_getComponent(c_compNodeB);                    
+                    v_nodeB := f_getComponent(c_compNodeB);
                     v_nodeD := f_getComponent(c_compNodeD);
                     v_nodeB.start(f_GEONW_PON_TSB_BV_04_nodeB());
                     v_nodeD.start(f_GEONW_PON_TSB_BV_04_nodeD());
garciay's avatar
garciay committed
1459
@@ -10235,7 +10253,7 @@
garciay's avatar
garciay committed
1460 1461 1462 1463 1464 1465 1466 1467
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwTsbPacket(
                                     vc_localSeqNumber,
garciay's avatar
garciay committed
1468
@@ -10246,7 +10264,7 @@
garciay's avatar
garciay committed
1469 1470 1471 1472 1473 1474 1475 1476
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
1477
@@ -10405,7 +10423,7 @@
garciay's avatar
garciay committed
1478 1479 1480 1481 1482 1483 1484 1485
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwTsbPacket(
                                     vc_localSeqNumber,
garciay's avatar
garciay committed
1486
@@ -10415,7 +10433,7 @@
garciay's avatar
garciay committed
1487 1488 1489 1490 1491 1492 1493 1494
                                 1
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
1495
@@ -10499,7 +10517,7 @@
garciay's avatar
garciay committed
1496 1497 1498 1499 1500 1501 1502 1503
                                             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
1504
@@ -10582,7 +10600,7 @@
garciay's avatar
garciay committed
1505 1506 1507 1508 1509 1510 1511 1512
                                             -,
                                             c_defaultHopLimit
                                         );
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(valueof(v_gnPacket)));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(valueof(v_gnPacket))));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
1513
@@ -10648,7 +10666,9 @@
1514 1515 1516 1517 1518 1519 1520 1521 1522 1523
                     
                     // Local variables
                     var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB);
-                    var template (value) GeoNetworkingInd v_msgInd;
+//FIXME RGY variable shall not be of template type, because a message is stored into it
+//                    var template (value) GeoNetworkingInd v_msgInd;
+                    var GeoNetworkingInd v_msgInd;
                     var integer i;
                     var template (value) GeoNetworkingPdu v_gnPacket;
                     
garciay's avatar
garciay committed
1524
@@ -10680,7 +10700,7 @@
garciay's avatar
garciay committed
1525 1526 1527 1528 1529 1530 1531 1532
                     // Test Body
                     v_msgInd.msgIn.basicHeader.routerHopLimit := valueof(v_msgInd.msgIn.basicHeader.routerHopLimit) - 1;
                     v_gnPacket := v_msgInd.msgIn;
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_msgInd.msgIn)));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
1533
@@ -10843,7 +10863,7 @@
garciay's avatar
garciay committed
1534 1535 1536 1537 1538 1539 1540 1541
                 
                 // Test Body
                 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
1542
@@ -11151,7 +11171,7 @@
garciay's avatar
garciay committed
1543 1544 1545 1546 1547 1548 1549 1550
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwAnycastPacket(
                                     v_longPosVectorNodeB,
garciay's avatar
garciay committed
1551
@@ -11160,7 +11180,7 @@
garciay's avatar
garciay committed
1552 1553 1554 1555 1556 1557 1558 1559
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1560
@@ -11307,7 +11327,7 @@
garciay's avatar
garciay committed
1561 1562 1563 1564 1565 1566 1567 1568
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwAnycastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1569
@@ -11316,7 +11336,7 @@
garciay's avatar
garciay committed
1570 1571 1572 1573 1574 1575 1576 1577
                                 )
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
1578
@@ -11408,7 +11428,9 @@
1579 1580 1581 1582 1583 1584 1585 1586 1587 1588
                     
                     // Local variables
                     var LongPosVector v_longPosVectorNodeC := f_getPosition(c_compNodeC);
-                    var template (present) GeoNetworkingInd v_msgInd;
+                    var template (present) GeoNetworkingInd vt_msgInd;
+//FIXME RGY variable is declared to store the received message
+                    var GeoNetworkingInd v_msgInd;
                     
                     // Preamble
                     f_prNeighbour();
garciay's avatar
garciay committed
1589
@@ -11425,6 +11447,8 @@
1590 1591 1592 1593 1594 1595 1596 1597
                                     )
                                 )
                             ) -> value v_msgInd {
+//FIXME RGY the received value stored in the template variable too
+                            vt_msgInd:= v_msgInd
                             tc_ac.stop;
                             log("*** " & testcasename() & ": PASS: Pre-conditions: GAC message correctly forwarded to area center ***");
                             f_selfOrClientSyncAndVerdict(c_prDone, e_success);
garciay's avatar
garciay committed
1598
@@ -11436,10 +11460,11 @@
1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611
                     }
                     
                     // Test Body
-                    v_msgInd.msgIn.basicHeader.routerHopLimit := ?;
+//FIXME RGY for the AnyValue the template varibale is used
+                    vt_msgInd.msgIn.basicHeader.routerHopLimit := ?;
                     tc_noac.start;
                     alt {
-                        [] geoNetworkingPort.receive(v_msgInd) {
+                        [] geoNetworkingPort.receive(vt_msgInd) {
                             tc_noac.stop;
                             log("*** " & testcasename() & ": FAIL: GAC message re-forwarded to area center ***");
                             f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
garciay's avatar
garciay committed
1612
@@ -11466,7 +11491,7 @@
garciay's avatar
garciay committed
1613 1614 1615 1616 1617 1618 1619 1620
                     // Preamble
                     f_prNeighbour();
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwAnycastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1621
@@ -11477,7 +11502,7 @@
garciay's avatar
garciay committed
1622 1623 1624 1625 1626 1627 1628 1629
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
1630
@@ -11532,7 +11557,7 @@
garciay's avatar
garciay committed
1631 1632 1633 1634 1635 1636 1637 1638
                     // Test Body
                     // send geoAnycast for second time (same source + same seq Nr + lower RHL)
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwAnycastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1639
@@ -11543,7 +11568,7 @@
garciay's avatar
garciay committed
1640 1641 1642 1643 1644 1645 1646 1647
                                 c_defaultHopLimit - 1
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1648
@@ -11656,7 +11681,7 @@
garciay's avatar
garciay committed
1649 1650 1651 1652 1653 1654 1655 1656
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwAnycastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1657
@@ -11668,7 +11693,7 @@
garciay's avatar
garciay committed
1658 1659 1660 1661 1662 1663 1664 1665
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
1666
@@ -11763,7 +11788,7 @@
garciay's avatar
garciay committed
1667 1668 1669 1670 1671 1672 1673 1674
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwAnycastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1675
@@ -11774,7 +11799,7 @@
garciay's avatar
garciay committed
1676 1677 1678 1679 1680 1681 1682 1683
                                 c_hopLimit1
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
1684
@@ -11819,7 +11844,7 @@
garciay's avatar
garciay committed
1685 1686 1687 1688 1689 1690 1691 1692
                                             f_getGeoAnycastArea(c_area1)
                                         )
                                     );
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                 
                 f_sleep(PX_TAC);
                 
garciay's avatar
garciay committed
1693
@@ -11923,7 +11948,7 @@
garciay's avatar
garciay committed
1694 1695 1696 1697 1698 1699 1700 1701
                     
                     // Test Body
                     v_gnPacket.basicHeader.routerHopLimit := valueof(v_gnPacket.basicHeader.routerHopLimit) / 2;
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                     
                     f_sleep(PX_TAC);
                     
garciay's avatar
garciay committed
1702
@@ -11961,7 +11986,7 @@
garciay's avatar
garciay committed
1703 1704 1705 1706 1707 1708 1709 1710
                                             -,
                                             c_defaultHopLimit
                                         );
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
garciay's avatar
garciay committed
1711
@@ -12010,7 +12035,7 @@
garciay's avatar
garciay committed
1712 1713 1714 1715 1716 1717 1718 1719
                                             f_getGeoAnycastArea(c_area2)
                                         )
                                     );
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
 
                 f_sleep(PX_TAC);
                 
garciay's avatar
garciay committed
1720
@@ -12127,7 +12152,7 @@
garciay's avatar
garciay committed
1721 1722 1723 1724 1725 1726 1727 1728
                         p_distanceTooBig
                     );
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwAnycastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1729
@@ -12136,7 +12161,7 @@
garciay's avatar
garciay committed
1730 1731 1732 1733 1734 1735 1736 1737
                                 )
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
1738
@@ -12409,7 +12434,7 @@
garciay's avatar
garciay committed
1739 1740 1741 1742 1743 1744 1745 1746
                     // Preamble
                     f_prNeighbour();
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1747
@@ -12418,7 +12443,7 @@
garciay's avatar
garciay committed
1748 1749 1750 1751 1752 1753 1754 1755
                                 )
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
1756
@@ -12458,7 +12483,7 @@
garciay's avatar
garciay committed
1757 1758 1759 1760 1761 1762 1763 1764
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1765
@@ -12467,7 +12492,7 @@
garciay's avatar
garciay committed
1766 1767 1768 1769 1770 1771 1772 1773
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1774
@@ -12599,7 +12624,7 @@
garciay's avatar
garciay committed
1775 1776 1777 1778 1779 1780 1781 1782
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1783
@@ -12608,7 +12633,7 @@
garciay's avatar
garciay committed
1784 1785 1786 1787 1788 1789 1790 1791
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     t_toCbf.start;                    
                     tc_ac.start;
garciay's avatar
garciay committed
1792
@@ -12785,7 +12810,7 @@
garciay's avatar
garciay committed
1793 1794 1795 1796 1797 1798 1799 1800
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1801
@@ -12794,7 +12819,7 @@
garciay's avatar
garciay committed
1802 1803 1804 1805 1806 1807 1808 1809
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1810
@@ -12971,7 +12996,7 @@
garciay's avatar
garciay committed
1811 1812 1813 1814 1815 1816 1817 1818
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeD,
garciay's avatar
garciay committed
1819
@@ -12980,7 +13005,7 @@
garciay's avatar
garciay committed
1820 1821 1822 1823 1824 1825 1826 1827
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
garciay's avatar
garciay committed
1828
@@ -13138,7 +13163,7 @@
garciay's avatar
garciay committed
1829 1830 1831 1832 1833 1834 1835 1836
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1837
@@ -13147,7 +13172,7 @@
garciay's avatar
garciay committed
1838 1839 1840 1841 1842 1843 1844 1845
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     t_toCbf.start;                    
                     tc_ac.start;
garciay's avatar
garciay committed
1846
@@ -13316,7 +13341,7 @@
garciay's avatar
garciay committed
1847 1848 1849 1850 1851 1852 1853 1854
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1855
@@ -13325,7 +13350,7 @@
garciay's avatar
garciay committed
1856 1857 1858 1859 1860 1861 1862 1863
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
1864
@@ -13450,7 +13475,7 @@
garciay's avatar
garciay committed
1865 1866 1867 1868 1869 1870 1871 1872
                     
                     // Test Body 
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeA,
garciay's avatar
garciay committed
1873
@@ -13459,7 +13484,7 @@
garciay's avatar
garciay committed
1874 1875 1876 1877 1878 1879 1880 1881
                                 )
                             )
                         )
-                    );                   
+                    ));
                     
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
1882
@@ -13659,7 +13684,7 @@
garciay's avatar
garciay committed
1883 1884 1885 1886 1887 1888 1889 1890
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
garciay's avatar
garciay committed
1891
@@ -13668,7 +13693,7 @@
garciay's avatar
garciay committed
1892 1893 1894 1895 1896 1897 1898 1899
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     t_toCbf.start;                    
                     tc_ac.start;
garciay's avatar
garciay committed
1900
@@ -13808,12 +13833,12 @@
garciay's avatar
garciay committed
1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914
                                             f_getGeoBroadcastArea(c_area1)
                                         )
                                     );
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
                     for(i:=1; i < f_getAdvancedGbcForwardingMaxCounter(); i:=i+1) {
-                        f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                        f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                         f_sleepIgnoreDef(0.5);
                     }
                     tc_noac.start;
garciay's avatar
garciay committed
1915
@@ -13894,7 +13919,7 @@
garciay's avatar
garciay committed
1916 1917 1918 1919 1920 1921 1922 1923
                     
                     // Preamble
                     f_prNeighbour();
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeB,
                                 0,
garciay's avatar
garciay committed
1924
@@ -13901,7 +13926,7 @@
garciay's avatar
garciay committed
1925 1926 1927 1928 1929 1930 1931 1932
                                 f_getGeoBroadcastArea(c_area1)
                             )
                         )
-                    ));
+                    )));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
garciay's avatar
garciay committed
1933
@@ -13936,7 +13961,7 @@
garciay's avatar
garciay committed
1934 1935 1936 1937 1938 1939 1940 1941
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeB,
                                 0,
garciay's avatar
garciay committed
1942
@@ -13943,7 +13968,7 @@
garciay's avatar
garciay committed
1943 1944 1945 1946 1947 1948 1949 1950
                                 f_getGeoBroadcastArea(c_area1)
                             )
                         )
-                    ));
+                    )));
                     tc_noac.start;
                     alt {
                         [] geoNetworkingPort.receive (mw_geoNwInd(mw_geoNwPdu(?))){
garciay's avatar
garciay committed
1951
@@ -14022,7 +14047,7 @@
garciay's avatar
garciay committed
1952 1953 1954 1955 1956 1957 1958 1959
                     
                     // Preamble
                     f_prNeighbour();
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeB,
                                 0,
garciay's avatar
garciay committed
1960
@@ -14029,7 +14054,7 @@
garciay's avatar
garciay committed
1961 1962 1963 1964 1965 1966 1967 1968
                                 f_getGeoBroadcastArea(c_area1)
                             )
                         )
-                    ));
+                    )));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body                 
garciay's avatar
garciay committed
1969
@@ -14075,14 +14100,15 @@
garciay's avatar
garciay committed
1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(
-                        m_geoNwPdu(m_geoNwBroadcastPacket(
+                    f_sendGeoNetMessage(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
+                            m_geoNwPdu(m_geoNwBroadcastPacket(
                                 v_longPosVectorNodeB,
                                 0,
                                 f_getGeoBroadcastArea(c_area1)
                             )
                         )
-                    ));
+                    )));
                     t_toCbf.start;                    
                     tc_ac.start;
                     alt {
garciay's avatar
garciay committed
1988
@@ -14093,7 +14119,7 @@
garciay's avatar
garciay committed
1989 1990 1991 1992 1993 1994 1995 1996
                             )))) {
                             tc_ac.stop;                           
                             
-                            if(t_toCbf.running) {                            	
+                            if(t_toCbf.running) {                                
                                 t_toCbf.stop;
                                 log("*** " & testcasename() & ": FAIL: GBC retransmitted before CBF timer expiration ***");
                                 f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
garciay's avatar
garciay committed
1997
@@ -14182,8 +14208,8 @@
garciay's avatar
garciay committed
1998 1999 2000 2001 2002 2003 2004 2005 2006 2007
                     
                     // Test Body
                     tc_ac.start;
-                    alt {                    	
-                    	[] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
+                    alt {                        
+                        [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
                                 mw_longPosVectorPosition(v_longPosVectorNodeA),
                                 ?,
                                 f_getGeoBroadcastArea(c_area1)
garciay's avatar
garciay committed
2008
@@ -14217,17 +14243,17 @@
garciay's avatar
garciay committed
2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035
                     
                     // Test Body
                     f_sendGeoNetMessage(
-	                    m_geoNwReq_withLinkLayerDestination(
-	                        m_geoNwPdu(m_geoNwBroadcastPacket(
-	                                v_longPosVectorNodeA,
-	                                0,
-	                                f_getGeoBroadcastArea(c_area1)
-	                            )
-	                        ),
+                        valueof(m_geoNwReq_withLinkLayerDestination(
+                            m_geoNwPdu(m_geoNwBroadcastPacket(
+                                    v_longPosVectorNodeA,
+                                    0,
+                                    f_getGeoBroadcastArea(c_area1)
+                                )
+                            ),
                             -,
-	                        f_getIutMacAddress()
-	                    )
-                    );
+                            f_getIutMacAddress()
+                        )
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
garciay's avatar
garciay committed
2036
@@ -14299,7 +14325,7 @@
garciay's avatar
garciay committed
2037 2038 2039 2040 2041 2042 2043 2044
                     
                     // Test Body
                     tc_ac.start;
-                    alt {                    	
+                    alt {                        
                         [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
                                 mw_longPosVectorPosition(v_longPosVectorNodeA),
                                 ?,
garciay's avatar
garciay committed
2045
@@ -14334,7 +14360,7 @@
garciay's avatar
garciay committed
2046 2047 2048 2049 2050 2051 2052 2053
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeA,
                                     0,
garciay's avatar
garciay committed
2054
@@ -14344,9 +14370,9 @@
garciay's avatar
garciay committed
2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     tc_ac.start;
-                    alt {                    	
+                    alt {                        
                         [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(mw_geoNwBroadcastPacketWithArea(
                                 mw_longPosVectorPosition(v_longPosVectorNodeA),
                                 ?,
garciay's avatar
garciay committed
2066
@@ -14491,7 +14517,7 @@
garciay's avatar
garciay committed
2067 2068 2069 2070 2071 2072 2073 2074
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeE,
                                     0,
garciay's avatar
garciay committed
2075
@@ -14499,7 +14525,7 @@