MAPEM/SPATEM TCs Review

ttcn/MapemSpatem/LibItsMapemSpatem_Pics.ttcn

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

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

@@ -380,9 +380,11 @@ module LibItsMapemSpatem_Templates {
             /**
              * @desc    Receive template for MAPEM Message with no LayerType
              */
-            template (present) MapData mw_mapemNoLayerType modifies mw_mapemWellFormatted := {
-                layerType         := omit,
-                layerID           := omit
+            template (present) MapData mw_mapemLayerType(
+                                                         in template (present) LayerID p_layerID := ?
+            ) modifies mw_mapemWellFormatted := {
+                layerType         := ?,
+                layerID           := p_layerID
             }
             
         } // End of group mapemTemplates 

ttcn/MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn

@@ -33,12 +33,13 @@ module LibItsMapemSpatem_TypesAndValues {
             Event    event
         }
         type enumerated Event {
-            startTLMService   (0),
-            stopTLMService    (1),
-            spatemNewContent    (2),
-            mapemNewContent     (3),
-            mapemRepL10s        (4),
-            mapemRepG10s        (5)
+            startTLMService                  (0),
+            stopTLMService                   (1),
+            spatemNewContent                 (2),
+            mapemNewContent                  (3),
+            mapemNewContentWithFragmentation (4),
+            mapemRepL10s                     (5),
+            mapemRepG10s                     (6)
         }
         /**
          * @desc Upper Tester result message of request of triggering of an event at IUT 

ttcn/SremSsem/LibItsSremSsem_Pics.ttcn

@@ -35,9 +35,9 @@ module LibItsSremSsem_Pics {
     modulepar boolean PICS_SSEM_RECEPTION := true;
     
     /**
-     * @desc Is IUT an RSU  
+     * @desc Is IUT acting as a RSU? 
      */
-    modulepar boolean PICS_RSU := true;
+    modulepar boolean PICS_RSU_ROLE := true;
     
     /**
      * @desc Is the IUT running in secured mode?