Remove PICS_RSU

IS PICS reviews
Remove some TODOs

ttcn/IVIM/LibItsIvim_Functions.ttcn

@@ -357,7 +357,7 @@ module LibItsIvim_Functions {
          * @desc The default postamble.
          */
         function f_poDefault() runs on ItsIvim {
-            // Nothing TODO
+            // Nothing to do
         }
         
         /**

ttcn/IVIM/LibItsIvim_Pics.ttcn

@@ -11,52 +11,53 @@
  */
 module LibItsIvim_Pics {
     
+    /**
+     * @desc Is the IUT running in secured mode?
+     * @see  ETSI TS 103 191-1 Table A.1
+     */
+    modulepar boolean PICS_IS_IUT_SECURED := false;
+    
     /**
      * @desc Support for IVIM generation
-     * @see  ETSI TS 103 191-1 Table 3
+     * @see  ETSI TS 103 191-1 Table A.3
      */
     modulepar boolean PICS_IVIM_GENERATION := true;
 
     /**
      * @desc Support for IVIM update
-     * @see  ETSI TS 103 191-1 Table 3
+     * @see  ETSI TS 103 191-1 Table A.3
      */
     modulepar boolean PICS_IVIM_UPDATE := true;
 
     /**
      * @desc Support for IVIM cancellation
-     * @see  ETSI TS 103 191-1 Table 3
+     * @see  ETSI TS 103 191-1 Table A.3
      */
     modulepar boolean PICS_IVIM_CANCELLATION := true;
 
     /**
      * @desc Support for IVIM NEGATION
-     * @see  ETSI TS 103 191-1 Table 3
+     * @see  ETSI TS 103 191-1 Table A.3
      */
     modulepar boolean PICS_IVIM_NEGATION := true;
 
     /**
      * @desc Support for IVIM RECEPTION
-     * @see  ETSI TS 103 191-1 Table 3
+     * @see  ETSI TS 103 191-1 Table A.3
      */
     modulepar boolean PICS_IVIM_RECEPTION := true;
 
-    /**
-     * @desc Is the IUT running in secured mode?
-     */
-    modulepar boolean PICS_IS_IUT_SECURED := false;
-    
     /**
      * @desc Minimum time interval between IVIM generations (in seconds).
      *       Default value, as per base standard: 4s 
-     * @see  ???
+     * @see  ETSI TS 103 191-1 Table A.4
      */
     modulepar float PICS_T_GENIVIMMIN := 4.0;
     
     /**
      * @desc Maximum time interval between IVIM generations (in seconds).
      *       Default value, as per base standard: 10.0s 
-     * @see  ???
+     * @see  ETSI TS 103 191-1 Table A.4
      */
     modulepar float PICS_T_GENIVIMMAX := 10.000;
     

ttcn/IVIM/LibItsIvim_Pixits.ttcn

@@ -19,7 +19,7 @@ module LibItsIvim_Pixits {
      * @desc IUT Provider identifier
      *       Provider description used in IVIM messages sent by the tester
      */
-    modulepar Provider PX_PROVIDER := { // TODO To be moved in LibItsCommon_Pixits?
+    modulepar Provider PX_PROVIDER := { 
         countryCode         := '0000000000'B,
         providerIdentifier  := 0
     }

ttcn/IVIM/LibItsIvim_Templates.ttcn

@@ -462,8 +462,6 @@ module LibItsIvim_Templates {
             rcc := p_rcc
         } // End of template mw_iviContainer_roadConfigurationContainer
         
-        // TODO Add the other IviContainer fields if needed
-        
     } // End of group iviContainerGroup
     
     group geographicLocationContainerGroup {

ttcn/MapemSpatem/LibItsMapemSpatem_Functions.ttcn

@@ -24,6 +24,7 @@ module LibItsMapemSpatem_Functions {
     import from LibItsCommon_TypesAndValues all;
     import from LibItsCommon_Templates all;
     import from LibItsCommon_Functions all;
+    import from LibItsCommon_Pixits all;
     
     // LibItsMapemSpatem
     import from LibItsMapemSpatem_TestSystem all;

ttcn/MapemSpatem/LibItsMapemSpatem_Pics.ttcn

@@ -14,38 +14,34 @@ module LibItsMapemSpatem_Pics {
     // LibCommon
     import from LibCommon_BasicTypesAndValues all;
     
+    /**
+     * @desc Is the IUT running in secured mode?
+     * @see  ETSI TS 103 191-1 Table A.1
+     */
+    modulepar boolean PICS_IS_IUT_SECURED := false;
+    
     /**
      * @desc Support for MAPEM generation
-     * @see  ETSI TS 102 868-2 Table 3
+     * @see  ETSI TS 103 191-1 Table A.2
      */
     modulepar boolean PICS_MAPEM_GENERATION := true;
 
     /**
      * @desc Support for MAPEM reception
-     * @see  ETSI TS 102 868-2 Table 3
+     * @see  ETSI TS 103 191-1 Table A.2
      */
     modulepar boolean PICS_MAPEM_RECEPTION := true;
     
     /**
      * @desc Support for SPATEM generation
-     * @see  ETSI TS 102 868-2 Table 3
+     * @see  ETSI TS 103 191-1 Table A.2
      */
     modulepar boolean PICS_SPATEM_GENERATION := true;
 
     /**
      * @desc Support for SPATEM reception
-     * @see  ETSI TS 102 868-2 Table 3
+     * @see  ETSI TS 103 191-1 Table A.2
      */
     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?
-     */
-    modulepar boolean PICS_IS_IUT_SECURED := false;
-    
 } // end LibItsSremSsem_Pics

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

@@ -676,7 +676,7 @@ module LibItsMapemSpatem_Templates {
                 template (present) SPAT mw_spatem_with_region_id(
                                                                  template (present) SPAT.regional p_regional := ?
                 ) modifies mw_defaultSpatem := {
-                    regional       := p_regional // TODO Try to refined it
+                    regional       := p_regional 
                 }
                 
             } // End of group spatemTemplates

ttcn/SremSsem/LibItsSremSsem_Pics.ttcn

@@ -14,26 +14,33 @@ module LibItsSremSsem_Pics {
     // LibCommon
     import from LibCommon_BasicTypesAndValues all;
     
+    /**
+     * @desc Is the IUT running in secured mode?
+     * @see  ETSI TS 103 191-1 Table A.1
+     */
+    modulepar boolean PICS_IS_IUT_SECURED := false;
+    
     /**
      * @desc Support for SREM generation
-     * @see  ETSI TS 102 868-2 Table 3
+     * @see  ETSI TS 103 191-1 Table A.5
      */
     modulepar boolean PICS_SREM_GENERATION := true;
 
     /**
      * @desc Support for SREM reception
-     * @see  ETSI TS 102 868-2 Table 3
+     * @see  ETSI TS 103 191-1 Table A.5
      */
     modulepar boolean PICS_SREM_RECEPTION := true;
     
     /**
-     * @desc Is the IUT running in secured mode?
+     * @desc Support for SSEM generation
+     * @see  ETSI TS 103 191-1 Table A.5
      */
-    modulepar boolean PICS_IS_IUT_SECURED := false;
-    
+    modulepar boolean PICS_SSEM_GENERATION := true;
+
     /**
      * @desc Support for SSEM reception
-     * @see  ETSI TS 102 868-2 Table 3
+     * @see  ETSI TS 103 191-1 Table A.5
      */
     modulepar boolean PICS_SSEM_RECEPTION := true;
 

ttcn/SremSsem/LibItsSremSsem_Templates.ttcn

@@ -532,22 +532,26 @@ module LibItsSremSsem_Templates {
             /**
              * @desc    Receive template for SSEM Message
              */
-            template (present) SignalStatusMessage mw_defaultSsem := {
+            template (present) SignalStatusMessage mw_defaultSsem(
+                                                                  template MsgCount p_sequenceNumber := *
+            ) := {
                 timeStamp       := *,
                 second          := ?,
-                sequenceNumber  := *,
+                sequenceNumber  := p_sequenceNumber,
                 status          := ?,
                 regional       := *
             }
             
-            template (present) SignalStatusMessage mw_ssemWellFormatted 
-            modifies mw_defaultSsem := {
+            template (present) SignalStatusMessage mw_ssemWellFormatted(
+                                                                        template MsgCount p_sequenceNumber := *
+            ) modifies mw_defaultSsem := {
             }
             
             template (present) SignalStatusMessage mw_ssem_with_region_id(
-                                                             template (present) SignalStatusMessage.regional p_regional := ?
+                                                                          template MsgCount p_sequenceNumber := *,
+                                                                          template (present) SignalStatusMessage.regional p_regional := ?
             ) modifies mw_defaultSsem := {
-                regional       := p_regional // TODO Try to refined it
+                regional       := p_regional 
             }
             
         } // End of group ssemTemplates