Merging Titan/TTwb branches

ttcn/IVIM/LibItsIvim_Templates.ttcn

@@ -76,7 +76,7 @@ module LibItsIvim_Templates {
          * @param   p_iviMsg    The expected IVI Message
          */
         template (value) IvimInd m_ivimInd(
-                                              template (value) IVIM p_iviMsg
+                                           in template (value) IVIM p_iviMsg
         ) := {
             msgIn               := p_iviMsg,
             recvTime            := omit,
@@ -166,9 +166,9 @@ module LibItsIvim_Templates {
              * @desc    Send template for Upper Tester event initialization
              */
             template (value) UtIvimInitialize m_ivimStructureInitialize(
-                                                                         in HashedId8 p_hashedId8 := '0000000000000000'O
+                                                                        in HashedId8 p_hashedId8 := '0000000000000000'O
                                                                        ) := {
-                hashedId8 := '0000000000000000'O
+                hashedId8 := p_hashedId8
             } // End of template m_ivimStructureInitialize
             
             /**

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

@@ -453,7 +453,7 @@ module LibItsMapemSpatem_Templates {
                     ingressApproach := p_ingressApproach,   // inbound Approach IDs to which this lane belongs
                     egressApproach  := p_egressApproach,    // outbound Approach IDs to which this lane belongs
                     laneAttributes  := p_laneAttributes,    // All Attribute information about the basic selected lane type
-                    maneuvers       := omit,                // the permitted maneuvers for this lane
+                    maneuvers       := p_allowedManeuvers,  // the permitted maneuvers for this lane
                     nodeList        := p_nodeListXY,        // Lane spatial path information as well as various Attribute information along the node path  
                                                             // Attributes found here are more general and may come and go over the length of the lane.
                     connectsTo      := p_connectsToList,    // a list of other lanes and their signal group IDs each connecting lane and its signal group ID is given, therefore this element provides the information formerly in "signalGroups" in prior editions.

ttcn/MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn

 /**
  *    @author   ETSI / STF484 / STF517
- *    @version  $URL$
- *              $Id$
+ *    @version  $Url: https://oldforge.etsi.org/svn/LibIts/tags/20170222_STF527_Final/ttcn/MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn $
+ *              $Id: LibItsMapemSpatem_TypesAndValues.ttcn 1307 2016-12-13 07:51:14Z garciay $
  *    @desc     Module containing types and values for MAPEM SPATEM
  *    @copyright   ETSI Copyright Notification
  *                 No part may be reproduced except as authorized by written permission.

ttcn/Rtcmem/LibItsRtcmem_Functions.ttcn

@@ -130,9 +130,13 @@ module LibItsRtcmem_Functions {
             utPort.send(p_event);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtRtcmemResults: { utRtcmemTerminationResult := ?}) {
+                [] utPort.receive(UtRtcmemResults: { utRtcmemTerminationResult := true}) {
                     tc_wait.stop;
                 }
+                [] utPort.receive(UtRtcmemResults: { utRtcmemTerminationResult := false}) {
+                    tc_wait.stop;
+                    f_selfOrClientSyncAndVerdict("RTCMEM Termination failed", e_error);
+                }
                 [] tc_wait.timeout {
                     log("*** " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time ***");
                     f_selfOrClientSyncAndVerdict("error", e_timeout);
@@ -225,7 +229,7 @@ module LibItsRtcmem_Functions {
          */
         altstep a_default() runs on ItsRtcmem {
             [vc_rtcmemDefaultActive] rtcmemPort.receive(mw_rtcmemInd(mw_rtcmemPdu(mw_defaultRtcmem))) { 
-                log("*** " & testcasename() & ": INFO: RTCMEMM received in default ***");
+                log("*** " & testcasename() & ": INFO: RTCMEM received in default ***");
                 vc_rtcmemReceived := true;
                 repeat;
             }

ttcn/Rtcmem/LibItsRtcmem_TypesAndValues.ttcn

@@ -81,7 +81,7 @@ module LibItsRtcmem_TypesAndValues {
       type record UtRtcmemEventInd {
         RTCMEM rtcmemMsg
       } with {
-        encode (rtcmemMsg) "LibItsRtcmem_asn1"
+        encode (rtcmemMsg) "PER"
       }
       
       /**

ttcn/SremSsem/LibItsSremSsem_Functions.ttcn

@@ -293,7 +293,8 @@ module LibItsSremSsem_Functions {
          * @param   p_certificateId The certificate identifier the TA shall use in case of secured IUT
          */
         function f_cfUp(
-                        in charstring p_certificateId := PX_CERT_FOR_TS
+                        in charstring p_certificateId := PX_CERT_FOR_TS,
+                        in charstring p_iutCertificateId := ""
         )  runs on ItsSremSsem system ItsSremSsemSystem {
             
             map(self:acPort, system:acPort);
@@ -308,7 +309,7 @@ module LibItsSremSsem_Functions {
             f_initialiseSecuredMode(p_certificateId); 
             
             //Initialze the IUT
-            f_prInitialState();
+            f_prInitialState(p_iutCertificateId);
             
         } // End of f_cfUp
         

ttcn/SremSsem/LibItsSremSsem_TestSystem.ttcn

@@ -116,7 +116,7 @@ module LibItsSremSsem_TestSystem {
             UInt32      its_aid optional
         }
         with {
-            encode (msgIn) "PER"
+            encode (msgIn) "LibItsSremSsem_asn1"
         }
         
         type record of SremInd SremInds;

ttcn/SremSsem/LibItsSremSsem_TypesAndValues.ttcn

@@ -92,7 +92,7 @@ module LibItsSremSsem_TypesAndValues {
       type record UtSremEventInd {
         SREM sreMsg
       } with {
-        encode (sreMsg) "LibItsSremSsem_asn1"
+        encode (sreMsg) "PER"
       }
       
       /**
@@ -101,7 +101,7 @@ module LibItsSremSsem_TypesAndValues {
       type record UtSsemEventInd {
         SSEM sseMsg
       } with {
-        encode (sseMsg) "LibItsSremSsem_asn1"
+        encode (sseMsg) "PER"
       }
       
       /**