Review IVIM, MAPEM/SPATEM and SREM/SSEM

ttcn/IVIM/LibItsIvim_EncdecDeclarations.ttcn

@@ -3,7 +3,42 @@ module LibItsIvim_EncdecDeclarations {
     // LibIts
     import from IVIM_PDU_Descriptions all;
     
+    // LibItsIvim
+    import from LibItsIvim_TypesAndValues all; 
+    import from LibItsIvim_TestSystem all; 
+
+    external function fx_enc_IvimReq (IvimReq p) return bitstring
+        with {extension "prototype(convert) encode(LibIts_Interface)"}
+    
+    external function fx_dec_IvimReq (inout bitstring b, out IvimReq p) return integer
+        with {extension "prototype(sliding) decode(LibIts_Interface)"}
+
+    external function fx_dec_IvimInd (inout bitstring b, out IvimInd p) return integer
+        with {extension "prototype(sliding) decode(LibIts_Interface)"}
+        
+    external function fx_enc_IVIM (IVIM p) return bitstring
+        with {extension "prototype(convert) encode(PER)"}
+
+    external function fx_dec_IVIM (inout bitstring b, out IVIM p) return integer
+        with {extension "prototype(sliding) decode(PER)"}
+/*
     external function fx_enc_IVIM (IVIM p) return octetstring
         with {extension "prototype(convert) encode(BER:BER_ENCODE_CER)"}
+*/
+
+    external function fx_enc_UtIvimInitialize (UtIvimInitialize p) return bitstring
+        with {extension "prototype(convert) encode(UpperTester)"}
+    
+    external function fx_enc_UtIvimChangePosition (UtIvimChangePosition p) return bitstring
+        with {extension "prototype(convert) encode(UpperTester)"}
+    
+    external function fx_enc_UtIvimTrigger (UtIvimTrigger p) return bitstring
+        with {extension "prototype(convert) encode(UpperTester)"}
+    
+    external function fx_dec_UtIvimResults (inout bitstring b, out UtIvimResults p) return integer
+        with {extension "prototype(sliding) decode(UpperTester)"}
+    
+    external function fx_dec_UtIvimEventInd (inout bitstring b, out UtIvimEventInd p) return integer
+        with {extension "prototype(sliding) decode(UpperTester)"}
     
-}
+} // End of module LibItsIvim_EncdecDeclarations

ttcn/IVIM/LibItsIvim_Templates.ttcn

@@ -207,8 +207,8 @@ module LibItsIvim_Templates {
          */
         template (value) ItsPduHeader m_itsPduHeader(
                                                      template (value) StationID p_stationID := f_getTsStationId(),
-                                                     template (value) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
-                                                     template (value) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_ivim_
+                                                     template (value) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
+                                                     template (value) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_ivim_
         ) := {
             protocolVersion := p_protocolVersion,
             messageID       := p_messageID,
@@ -223,8 +223,8 @@ module LibItsIvim_Templates {
          */
         template ItsPduHeader mw_itsPduHeader(
                                               template (present) StationID p_stationID := ?,
-                                              template (present) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
-                                              template (present) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_ivim_
+                                              template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
+                                              template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_ivim_
         ) := {
             protocolVersion := p_protocolVersion,
             messageID       := p_messageID,
@@ -271,8 +271,8 @@ module LibItsIvim_Templates {
         template (present) IVIM mw_ivimPdu(
                                            template (present) IviStructure p_ivim,
                                            template (present) StationID p_stationID := ?,
-                                           template (present) ItsPduHeader.protocolVersion p_protocolVersion := ItsPduHeader_protocolVersion_currentVersion_,
-                                           template (present) ItsPduHeader.messageID p_messageID := ItsPduHeader_messageID_ivim_
+                                           template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
+                                           template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_ivim_
         ) := {
             header  := mw_itsPduHeader(p_stationID, p_protocolVersion, p_messageID),
             ivi     := p_ivim
@@ -315,7 +315,7 @@ module LibItsIvim_Templates {
         template (value) IviStructure m_ivimStructureCancellation(
                                                                   in template (value) IviIdentificationNumber p_iviIdentificationNumber
         ) := {
-            mandatory   := valueof(m_iviManagementContainer(f_getProvider(), valueof(p_iviIdentificationNumber), IviStatus_cancellation_)), 
+            mandatory   := valueof(m_iviManagementContainer(f_getProvider(), valueof(p_iviIdentificationNumber), LibItsIvim_ASN1_IVInamedNumbers.IviStatus_cancellation_)), 
             optional_   := omit
         } // End of template m_ivimStructureCancellation
         

ttcn/IVIM/LibItsIvim_TestSystem.ttcn

@@ -35,7 +35,7 @@ module LibItsIvim_TestSystem {
          */
         type port AdapterControlPort message {
             out
-                AcSecPrimitive;
+                AcGnssPrimitive, AcSecPrimitive;
             in
                 AdapterControlResults;
         } // end AdapterControlPort

ttcn/MapemSpatem/LibItsMapemSpatem_Functions.ttcn

@@ -66,17 +66,16 @@ module LibItsMapemSpatem_Functions {
         function f_utTriggerEvent(
                                   in template (value) UtMapemSpatemTrigger p_event
         ) runs on ItsMapemSpatem {
-            var UtMapemSpatemTriggerResult v_result;
             
             utPort.send ( p_event );
             tc_wait.start;
             alt {
-              [] utPort.receive ( UtMapemSpatemResults: { utMapemSpatemTriggerResult := ? }) -> value v_result {
+              [] utPort.receive ( UtMapemSpatemResults: { utMapemSpatemTriggerResult := true }) {
                     tc_wait.stop;
-                    if ( not v_result ) {
-                        f_selfOrClientSyncAndVerdict("MapSpat Trigger failed", e_error);
-                    }
-                        
+                }
+              [] utPort.receive ( UtMapemSpatemResults: { utMapemSpatemTriggerResult := false }) {
+                    tc_wait.stop;
+                    f_selfOrClientSyncAndVerdict("MapSpat Trigger failed", e_error);
                 }
                 [] tc_wait.timeout {
                     log("*** " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time ***");

ttcn/MapemSpatem/LibItsMapemSpatem_TestSystem.ttcn

@@ -39,7 +39,7 @@ module LibItsMapemSpatem_TestSystem {
             out
                 AcSecPrimitive;
             in
-                AcSecResponse;
+                AdapterControlResults;
         } // end AdapterControlPort
         
         /**

ttcn/MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn

@@ -44,9 +44,6 @@ module LibItsMapemSpatem_TypesAndValues {
      * @desc Upper Tester results message of the MAPEM/SPATEM IUT
      * @member utMapemSpatemInitialize             -
      * @member utMapemSpatemTriggerResult          -
-     * @member utMapemSpatemUpdateResult,          -
-     * @member utMapemSpatemChangePositionResult   -
-     * @member utMapemSpatemChangePseudonymResult      -
      */
     type union UtMapemSpatemResults {
       boolean utMapemSpatemInitializeResult,