ttcn/Common/LibItsCommon_Templates.ttcn

@@ -18,8 +18,6 @@ module LibItsCommon_Templates {
     
     group taPrimitives {
         
-//FIXME RGY the simple boolean result has been changed to a union
-//        template (value) AcSecResponse m_acSecResponseSuccess := true;
         template (value) AdapterControlResults m_acSecResponseSuccess := {acSecResponse:=true};
         
         /**
@@ -44,18 +42,16 @@ module LibItsCommon_Templates {
             }
         } // End of template m_acDisableSecurity
         
-//FIXME RGY As discussed, port in type is changed to a top-level union type 
-//        template AcGnssResponse m_acGnssResponseSuccess := true;
         template AdapterControlResults m_acGnssResponseSuccess := {acGnssResponse:=true};
 
-//FIXME RGY As discussed, port in type is changed to a top-level union type 
-//        template AcGnssDistanceCovered m_acGnssDistanceCovered := true;
-        template AdapterControlResults m_acGnssDistanceCovered := {acGnssDistanceCovered:=true};
+        template (value) AdapterControlResults m_acGnssDistanceCovered := {
+            acGnssDistanceCovered:=true
+        };
         
         /**
          * @desc Testsystem will load GNSS scenario
          */
-        template AcGnssPrimitive m_loadScenario(Scenario p_scenario) := {
+        template (value) AcGnssPrimitive m_loadScenario(Scenario p_scenario) := {
             loadScenario := {
                 scenario := p_scenario
             }
@@ -64,7 +60,7 @@ module LibItsCommon_Templates {
         /**
          * @desc Testsystem will start GNSS scenario
          */
-        template AcGnssPrimitive m_startScenario := {
+        template (value) AcGnssPrimitive m_startScenario := {
             startScenario := {
             }
         }
@@ -72,7 +68,7 @@ module LibItsCommon_Templates {
         /**
          * @desc Testsystem will stop GNSS scenario
          */
-        template AcGnssPrimitive m_stopScenario := {
+        template (value) AcGnssPrimitive m_stopScenario := {
             stopScenario := {
             }
         }
@@ -80,7 +76,7 @@ module LibItsCommon_Templates {
         /**
          * @desc Testsystem will request indication if distance was covered
          */
-        template AcGnssPrimitive m_distanceToCover(float p_distance) := {
+        template (value) AcGnssPrimitive m_distanceToCover(float p_distance) := {
             distanceToCover := {
                 distance := p_distance
             }
@@ -89,7 +85,7 @@ module LibItsCommon_Templates {
         /**
          * @desc Testsystem will change the speed (delta value)
          */
-        template AcGnssPrimitive m_changeScenarioSpeed(SpeedValue p_deltaSpeedValue) := {
+        template (value) AcGnssPrimitive m_changeScenarioSpeed(SpeedValue p_deltaSpeedValue) := {
             changeSpeed := {
                 deltaSpeed := p_deltaSpeedValue
             }
@@ -98,7 +94,7 @@ module LibItsCommon_Templates {
         /**
          * @desc Testsystem will change the heading (delta value)
          */
-        template AcGnssPrimitive m_changeScenarioHeading(HeadingValue p_deltaHeadingValue) := {
+        template (value) AcGnssPrimitive m_changeScenarioHeading(HeadingValue p_deltaHeadingValue) := {
             changeHeading := {
                 deltaHeading := p_deltaHeadingValue
             }

ttcn/DENM/LibItsDenm_Templates.ttcn

@@ -314,7 +314,7 @@ module LibItsDenm_Templates {
          * @param   p_protocolVersion   The expected protocol version (Default: current DEN protocol version)
          * @param   p_messageID         The expected message id (Default: DEN message id)
          */
-        template ItsPduHeader mw_itsPduHeader(
+        template (present) ItsPduHeader mw_itsPduHeader(
             template (present) StationID p_stationID := ?,
             template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
             template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_denm_
@@ -431,7 +431,7 @@ module LibItsDenm_Templates {
          * @param   p_location      The expected location Container (Default: any or omit)
          * @param   p_alacarte      The expected Alacarte Container (Default: any or omit)
          */
-        template (present) DecentralizedEnvironmentalNotificationMessage mw_denm(
+        template DecentralizedEnvironmentalNotificationMessage mw_denm(
             template (present) ManagementContainer p_management := ?,
             template SituationContainer p_situation := *,
             template LocationContainer p_location := *,
@@ -500,7 +500,7 @@ module LibItsDenm_Templates {
          * @param   p_detectionTime         The detection time (Default: current time)
          * @param   p_referenceTime         The reference time (Default: current time)
          */
-        template (value) ManagementContainer m_denmMgmtConTermination (
+        template (omit) ManagementContainer m_denmMgmtConTermination (
             template (value) ActionID p_actionID,
             template (value) StationType p_stationType := f_getTsStationType(),
             template (value) ValidityDuration p_validityDuration := defaultValidity,
@@ -522,7 +522,7 @@ module LibItsDenm_Templates {
          * @param   p_detectionTime         The detection time (Default: current time)
          * @param   p_referenceTime         The reference time (Default: current time)
          */
-        template (present) ManagementContainer mw_denmMgmtConTermination (
+        template ManagementContainer mw_denmMgmtConTermination (
             template (present) ActionID p_actionID,
             template (present) StationType p_stationType := f_getIutStationType(),
             template (present) TimestampIts p_referenceTime := ?,
@@ -541,7 +541,7 @@ module LibItsDenm_Templates {
          * @param   p_validityDuration      The expected validity duration (Default: any or omit)
          * @param   p_transmissionInterval  The expected transmission interval (Default: any or omit)
          */
-        template (present) ManagementContainer mw_denmMgmtCon(
+        template ManagementContainer mw_denmMgmtCon(
             template (present) ActionID p_actionID,
             template (present) StationType p_stationType := f_getIutStationType(),
             template (present) TimestampIts p_referenceTime := ?,

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

@@ -161,7 +161,7 @@ module LibItsGeoNetworking_Functions {
      *         NodeB being close to the area center
      */
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking /* TITAN TODO: system ItsGeoNetworkingSystem */ {
+    function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
             
       // Variables
       var PositionTable v_positionTable := {};
@@ -190,7 +190,7 @@ module LibItsGeoNetworking_Functions {
     } // end f_cf01Up
         
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf01Down() runs on ItsGeoNetworking /* TITAN TODO: system ItsGeoNetworkingSystem */ {
+    function f_cf01Down() runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
             
       f_uninitialiseSecuredMode();
             
@@ -217,7 +217,7 @@ module LibItsGeoNetworking_Functions {
      */
 
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {
+    function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
             
       // Variables
       var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -286,7 +286,7 @@ module LibItsGeoNetworking_Functions {
      */
 
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf02Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {
+    function f_cf02Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
             
       // Local variables
       var integer i;
@@ -318,7 +318,7 @@ module LibItsGeoNetworking_Functions {
      * @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
      */
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {
+    function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
             
       // Variables
       var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -386,7 +386,7 @@ module LibItsGeoNetworking_Functions {
      */
 
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf03Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {
+    function f_cf03Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
             
       // Local variables
       var integer i;
@@ -421,7 +421,7 @@ module LibItsGeoNetworking_Functions {
      */
 
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {
+    function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
             
       // Variables
       var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -489,7 +489,7 @@ module LibItsGeoNetworking_Functions {
      */
 
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf04Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */{
+    function f_cf04Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
             
       // Local variables
       var integer i;
@@ -520,7 +520,7 @@ module LibItsGeoNetworking_Functions {
      */
 
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {
+    function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
             
       // Variables
       var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -587,7 +587,7 @@ module LibItsGeoNetworking_Functions {
      */
 
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf05Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {
+    function f_cf05Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
             
       // Local variables
       var integer i;
@@ -618,7 +618,7 @@ module LibItsGeoNetworking_Functions {
      * @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
      */
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {
+    function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
                     
       // Variables
       var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -685,7 +685,7 @@ module LibItsGeoNetworking_Functions {
      */
 
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf06Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {
+    function f_cf06Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
             
       // Local variables
       var integer i;
@@ -716,7 +716,7 @@ module LibItsGeoNetworking_Functions {
      */
 
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO mtc ItsMtc system ItsGeoNetworkingSystem */{
+    function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
                     
       // Variables
       var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -782,7 +782,7 @@ module LibItsGeoNetworking_Functions {
      * @desc Deletes configuration cf06
      */
     //FIXME RGY Titan doesn't support mtc and system clauses yet
-    function f_cf07Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {
+    function f_cf07Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
             
       // Local variables
       var integer i;
@@ -978,9 +978,8 @@ module LibItsGeoNetworking_Functions {
       position := p_positionValue
       };
     }
-    //FIXME RGY Titan doesn't support @deterministic yet   
-    //        function @deterministic f_fillTimestamp(inout LongPosVector v_vector) 
-    function f_fillTimestamp(inout LongPosVector v_vector) 
+    
+    function @deterministic f_fillTimestamp(in LongPosVector v_vector) 
     return LongPosVector {
       if (v_vector.timestamp_ == 0) {
       v_vector.timestamp_ := f_computeGnTimestamp();
@@ -1339,7 +1338,7 @@ module LibItsGeoNetworking_Functions {
     /**
      * @desc Default handling cf01 de-initialisation.
      */
-    altstep a_cf01Down() runs on ItsGeoNetworking {
+    altstep a_cf01Down() runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
       [] a_shutdown() {
         f_poDefault();
         f_cf01Down();
@@ -1351,7 +1350,7 @@ module LibItsGeoNetworking_Functions {
     /**
      * @desc Default handling cf02 de-initialisation.
      */
-    altstep a_cf02Down() runs on ItsMtc {
+    altstep a_cf02Down() runs on ItsMtc system ItsGeoNetworkingSystem {
       [] a_shutdown() {
         f_cf02Down();
         log("*** a_cf02Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
@@ -1362,7 +1361,7 @@ module LibItsGeoNetworking_Functions {
     /**
      * @desc Default handling cf03 de-initialisation.
      */
-    altstep a_cf03Down() runs on ItsMtc {
+    altstep a_cf03Down() runs on ItsMtc system ItsGeoNetworkingSystem {
       [] a_shutdown() {
         f_cf03Down();
         log("*** a_cf03Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
@@ -1373,7 +1372,7 @@ module LibItsGeoNetworking_Functions {
     /**
      * @desc Default handling cf04 de-initialisation.
      */
-    altstep a_cf04Down() runs on ItsMtc {
+    altstep a_cf04Down() runs on ItsMtc system ItsGeoNetworkingSystem {
       [] a_shutdown() {
         f_cf04Down();
         log("*** a_cf04Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
@@ -1384,7 +1383,7 @@ module LibItsGeoNetworking_Functions {
     /**
      * @desc Default handling cf05 de-initialisation.
      */
-    altstep a_cf05Down() runs on ItsMtc {
+    altstep a_cf05Down() runs on ItsMtc system ItsGeoNetworkingSystem {
       [] a_shutdown() {
         f_cf05Down();
         log("*** a_cf05Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
@@ -1395,7 +1394,7 @@ module LibItsGeoNetworking_Functions {
     /**
      * @desc Default handling cf06 de-initialisation.
      */
-    altstep a_cf06Down() runs on ItsMtc {
+    altstep a_cf06Down() runs on ItsMtc system ItsGeoNetworkingSystem {
       [] a_shutdown() {
         f_cf06Down();
         log("*** a_cf06Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
@@ -1406,7 +1405,7 @@ module LibItsGeoNetworking_Functions {
     /**
      * @desc Default handling cf07 de-initialisation.
      */
-    altstep a_cf07Down() runs on ItsMtc {
+    altstep a_cf07Down() runs on ItsMtc system ItsGeoNetworkingSystem {
       [] a_shutdown() {
         f_cf07Down();
         log("*** a_cf07Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");

ttcn/Http/LibItsHttp_TestSystem.ttcn

@@ -25,9 +25,10 @@ module LibItsHttp_TestSystem {
   type component HttpComponent extends SelfSyncComp { // FIXME To be rename into HttpTest
     port HttpPort httpPort;
     port HttpPort httpPort_notif;
+    // timers
+    timer tc_wait := PX_TWAIT;
     timer tc_ac := PX_TAC;
     timer tc_noac := PX_TNOAC;
-    timer tc_wait := PX_TWAIT;
 
   } // End of component HttpComponent
   

ttcn/IVIM/LibItsIvim_Templates.ttcn

@@ -54,7 +54,7 @@ module LibItsIvim_Templates {
          * @param   p_iviMsg    The expected IVI Message
          */
         template (present) IvimInd mw_ivimInd(
-                                              template (present) IVIM p_iviMsg
+                                              template (present) IVIM p_iviMsg := ?
         ) := {
             msgIn               := p_iviMsg,
             gnNextHeader        := *,
@@ -77,10 +77,8 @@ module LibItsIvim_Templates {
          * @param   p_gnLifetime        GN packet lifetime value (ms)
          * @param   p_gnTrafficClass    GN traffic class value
          */
-//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
-//        template IvimInd mw_ivimIndWithGnParameters (
-        template(present) IvimInd mw_ivimIndWithGnParameters (
-                                                     template (present) IVIM p_iviMsg,
+        template IvimInd mw_ivimIndWithGnParameters(
+                                                    template (present) IVIM p_iviMsg := ?,
                                                      in template UInt8 p_gnNextHeader := *,
                                                      in template UInt8 p_gnHeaderType := *,
                                                      in template UInt8 p_gnHeaderSubtype := *,
@@ -100,10 +98,8 @@ module LibItsIvim_Templates {
          * @param   p_btpDestinationPort    BTP destination port value
          * @param   p_btpInfo               BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
          */
-//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
-//        template IvimInd mw_ivimIndWithBtpParameters (
-        template(present) IvimInd mw_ivimIndWithBtpParameters (
-                                                      template (present) IVIM p_iviMsg,
+        template IvimInd mw_ivimIndWithBtpParameters(
+                                                     template (present) IVIM p_iviMsg := ?,
                                                       template UInt16 p_btpDestinationPort := *,
                                                       template UInt16 p_btpInfo := *
         ) modifies mw_ivimInd := { 
@@ -117,9 +113,8 @@ module LibItsIvim_Templates {
          * @param   p_ssp       SSP security parameter
          * @param   p_its_aid   ITS-AID value
          */
-//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
-        template(present) IvimInd mw_ivimIndWithSecurityParameters (
-                                                           template (present) IVIM p_iviMsg,
+        template IvimInd mw_ivimIndWithSecurityParameters(
+                                                          template (present) IVIM p_iviMsg := ?,
                                                            template Bit256 p_ssp := *,
                                                            template UInt32 p_its_aid := *
         ) modifies mw_ivimInd := { 
@@ -167,7 +162,7 @@ module LibItsIvim_Templates {
              * @param   p_connectedIviStructures    List of ConnectedIviStructure (Default: omit)
              * @param   p_optional_                 Optional field (Default: omit)
              */
-            template (value) UtIvimUpdate m_utIvimUpdateEvent(
+            template (omit) UtIvimUpdate m_utIvimUpdateEvent(
                                                               template (value) IviIdentificationNumber p_iviIdentificationNumber,
                                                               template (omit) TimestampIts p_timeStamp := c_duration_2sec,
                                                               template (omit) TimestampIts p_validFrom := omit,
@@ -221,7 +216,7 @@ module LibItsIvim_Templates {
          * @param   p_protocolVersion   The expected protocol version (Default: current IVI protocol version)
          * @param   p_messageID         The expected message id (Default: IVI message id)
          */
-        template ItsPduHeader mw_itsPduHeader(
+        template (present) ItsPduHeader mw_itsPduHeader(
                                               template (present) StationID p_stationID := ?,
                                               template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
                                               template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_ivim_
@@ -269,7 +264,7 @@ module LibItsIvim_Templates {
          * @param   p_messageID         The expected message id (Default: IVI message id)
          */
         template (present) IVIM mw_ivimPdu(
-                                           template (present) IviStructure p_ivim,
+                                           template (present) IviStructure p_ivim := ?,
                                            template (present) StationID p_stationID := ?,
                                            template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
                                            template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_ivim_
@@ -300,7 +295,7 @@ module LibItsIvim_Templates {
          * @param   p_mandatory    The Management Container
          * @param   p_optional_    A list of IVI Container (Default: omit)
          */
-        template (present) IviStructure mw_ivimStructure(
+        template IviStructure mw_ivimStructure(
                                                          template (present) IVIManagementContainer p_mandatory := ?,
                                                          template IviStructure.optional_ p_optional_ := *
         ) := {
@@ -315,7 +310,7 @@ module LibItsIvim_Templates {
         template (value) IviStructure m_ivimStructureCancellation(
                                                                   in template (value) IviIdentificationNumber p_iviIdentificationNumber
         ) := {
-            mandatory   := valueof(m_iviManagementContainer(f_getProvider(), valueof(p_iviIdentificationNumber), LibItsIvim_ASN1_IVInamedNumbers.IviStatus_cancellation_)), 
+            mandatory   := valueof(m_iviManagementContainer(f_getProvider(), valueof(p_iviIdentificationNumber), IviStatus_cancellation_)), 
             optional_   := omit
         } // End of template m_ivimStructureCancellation
         
@@ -509,7 +504,7 @@ module LibItsIvim_Templates {
             zone            := p_zone
         } // End of template m_glcPart
         
-        template (present) GlcPart mw_glcPart(
+        template GlcPart mw_glcPart(
                                               template (present) Zid p_zoneId := ?, 
                                               template LanePosition p_laneNumber := *,
                                               template GlcPart.zoneExtension p_zoneExtension := *,

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

@@ -313,7 +313,7 @@ module LibItsMapemSpatem_Templates {
          * @param   p_protocolVersion   The expected protocol version (Default: current MAPEM SPATEM protocol version)
          * @param   p_messageID         The expected message id (Default: MAPEM id)
          */
-        template ItsPduHeader mw_itsPduHeaderMapem(
+        template (present) ItsPduHeader mw_itsPduHeaderMapem(
                                                    template (present) StationID p_stationID := ?,
                                                    template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
                                                    template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_mapem_
@@ -329,7 +329,7 @@ module LibItsMapemSpatem_Templates {
          * @param   p_protocolVersion   The expected protocol version (Default: current MAPEM SPATEM protocol version)
          * @param   p_messageID         The expected message id (Default: SPATEM id)
          */
-        template ItsPduHeader mw_itsPduHeaderSpatem(
+        template (present) ItsPduHeader mw_itsPduHeaderSpatem(
                                                     template (present) StationID p_stationID := ?,
                                                     template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
                                                     template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_spatem_
@@ -571,9 +571,7 @@ module LibItsMapemSpatem_Templates {
             /**
              * @desc    Send template for SPAT Message
              */
-//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
-//            template (omit) SPAT m_spatem(
-            template (value) SPAT m_spatem(
+                template (omit) SPAT m_spatem(
                                           in template (value) IntersectionStateList p_intersections,
                                           in template (omit) DescriptiveName p_name := omit
             ) modifies m_defaultSpatem:= {
@@ -585,12 +583,12 @@ module LibItsMapemSpatem_Templates {
             
                 template (value) IntersectionStateList m_intersections := { m_intersection };
                 
-                template (value) IntersectionState m_intersection := {
+                template (omit) IntersectionState m_intersection := {
                     name                := omit,                                                // Human readable name for intersection to be used only in debug mode
                     id                  := m_intersectionReferenceID,                           // A globally unique value set, consisting of a  regionID and 
                                                                                                 // intersection ID assignment provides a unique mapping to the intersection MAP in question which provides complete location and approach/move/lane data
                     revision            := PX_INTERSECTIONSTATE_REVISION,
-                    status              := LibItsCommon_ASN1_ISDSRC_NamedNumbers.IntersectionStatusObject_manualControlIsEnabled_,    
+                    status              := IntersectionStatusObject_manualControlIsEnabled_,
                                                                                                 // General status of the controller(s)
                     moy                 := omit,                                                // Minute of current UTC year used only with messages to be archived 
                     timeStamp           := omit,                                                // The mSec point in the current UTC minute that this message was constructed
@@ -602,7 +600,7 @@ module LibItsMapemSpatem_Templates {
                 
                 template (value) MovementList m_movements := { m_movement };
                 
-                template (value) MovementState m_movement := {
+                template (omit) MovementState m_movement := {
                     movementName           := omit,
                     signalGroup            := PX_SIGNAL_GROUP_ID,
                     state_time_speed       := m_movementEventList,

ttcn/Security/LibItsSecurity_Functions.ttcn

@@ -1211,7 +1211,7 @@ module LibItsSecurity_Functions {
                 
                 // Local variables
                 var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
-                var HeaderInfo v_mandatoryHeaders;
+                var HeaderInfo v_mandatoryHeaders := valueof(m_ieee1609Dot2_headerInfo(0));
                 var HeaderInfo v_signerInfo;
                  
                 // Load certificates if required
@@ -1286,7 +1286,7 @@ module LibItsSecurity_Functions {
                 
                 // Local variables
                 var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
-                var HeaderInfo v_mandatoryHeaders;
+                var HeaderInfo v_mandatoryHeaders := valueof(m_ieee1609Dot2_headerInfo(0));
                 var HeaderInfo v_signerInfo;
                  
                 // Load certificates if required
@@ -1363,7 +1363,7 @@ module LibItsSecurity_Functions {
                 
                 // Local variables
                 var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
-                var HeaderInfo v_mandatoryHeaders;
+                var HeaderInfo v_mandatoryHeaders := valueof(m_ieee1609Dot2_headerInfo(0));
                 var HeaderInfo v_signerInfo;
                  
                 // Load certificates if required
@@ -1433,7 +1433,7 @@ module LibItsSecurity_Functions {
                 
                 // Local variables
                 var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
-                var HeaderInfo v_mandatoryHeaders;
+                var HeaderInfo v_mandatoryHeaders := valueof(m_ieee1609Dot2_headerInfo(0));
                 var HeaderInfo v_signerInfo;
                  
                 // Load certificates if required
@@ -1508,7 +1508,7 @@ module LibItsSecurity_Functions {
                 
                 // Local variables
                 var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
-                var HeaderInfo v_mandatoryHeaders;
+                var HeaderInfo v_mandatoryHeaders := valueof(m_ieee1609Dot2_headerInfo(0));
                 var HeaderInfo v_signerInfo;
                 
                 // Load certificates if required
@@ -1570,8 +1570,6 @@ module LibItsSecurity_Functions {
                                            in charstring p_certificateName
             ) runs on ItsSecurityBaseComponent return HashedId8 {
                 // Local variables
-// FIXME (DF) UNUSED
-//                var EtsiTs103097Certificate v_atCertificate;
                 var HashedId8   v_hashedId8 := '0000000000000000'O;
                 
                 // Sanity check

ttcn/Security/LibItsSecurity_Templates.ttcn

@@ -51,8 +51,6 @@ module LibItsSecurity_Templates {
          * @desc Its AID for Other
          * @see Draft ETSI TS 103 097 V1.3.1 Clause 7.3 Security profile for DENMs
          */
-//FIXME RGY definition type is changed to modulepar, as Titan doesn't support dynamic constants
-//        const IntX c_its_aid_Other := PX_OTHER_ITS_AID;
         template Psid c_its_aid_Other := PX_OTHER_ITS_AID;
         
         /**
@@ -1015,12 +1013,16 @@ module LibItsSecurity_Templates {
         template (omit) HeaderInfo m_headerInfo_inner_pki_request(
                                                                   in template (value) Psid p_psid := c_its_aid_SCR,
                                                                   in template (value) Time64 p_generationTime
-                                                                  ) modifies m_headerInfo_gn := {};
+                                                                  ) modifies m_ieee1609Dot2_headerInfo := {
+            generationTime       := p_generationTime
+        };
         
         template (omit) HeaderInfo m_headerInfo_inner_pki_response(
                                                                    in template (value) Psid p_psid := c_its_aid_SCR,
                                                                    in template (value) Time64 p_generationTime
-                                                                   ) modifies m_headerInfo_gn := {};
+                                                                   ) modifies m_ieee1609Dot2_headerInfo := {
+            generationTime       := p_generationTime
+        };
         
         template (present) HeaderInfo mw_headerInfo_inner_pki_request(
                                                                       template (present) Psid p_psid := c_its_aid_SCR,
@@ -1711,7 +1713,7 @@ module LibItsSecurity_Templates {
             ssp    := p_ssp
         } // End of template m_appPermissions
         
-        template (present) PsidSsp mw_appPermissions(
+        template PsidSsp mw_appPermissions(
                                                      template (present) Psid p_psid := ?,
                                                      template ServiceSpecificPermissions p_ssp := *
         ) := {
@@ -2074,7 +2076,7 @@ module LibItsSecurity_Templates {
 
     group utPrimitives {
         
-        template UtGnInitialize m_secGnInitialize(
+        template (value) UtGnInitialize m_secGnInitialize(
                                                   in Oct8 p_hashedId8
         ) := {
             hashedId8 := p_hashedId8