Add TestControl modules

ttcn/IVIM/LibItsIvim_Functions.ttcn

@@ -438,7 +438,10 @@ module LibItsIvim_Functions {
          * @param p_rcvMsg The expected message to be received.
          * @param p_rcvdMsg The received message - OUT.
          */
-        function f_awaitIviMessage(in template (present) IvimInd p_rcvMsg, out IvimInd p_rcvdMsg) runs on ItsIvim {
+        function f_awaitIviMessage(
+                                   in template (present) IvimInd p_rcvMsg, 
+                                   out IvimInd p_rcvdMsg
+        ) runs on ItsIvim {
             
             tc_ac.start;
             alt {
@@ -449,7 +452,7 @@ module LibItsIvim_Functions {
                     log("*** " & testcasename() & ": INFO: Timeout while awaiting the reception of a message ***");
                     f_selfOrClientSyncAndVerdict("error", e_timeout);
                 }
-            }            
+            }
         }
         
     } // End of group receiveFunctions
@@ -462,7 +465,9 @@ module LibItsIvim_Functions {
          * @param p_iviIdentificationNumber The IviIdentification number to increase.
          * @return The increased IviIdentification number.
          */
-        function f_increaseIviIdentificationNumber(in IviIdentificationNumber p_iviIdentificationNumber) return IviIdentificationNumber {
+        function f_increaseIviIdentificationNumber(
+                                                   in IviIdentificationNumber p_iviIdentificationNumber
+        ) return IviIdentificationNumber {
             // if maximum number of 32768 reached, reset it to 0
             return ((p_iviIdentificationNumber + 1) mod 32768);
         }

ttcn/IVIM/LibItsIvim_Pics.ttcn

@@ -7,12 +7,6 @@
  */
 module LibItsIvim_Pics {
     
-    /**
-     * @desc Does the IUT act as Road Side Unit? 
-     * @see  ETSI TS 103 191-1 Table 3
-     */
-    modulepar boolean PICS_RSU_ROLE := true;
-    
     /**
      * @desc Support for IVIM generation
      * @see  ETSI TS 103 191-1 Table 3

ttcn/MapemSpatem/LibItsMapemSpatem_Pics.ttcn

@@ -34,11 +34,6 @@ module LibItsMapemSpatem_Pics {
      */
     modulepar boolean PICS_SPATEM_RECEPTION := true;
     
-    /**
-     * @desc Is IUT an RSU  
-     */
-    modulepar boolean PICS_RSU := true;
-    
     /**
      * @desc Is the IUT running in secured mode?
      */

ttcn/SremSsem/LibItsSremSsem_Functions.ttcn

@@ -239,4 +239,47 @@ module LibItsSremSsem_Functions {
         
     } // End of group sendFunctions
     
+    group receiveFunctions {
+        
+        /**
+         * @desc Awaits a SREM and returns it
+         * @param p_rcvMsg The expected message to be received.
+         * @param p_rcvdMsg The received message - OUT.
+         */
+        function f_awaitSreMessage(
+                                   in template (present) SremInd p_rcvMsg, 
+                                   out SremInd p_rcvdMsg
+        ) runs on ItsSremSsem {
+            
+            tc_ac.start;
+            alt {
+                [] sremSsemPort.receive(p_rcvMsg) -> value p_rcvdMsg {
+                    tc_ac.stop;
+                }
+                [] tc_ac.timeout {
+                    log("*** " & testcasename() & ": INFO: Timeout while awaiting the reception of a message ***");
+                    f_selfOrClientSyncAndVerdict("error", e_timeout);
+                }
+            }
+        }
+        
+    } // End of group receiveFunctions
+    
+    group miscellaneousFunctions {
+        
+        /**
+         * @desc Increases the RequestID number and handles the special case where the 
+         *       SremIdentification number reaches the limit of 32768 and will be reset to 0.
+         * @param p_requestID The RequestID number to increase.
+         * @return The increased RequestID number.
+         */
+        function f_increaseRequestID(
+                                     in RequestID p_requestID
+        ) return RequestID {
+            // if maximum number of 256 reached, reset it to 0
+            return ((p_requestID + 1) mod 256);
+        }
+        
+    } // End of group miscellaneousFunctions
+    
 } // End of module LibItsSremSsem_Functions
\ No newline at end of file

ttcn/SremSsem/LibItsSremSsem_Pics.ttcn

@@ -5,7 +5,7 @@
  *    @desc     SREM SSEM PICS
  *
  */
-module LibItsMapemSpatem_Pics {
+module LibItsSremSsem_Pics {
     
     // LibCommon
     import from LibCommon_BasicTypesAndValues all;

ttcn/SremSsem/LibItsSremSsem_TestSystem.ttcn

@@ -100,6 +100,8 @@ module LibItsSremSsem_TestSystem {
             encode (msgIn) "LibItsSremSsem_asn1"
         }
         
+        type record of SremInd SremInds;
+        
         type record SsemInd {
             SSEM        msgIn,
             UInt8       gnNextHeader optional,

ttcn/SremSsem/LibItsSremSsem_TypesAndValues.ttcn

@@ -15,7 +15,7 @@ module LibItsSremSsem_TypesAndValues {
     import from ITS_Container language "ASN.1:1997" all;
     import from SREM_PDU_Descriptions language "ASN.1:1997" all;
     import from SSEM_PDU_Descriptions language "ASN.1:1997" all;
-    import from EfcDsrcGeneric language "ASN.1:1997" all;
+    import from DSRC language "ASN.1:1997" all;
     
     // LibItsCommon
     import from LibItsCommon_TypesAndValues all;
@@ -32,12 +32,15 @@ module LibItsSremSsem_TypesAndValues {
         type record UtSremSsemTrigger {
             Event    event
         }
+        
         type enumerated Event {
             ssemNewContent     (0),
             sremNewContent     (1),
             sremRepL10s        (2),
             sremRepG10s        (3)
         }
+        
+        type record of UtSremSsemTrigger UtSremSsemTriggerList;
         /**
          * @desc Upper Tester result message of request of triggering of an event at IUT 
          */
@@ -70,6 +73,9 @@ module LibItsSremSsem_TypesAndValues {
          * @desc List of Upper Tester messages to check event/status on MAPEM SPATEM IUT 
          */
         type record of UtSsemEventInd UtSsemEventIndList;
+        
+        type record of RequestID RequestIDList;
+        
     } with {
         encode "UpperTester"
     }