TITANISATION: UT and AC messages (Common, CAM, DENM, BTP)

ttcn/BTP/LibItsBtp_Functions.ttcn

@@ -41,7 +41,9 @@
             utPort.send(p_init);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtInitializeResult:true) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+//                [] utPort.receive(UtInitializeResult:true) {
+                [] utPort.receive(UtCommonResults:{utInitializeResult:=true}) {
                     tc_wait.stop;
                     log("*** f_utInitializeIut: INFO: IUT initialized ***");
                 }

ttcn/BTP/LibItsBtp_TestSystem.ttcn

@@ -29,7 +29,9 @@ module LibItsBtp_TestSystem {
             out 
                 UtInitialize, UtBtpTrigger;
             in 
-                UtInitializeResult, UtBtpTriggerResult, UtBtpEventInd;
+//FIXME RGY!!! As discussed, list of booleans is changed by a top-level union type
+//                UtInitializeResult, UtBtpTriggerResult, UtBtpEventInd;
+                  UtCommonResults, UtBtpTriggerResult, UtBtpEventInd;
         } // end UpperTesterPort
         
     } // end portDefinitions

ttcn/BTP/LibItsBtp_TypesAndValues.ttcn

@@ -145,7 +145,12 @@ module LibItsBtp_TypesAndValues {
                 GenerateBtpB btpB
             }
     
-            type boolean UtBtpTriggerResult;
+//FIXME RGY As discussed, boolean results are replaced by a union of the results
+//            type boolean UtBtpTriggerResult;
+            type union UtBtpResults {
+              boolean utBtpTriggerResult
+            }
+            type UtBtpResults.utBtpTriggerResult UtBtpTriggerResult;
             
             /**
              * @desc Upper Tester message to request triggering of an BTPA message at IUT 

ttcn/CAM/LibItsCam_Functions.ttcn

@@ -49,7 +49,9 @@ module LibItsCam_Functions {
             utPort.send(p_init);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtInitializeResult:true) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+//                [] utPort.receive(UtInitializeResult:true) {
+                [] utPort.receive(UtCommonResults:{utInitializeResult:=true}) {
                     tc_wait.stop;
                     log("*** f_utInitializeIut: INFO: IUT initialized ***");
                 }
@@ -81,7 +83,9 @@ module LibItsCam_Functions {
             utPort.send(p_event);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtCamTriggerResult:true) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type 
+//                [] utPort.receive(UtCamTriggerResult:true) {
+                [] utPort.receive(UpperTesterCamResults:{utCamTriggerResult:=true}) {
                     tc_wait.stop;
                 }
                 [] utPort.receive {
@@ -107,7 +111,9 @@ module LibItsCam_Functions {
             
             utPort.send(p_position);
             alt {
-                [] utPort.receive(UtChangePositionResult:?) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type 
+//                [] utPort.receive(UtChangePositionResult:?) {
+                [] utPort.receive(UtCommonResults:{utChangePositionResult:=?}) {
                     tc_wait.stop;
                 }
                 [] utPort.receive {

ttcn/CAM/LibItsCam_TestSystem.ttcn

@@ -37,7 +37,9 @@ module LibItsCam_TestSystem {
             out
                 AcGnssPrimitive, AcSecPrimitive;
             in
-                AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+//FIXME RGY As discussed, list of boolean result responses is collected into a top-level union
+//                AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+                AdapterControlResults;
         } // end AdapterControlPort
         
         /**
@@ -47,7 +49,9 @@ module LibItsCam_TestSystem {
             out 
                 UtInitialize, UtCamTrigger, UtChangePosition, UtActivatePositionTime, UtDeactivatePositionTime;
             in 
-                UtInitializeResult, UtCamTriggerResult, UtChangePositionResult, UtActivatePositionTimeResult, UtDeactivatePositionTimeResult, UtCamEventInd;
+//FIXME RGY As discussed, list of boolean result responses is collected into a top-level union
+//                UtInitializeResult, UtCamTriggerResult, UtChangePositionResult, UtActivatePositionTimeResult, UtDeactivatePositionTimeResult, UtCamEventInd;
+                UtCommonResults, UpperTesterCamResults, UtCamEventInd;
         } // end UpperTesterPort
         
     } // end portDefinitions

ttcn/CAM/LibItsCam_TypesAndValues.ttcn

@@ -104,7 +104,13 @@ module LibItsCam_TypesAndValues {
         /**
          * @desc Upper Tester result message of request of triggering of an event at IUT 
          */        
-        type boolean UtCamTriggerResult;
+//FIXME RGY As discussed, simple boolean responses are collected to a union for forward compatibility
+//        type boolean UtCamTriggerResult;
+          type union UpperTesterCamResults {
+            boolean utCamTriggerResult
+          }
+          
+          type UpperTesterCamResults.utCamTriggerResult UtCamTriggerResult;
         
         /**
          * @desc Upper Tester message to check event/status on CAM IUT 

ttcn/Common/LibItsCommon_Templates.ttcn

@@ -18,7 +18,9 @@ module LibItsCommon_Templates {
     
     group taPrimitives {
         
-        template (value) AcSecResponse m_acSecResponseSuccess := true;
+//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};
         
         /**
          * @desc Enable security support
@@ -42,9 +44,13 @@ module LibItsCommon_Templates {
             }
         } // End of template m_acDisableSecurity
         
-        template AcGnssResponse m_acGnssResponseSuccess := true;
-        
-        template AcGnssDistanceCovered m_acGnssDistanceCovered := true;
+//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};
         
         /**
          * @desc Testsystem will load GNSS scenario

ttcn/Common/LibItsCommon_TypesAndValues.ttcn

@@ -30,7 +30,19 @@ module LibItsCommon_TypesAndValues {
         /**
          * @desc Upper Tester result message of the initialization request 
          */
-        type boolean UtInitializeResult;
+//FIXME RGY As discussed, Commom top level type for UT results
+        type union UtCommonResults {
+          boolean utInitializeResult,
+          boolean utChangePositionResult,
+          boolean utChangePseudonymResult,
+          boolean utActivatePositionTimeResult,
+          boolean utDeactivatePositionTimeResult,
+          boolean utIvimTerminationResult
+        } 
+
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes   
+//        type boolean UtInitializeResult;
+        type UtCommonResults.utInitializeResult UtInitializeResult;
         
         /**
          * @desc Upper Tester message to change the position of IUT. Values a relatives 
@@ -44,7 +56,9 @@ module LibItsCommon_TypesAndValues {
         /**
          * @desc Upper Tester result message of change position request of IUT 
          */
-        type boolean UtChangePositionResult;
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes   
+//        type boolean UtChangePositionResult;
+        type UtCommonResults.utChangePositionResult UtChangePositionResult;
         
         /**
          * @desc Upper Tester message to change the pseudonym of the DENM IUT 
@@ -56,7 +70,9 @@ module LibItsCommon_TypesAndValues {
         /**
          * @desc Upper Tester result message of the change pseudonym request 
          */
-        type boolean UtChangePseudonymResult;
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes   
+//        type boolean UtChangePseudonymResult;
+        type UtCommonResults.utChangePseudonymResult UtChangePseudonymResult;
         
         /**
          * @desc Upper Tester message to activate position and/or time
@@ -68,7 +84,9 @@ module LibItsCommon_TypesAndValues {
         /**
          * @desc Upper Tester result message of the activate position and/or time request 
          */
-        type boolean UtActivatePositionTimeResult;
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes   
+//        type boolean UtActivatePositionTimeResult;
+        type UtCommonResults.utActivatePositionTimeResult UtActivatePositionTimeResult;
         
         /**
          * @desc Upper Tester message to deactivate position and/or time
@@ -80,7 +98,9 @@ module LibItsCommon_TypesAndValues {
         /**
          * @desc Upper Tester result message of the deactivate position and/or time request 
          */
-        type boolean UtDeactivatePositionTimeResult;
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes   
+//        type boolean UtDeactivatePositionTimeResult;
+        type UtCommonResults.utDeactivatePositionTimeResult UtDeactivatePositionTimeResult;
         
     }
     with {
@@ -118,7 +138,9 @@ module LibItsCommon_TypesAndValues {
         /**
          * @desc    Primitive for receiving response from TA
          */
-        type boolean AcSecResponse;
+//FIXME RGY As discussed, type is changed to a type derived from AdapterControlResults   
+//        type boolean AcSecResponse;
+        type AdapterControlResults.acSecResponse AcSecResponse;
         
         /**
          * @desc    TA primitives for GNSS
@@ -139,12 +161,23 @@ module LibItsCommon_TypesAndValues {
         /**
          * @desc    Primitive for receiving response from TA
          */
-        type boolean AcGnssResponse;
+//FIXME RGY As discussed, Commom adapter control results are collected to a top-level union type
+        type union AdapterControlResults {
+          boolean acGnssResponse,
+          boolean acGnssDistanceCovered,
+          boolean acSecResponse
+        }
+        
+//FIXME RGY As discussed, boolean results are replaced by related fields of the top-level reult union
+//        type boolean AcGnssResponse;
+        type AdapterControlResults.acGnssResponse AcGnssResponse;
         
         /**
          * @desc    Primitive for receiving an indication if requested distance was covered from TA
          */
-        type boolean AcGnssDistanceCovered;
+//FIXME RGY As discussed, boolean results are replaced by related fields of the top-level reult union
+//        type boolean AcGnssDistanceCovered;
+        type AdapterControlResults.acGnssDistanceCovered AcGnssDistanceCovered;
         
         /**
          * @desc    Primitive for loading a scenario

ttcn/DENM/LibItsDenm_Functions.ttcn

@@ -47,7 +47,9 @@ module LibItsDenm_Functions {
             utPort.send(p_init);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtInitializeResult:true) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type 
+//                [] utPort.receive(UtInitializeResult:true) {
+                [] utPort.receive(UtCommonResults:{utInitializeResult:=true}) {
                     tc_wait.stop;
                     log("*** " & testcasename() & ": INFO: IUT initialized ***");
                 }
@@ -77,11 +79,15 @@ module LibItsDenm_Functions {
             utPort.send(p_change);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtChangePseudonymResult:true) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type 
+//                [] utPort.receive(UtChangePseudonymResult:true) {
+                [] utPort.receive(UtCommonResults:{utChangePseudonymResult:=true}) {
                     tc_wait.stop;
                     log("*** " & testcasename() & ": INFO: IUT pseudonym changed ***");
                 }
-                [] utPort.receive(UtChangePseudonymResult:false) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type 
+//                [] utPort.receive(UtChangePseudonymResult:false) {
+                [] utPort.receive(UtCommonResults:{utChangePseudonymResult:=false}) {
                     tc_wait.stop;
                     log("*** " & testcasename() & ": INFO: IUT pseudonym changed ***");
                     f_selfOrClientSyncAndVerdict("error", e_error);
@@ -181,7 +187,9 @@ module LibItsDenm_Functions {
             utPort.send(p_event);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtDenmTerminationResult:?) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type 
+//                [] utPort.receive(UtDenmTerminationResult:?) {
+                [] utPort.receive(UtDENMResults:{utDenmTerminationResult:=?}) {
                     tc_wait.stop;
                 }
                 [] tc_wait.timeout {
@@ -212,7 +220,9 @@ module LibItsDenm_Functions {
             utPort.send(p_position);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtChangePositionResult:?) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type 
+//                [] utPort.receive(UtChangePositionResult:?) {
+                [] utPort.receive(UtCommonResults:{utChangePositionResult:=?}) {
                     tc_wait.stop;
                 }
                 [] tc_wait.timeout {

ttcn/DENM/LibItsDenm_Templates.ttcn

@@ -583,7 +583,9 @@ module LibItsDenm_Templates {
             eventPosition := ?,
             relevanceDistance := *,
             relevanceTrafficDirection := *,
-            validityDuration := *, // It seems that a default value can be omitted (asn1studio)
+//FIXME (DF) validityDuration is set as mandatory, '*' can not be assigned to it
+//            validityDuration := *, // It seems that a default value can be omitted (asn1studio)
+            validityDuration := ?, // It seems that a default value can be omitted (asn1studio)
             transmissionInterval := *,
             stationType    := ?
         }
@@ -710,7 +712,9 @@ module LibItsDenm_Templates {
                             deltaLongitude := 0,
                             deltaAltitude := 0
                         },
-                        pathDeltaTime := 0
+//FIXME (DF) pathDeltaTime == 0 is not compatible with PathDeltaTime range definition
+//                        pathDeltaTime := 0
+                        pathDeltaTime := 1
                     }
                 }
             },

ttcn/DENM/LibItsDenm_TestSystem.ttcn

@@ -37,7 +37,9 @@ module LibItsDenm_TestSystem {
             out
                 AcGnssPrimitive, AcSecPrimitive;
             in
-                AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+//FIXME RGY!!! As discussed, list of booleans is changed by a top-level union type
+//                AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+                AdapterControlResults
         } // end AdapterControlPort
         
         /**
@@ -47,8 +49,11 @@ module LibItsDenm_TestSystem {
             out 
                 UtInitialize, UtDenmTrigger, UtDenmUpdate, UtDenmTermination, UtChangePosition, UtChangePseudonym;
             in 
-                UtInitializeResult, UtDenmTriggerResult, UtDenmUpdateResult, UtDenmTerminationResult,
-                UtChangePositionResult, UtChangePseudonymResult, UtDenmEventInd;
+//FIXME RGY! As discussed, list of booleans is changed by a top-level union type
+//                UtInitializeResult, UtDenmTriggerResult, UtDenmUpdateResult, UtDenmTerminationResult,
+//                UtChangePositionResult, UtChangePseudonymResult, UtDenmEventInd;
+                UtCommonResults, UtDENMResults, UtDenmTriggerResult,
+                UtDenmUpdateResult, UtDenmEventInd;
         } // end UpperTesterPort
         
     } // end portDefinitions

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

@@ -117,11 +117,20 @@ module LibItsDenm_TypesAndValues {
             ActionID actionId
         }
         
+//FIXME RGY As discussed, boolean result types are replaced by a top-level union of the results
         /**
-         * @desc Upper Tester result message of termination of an event on DENM IUT 
+         * @desc Upper Tester response message for all DENM results 
          */
-        type boolean UtDenmTerminationResult;
+          type union UtDENMResults {
+              boolean utDenmTerminationResult
+            }
         
+        /**
+         * @desc Upper Tester result message of termination of an event on DENM IUT 
+         */
+//FIXME RGY As discussed, boolean result types are replaced by a top-level union type
+//        type boolean UtDenmTerminationResult;
+        type UtDENMResults.utDenmTerminationResult UtDenmTerminationResult;
         /**
          * @desc Upper Tester message to check event/status on DENM IUT 
          */

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

@@ -1008,7 +1008,9 @@ module LibItsGeoNetworking_TypesAndValues {
         
     } // end utPrimitives
     with {
-        encode "UpperTester"
+//FIXME RGY temporarily changed to RAW, until encoding functions are changed to UpperTester
+//        encode "UpperTester"
+        encode "RAW"; variant ""
     }
     
     group acPrimitives {