titanization_libits.patch

                 }
                 case (e_polygon) {
-                    v_ret := f_isLocationInsidePolygonalRegion(p_region.region.polygonal_region, p_location);
+                    v_ret := f_isLocationInsidePolygonalRegion(valueof(p_region.region.polygonal_region), p_location);
                 }
                 case (e_id) {
-                    v_ret := f_isLocationInsideIdentifiedRegion(p_region.region.id_region, p_location);
+                    v_ret := f_isLocationInsideIdentifiedRegion(valueof(p_region.region.id_region), p_location);
                 }
                 case else {
-                    v_ret := f_isLocationInsideOtherRegion(p_region.region.other_region, p_location);
+                    v_ret := f_isLocationInsideOtherRegion(valueof(p_region.region.other_region), p_location);
                 }
             }
             
Index: Security/LibItsSecurity_Templates.ttcn3
===================================================================
--- Security/LibItsSecurity_Templates.ttcn3	(revision 1312)
+++ Security/LibItsSecurity_Templates.ttcn3	(working copy)
@@ -42,7 +42,9 @@
          * @desc Its AID for Other
          * @see Draft ETSI TS 103 097 V1.1.14 Clause 7.3 Security profile for DENMs
          */
-        const IntX c_its_aid_Other := PX_OTHER_ITS_AID;
+//FIXME RGY definition type is changed to modulepar, as Titan doesn't support dynamic constants
+//        const IntX c_its_aid_Other := PX_OTHER_ITS_AID;
+        template IntX c_its_aid_Other := PX_OTHER_ITS_AID;
         
         /**
          * @desc Minimal value of Longitude
@@ -2596,11 +2598,11 @@
         template (value) ToBeSignedCertificate m_toBeSignedCertificate(
                                                                        in template (value) Certificate p_certificate
         ) := {
-            version                 := p_certificate.version, 
-            signer_info             := p_certificate.signer_info,
-            subject_info            := p_certificate.subject_info,
-            subject_attributes      := p_certificate.subject_attributes,
-            validity_restrictions   := p_certificate.validity_restrictions
+            version                 := valueof(p_certificate.version), 
+            signer_info             := valueof(p_certificate.signer_info),
+            subject_info            := valueof(p_certificate.subject_info),
+            subject_attributes      := valueof(p_certificate.subject_attributes),
+            validity_restrictions   := valueof(p_certificate.validity_restrictions)
         } // End of template m_toBeSignedCertificate
         
     } // End of group profileCertificates
Index: SremSsem/LibItsSremSsem_Functions.ttcn
===================================================================
--- SremSsem/LibItsSremSsem_Functions.ttcn	(revision 1312)
+++ SremSsem/LibItsSremSsem_Functions.ttcn	(working copy)
@@ -18,7 +18,7 @@
     
     // LibIts
     import from ITS_Container language "ASN.1:1997" all;
-    import from DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
     
     // LibItsCommon
     import from LibItsCommon_TypesAndValues all;
@@ -256,9 +256,10 @@
          * @desc    Setups default configuration   
          * @param   p_certificateId The certificate identifier the TA shall use in case of secured IUT
          */
+//FIXME RGY Titan doesn't support mtc and system clauses yet
         function f_cfUp(
                         in charstring p_certificateId := PX_CERT_FOR_TS
-        )  runs on ItsSremSsem system ItsSremSsemSystem {
+        )  runs on ItsSremSsem /*system ItsSremSsemSystem*/ {
             
             map(self:acPort, system:acPort);
             map(self:utPort, system:utPort);
@@ -279,7 +280,8 @@
         /**
          * @desc    Deletes default configuration 
          */
-        function f_cfDown() runs on ItsSremSsem system ItsSremSsemSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+        function f_cfDown() runs on ItsSremSsem /*system ItsSremSsemSystem*/ {
             
             // Initialise secured mode
             f_uninitialiseSecuredMode();
Index: SremSsem/LibItsSremSsem_Pixits.ttcn
===================================================================
--- SremSsem/LibItsSremSsem_Pixits.ttcn	(revision 1312)
+++ SremSsem/LibItsSremSsem_Pixits.ttcn	(working copy)
@@ -16,7 +16,7 @@
     import from LibCommon_BasicTypesAndValues all;
     
     // LibIts
-    import from DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
     
     // LibItsSremSsem
     import from LibItsSremSsem_TypesAndValues all;
Index: SremSsem/LibItsSremSsem_Templates.ttcn
===================================================================
--- SremSsem/LibItsSremSsem_Templates.ttcn	(revision 1312)
+++ SremSsem/LibItsSremSsem_Templates.ttcn	(working copy)
@@ -19,11 +19,12 @@
     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 DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
     
     // LibItsCommon
     import from LibItsCommon_TypesAndValues all;
     import from LibItsCommon_Functions all;
+    import from LibItsCommon_ASN1_NamedNumbers all;
     
     // LibItsSremSsem
     import from LibItsSremSsem_TestSystem all;
@@ -91,7 +92,9 @@
          * @param   p_btpDestinationPort    BTP destination port value
          * @param   p_btpInfo               BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
          */
-        template SremInd mw_sremIndWithBtpParameters(
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+//        template SremInd mw_sremIndWithBtpParameters(
+        template(present) SremInd mw_sremIndWithBtpParameters(
                                                       template (present) SREM p_sremMsg,
                                                       in template UInt16 p_btpDestinationPort := *,
                                                       in template UInt16 p_btpInfo := *
@@ -140,6 +143,7 @@
             gnTrafficClass      := *,
             btpDestinationPort  := *,
             btpInfo             := *,
+            ssp                 := *,
             its_aid             := * 
         };
 
@@ -173,7 +177,9 @@
          * @param   p_btpDestinationPort    BTP destination port value
          * @param   p_btpInfo               BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
          */
-        template SsemInd mw_ssemIndWithBtpParameters(
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+//        template SsemInd mw_ssemIndWithBtpParameters(
+        template(present) SsemInd mw_ssemIndWithBtpParameters(
                                                      template (present) SSEM p_ssemMsg,
                                                      template UInt16 p_btpDestinationPort := *,
                                                      template UInt16 p_btpInfo := *
@@ -375,19 +381,21 @@
                     second          := PX_SECOND,
                     sequenceNumber  := omit,
                     requests        := { 
-                        m_signalRequestPackage(
-                            m_signalRequest(
-                                m_intersectionReferenceID,
-                                1,
-                                priorityRequestTypeReserved,
-                                { lane := 1 }
-                    )) },
-                    requestor       := m_requestorDescription(m_vehicleID(f_getIutStationId())),
+                        valueof(
+                            m_signalRequestPackage(
+                                valueof(
+                                    m_signalRequest(
+                                        m_intersectionReferenceID,
+                                        1,
+                                        priorityRequestTypeReserved,
+                                        { lane := 1 }
+                    )))) },
+                    requestor       := valueof(m_requestorDescription(m_vehicleID(f_getIutStationId()))),
                     regional        := omit
                 }
                 
                 template (value) SignalRequestPackage m_signalRequestPackage(
-                                                                            in template (value) SignalRequest p_request
+                                                                             in template (value) SignalRequest p_request
                 ) := {
                     request     := p_request,
                     minute      := omit,
Index: SremSsem/LibItsSremSsem_TestSystem.ttcn
===================================================================
--- SremSsem/LibItsSremSsem_TestSystem.ttcn	(revision 1312)
+++ SremSsem/LibItsSremSsem_TestSystem.ttcn	(working copy)
@@ -39,7 +39,9 @@
             out
                 AcSecPrimitive;
             in
-                AcSecResponse;
+//FIXME RGY as discussed booelan responses are replaced by union of responses
+//                AcSecResponse;
+                  AdapterControlResults
         } // end AdapterControlPort
         
         /**
@@ -49,7 +51,9 @@
             out 
                 UtInitialize, UtSremTrigger, UtSremUpdate;
             in 
-                UtInitializeResult, UtSremTriggerResult, UtSremUpdateResult, UtSremEventInd , UtSsemEventInd;
+//FIXME RGY as discussed, boolean results are replaced by union of booleans
+//                UtInitializeResult, UtSremTriggerResult, UtSremUpdateResult, UtSremEventInd , UtSsemEventInd;
+                UtCommonResults, UtSremResults, UtSremUpdateResult, UtSremEventInd , UtSsemEventInd;
         } // end UpperTesterPort
 
     } // end portDefinitions
Index: SremSsem/LibItsSremSsem_TypesAndValues.ttcn
===================================================================
--- SremSsem/LibItsSremSsem_TypesAndValues.ttcn	(revision 1312)
+++ SremSsem/LibItsSremSsem_TypesAndValues.ttcn	(working copy)
@@ -19,7 +19,7 @@
     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 DSRC language "ASN.1:1997" all;
+    import from IS_DSRC language "ASN.1:1997" all;
     
     // LibItsCommon
     import from LibItsCommon_TypesAndValues all;
@@ -42,7 +42,13 @@
         /**
          * @desc Upper Tester result message of request of triggering of an event at IUT 
          */
-        type boolean UtSremTriggerResult;
+//FIXME RGY as discussed, boolean results are replaced by unions
+        type union UtSremResults {
+          boolean utSremTriggerResult,
+          boolean utSremUpdateResult
+        }
+//        type UtSremResults.utSremTriggerResult UtSremTriggerResult;
+        type UtSremResults.utSremTriggerResult UtSremTriggerResult;
         
         /**
          * @desc Upper Tester message to request updating of an event at IUT 
@@ -55,7 +61,9 @@
         /**
          * @desc Upper Tester result message of request of triggering of an event at IUT 
          */
-        type boolean UtSremUpdateResult;
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes   
+//        type boolean UtSremUpdateResult;
+        type UtSremResults.utSremUpdateResult UtSremUpdateResult;
         
         /**
          * @desc Upper Tester message to check event/status at IUT 
Index: V2G/LibItsV2G_Templates.ttcn
===================================================================
--- V2G/LibItsV2G_Templates.ttcn	(revision 1312)
+++ V2G/LibItsV2G_Templates.ttcn	(working copy)
@@ -7,18 +7,22 @@
  */
 module LibItsV2G_Templates {
     
-    // LibCommon
-    import from LibCommon_BasicTypesAndValues all;
-    import from LibCommon_DataStrings all;
- 
-	// LibIts
+    // LibCommon
+    import from LibCommon_BasicTypesAndValues all;
+    import from LibCommon_DataStrings all;
+    
+    // LibItsCommon
+    import from LibItsCommon_ASN1_NamedNumbers all;
+    
+	// LibItsV2G
     import from LibItsV2G_TestSystem all;
     import from LibItsV2G_TypesAndValues all;
     import from LibItsV2G_Pixits all;
+    import from LibItsV2G_TypeAliases all;
     
     //XSD
-    import from iso_15118_2_2010_MsgDef all;
-    import from iso_15118_2_2010_MsgDataTypes all;
+    import from urn_iso_15118_2_2010_MsgDef all;
+    import from urn_iso_15118_2_2010_MsgDataTypes all;
         
     group v2gPrimitivesTemplates {
 
@@ -26,8 +30,8 @@
     
         group utPrimitives {
             
-            /**
-             * @desc Initializes the V2G IUT. 
+            /**
+             * @desc Initializes the V2G IUT. 
              */
             template (value) UtInitialize m_v2gInitialize := {
                 utV2Ginitialize := {
@@ -38,7 +42,9 @@
              * @desc Upper Tester template for checking that V2G payload has been transmitted to upper layer
              * @param p_payload Payload to be checked
              */
-            template (value) UtEvent m_checkPayload(in V2G_Message.Body p_body) := {
+//FIXME RGY by standard conversion all field names are lowercase
+//            template (value) UtEvent m_checkPayload(in V2G_Message.Body p_body) := {
+            template (value) UtEvent m_checkPayload(in V2G_Message.body p_body) := {
                 utV2Gevent := {
                     v2gBody := p_body
                 }
@@ -92,6 +98,7 @@
 		*/
 	   template V2G_Message mw_v2gMsg_sessionRequest (in template (present) sessionIDType_TYPE p_sId,
 	     in template (present) evccIDType_TYPE p_evccId ):= {
+/*FIXME RGY by standard conversion all field names are lowercase
 		   Header := {
 			   SessionID := p_sId,
 			   Notification := omit,
@@ -99,6 +106,14 @@
 		   },
 		   Body := {
 			   BodyElement := omit//p_evccId
+*/
+		   header := {
+			   sessionID := p_sId,
+			   notification := omit,
+			   signature_ := omit
+		   },
+		   body := {
+			   bodyElement := omit//p_evccId
 			   }
 		   }
 
Index: V2G/LibItsV2G_TestSystem.ttcn
===================================================================
--- V2G/LibItsV2G_TestSystem.ttcn	(revision 1312)
+++ V2G/LibItsV2G_TestSystem.ttcn	(working copy)
@@ -16,8 +16,10 @@
     import from LibItsV2G_TypesAndValues all;
     
     //XSD
-    import from iso_15118_2_2010_MsgDef all;
-	import from iso_15118_2_2010_MsgDataTypes all;
+    import from urn_iso_15118_2_2010_MsgDef all;
+	import from urn_iso_15118_2_2010_MsgDataTypes all;
+
+    import from V2G_typeAliases all;
     
     group portDefinitions {
     
Index: V2G/LibItsV2G_TypesAndValues.ttcn
===================================================================
--- V2G/LibItsV2G_TypesAndValues.ttcn	(revision 1312)
+++ V2G/LibItsV2G_TypesAndValues.ttcn	(working copy)
@@ -13,84 +13,85 @@
     
     // LibIts
 	//import from iso_15118_2_2010_MsgBody all; //language "XSD" all with {extension "File:V2G_CI_MsgBody.xsd" };
-	import from iso_15118_2_2010_AppProtocol all;//language "XSD" all with {extension "File:XSD/V2G_CI_AppProtocol.xsd" };
+	import from urn_iso_15118_2_2010_AppProtocol all;//language "XSD" all with {extension "File:XSD/V2G_CI_AppProtocol.xsd" };
 	//import from iso_15118_2_2010_MsgDataTypes all;//language "XSD" all with {extension "File:XSD/V2G_CI_MsgDataTypes.xsd" };
-	import from iso_15118_2_2010_MsgDef all;//language "XSD" all with {extension "File:XSD/V2G_CI_MsgDef.xsd" };
+	import from urn_iso_15118_2_2010_MsgDef all;//language "XSD" all with {extension "File:XSD/V2G_CI_MsgDef.xsd" };
+
 	//import from iso_15118_2_2010_MsgHeader all;//language "XSD" all with {extension "File:XSD/V2G_CI_MsgHeader.xsd" };
 	//import from org_w3_www__2000_09_xmldsig all;//language "XSD" all with {extension "File:XSD/xmldsig-core-schema.xsd" };
     
     group v2gPdus {
      
-        group SDPMessages {
-
+        group SDPMessages {
+
 			/**
 	         * @desc SDP (Session Discovery Protocol) message description
 	         */
 	        type record Sdp_Message {
-	            Sdp_Header sdpHeader,
+	            Sdp_Header sdpHeader,
 				Sdp_Payload	sdpPayload
-	        }
+	        }
 		}
     } // end v2gPdus
     
     group v2gHeaders {
-        
-		 group SDPMessages {
-
+        
+		 group SDPMessages {
+
 			 /**
 	         * @desc SDP (Session Discovery Protocol) Header description 
 	         */
-	        type record Sdp_Header {
-				Oct1 protocolVersion,
-				Oct1 inverseProtocolVersion,
-				Oct2 payloadType,
+	        type record Sdp_Header {
+				Oct1 protocolVersion,
+				Oct1 inverseProtocolVersion,
+				Oct2 payloadType,
 				UInt16 payloadLength
-	        }
+	        }
 		 }
              
     } // end v2gHeaders
 
-    group v2gPayload {
-
-		group SDPMessages {
-
+    group v2gPayload {
+
+		group SDPMessages {
+
 			 /**
 	         * @desc SDP (Session Discovery Protocol) Payload description 
 	         */
-	         type union Sdp_Payload {
-				 Sdp_Request sdpRequest,
-				 Sdp_Response sdpResponse
-			 }
-
+	         type union Sdp_Payload {
+				 Sdp_Request sdpRequest,
+				 Sdp_Response sdpResponse
+			 }
+
 			 /**
 	         * @desc SDP (Session Discovery Protocol) Request message description 
-	         */
-			 type record Sdp_Request
-			 {
-				Oct1 security,
-				Oct1 transportProtocol
-			 } 
-			 
+	         */
+			 type record Sdp_Request
+			 {
+				Oct1 security,
+				Oct1 transportProtocol
+			 } 
+			 
 			 /**
 	         * @desc SDP (Session Discovery Protocol) Response message description 
-	         */
-			 type record Sdp_Response
-			 {
-				Ipv6Address seccIPAddress, // IPv6
-				UInt16 seccPort,
-				Oct1 security,
+	         */
+			 type record Sdp_Response
+			 {
+				Ipv6Address seccIPAddress, // IPv6
+				UInt16 seccPort,
+				Oct1 security,
 				Oct1 transportProtocol
-	         }
+	         }
 		 }
        
-    } //end v2gPayload
-
-	group IPAddress
-	{
-		/**
-         * @desc IPv6 Address
-         */
-        type Oct16 Ipv6Address;
+    } //end v2gPayload
+
+	group IPAddress
+	{
+		/**
+         * @desc IPv6 Address
+         */
+        type Oct16 Ipv6Address;
 	} // end IPAddress
 	
 	group acPrimitives {
@@ -180,42 +181,45 @@
          * @desc Upper Tester message generating V2G message
          */
         type union UtV2Gevent {
-			V2G_Message.Header   v2gHeader,
-			V2G_Message.Body     v2gBody
+//FIXME RGY by standard conversion all field names are lowercase
+//            V2G_Message.Header   v2gHeader,
+//            V2G_Message.Body     v2gBody
+			V2G_Message.header   v2gHeader,
+			V2G_Message.body     v2gBody
         }
         
     } // end utPrimitives
-    
-	group sdpValues {
-
-		const Oct1 c_protocolVersion1 := '01'O;
-		const Oct1 c_inverseProtocolVersion1 := 'FE'O;
-
-		const Oct2 c_sdpRequestMessagePayloadType := '9000'O;
-		const Oct2 c_sdpResponseMessagePayloadType := '9001'O;
-
-		const UInt16 c_sdpRequestPayloadLength := 2;
-		const UInt16 c_sdpResponsePayloadLength := 18;
-
-		const Oct1 c_securedwithTLS := '00'O;
-		const Oct1 c_noTransportLayerSecurity := '10'O;
-
-		const Oct1 c_transportProtocolTCP := '00'O;
-		const Oct1 c_transportProtocolUDP := '10'O;
-
-		const UInt16 c_V2G_UDP_SDP_SERVER := 15118;
-
-		const integer c_maxNbrSdpRequestRetrans := 4;
-		const integer c_maxNbrConsecutiveSdpRequest := 5;
-
-	} // end sdpValues
-
-	group timerTimeouts
-	{
-		const float c_v2g_seccSequenceTimeout  := 60.0;
-		const float c_v2g_evccSequenceTimeout  := 40.0;
-
-		const float c_v2g_sdpRetransmissionTimeout := 0.25;
+    
+	group sdpValues {
+
+		const Oct1 c_protocolVersion1 := '01'O;
+		const Oct1 c_inverseProtocolVersion1 := 'FE'O;
+
+		const Oct2 c_sdpRequestMessagePayloadType := '9000'O;
+		const Oct2 c_sdpResponseMessagePayloadType := '9001'O;
+
+		const UInt16 c_sdpRequestPayloadLength := 2;
+		const UInt16 c_sdpResponsePayloadLength := 18;
+
+		const Oct1 c_securedwithTLS := '00'O;
+		const Oct1 c_noTransportLayerSecurity := '10'O;
+
+		const Oct1 c_transportProtocolTCP := '00'O;
+		const Oct1 c_transportProtocolUDP := '10'O;
+
+		const UInt16 c_V2G_UDP_SDP_SERVER := 15118;
+
+		const integer c_maxNbrSdpRequestRetrans := 4;
+		const integer c_maxNbrConsecutiveSdpRequest := 5;
+
+	} // end sdpValues
+
+	group timerTimeouts
+	{
+		const float c_v2g_seccSequenceTimeout  := 60.0;
+		const float c_v2g_evccSequenceTimeout  := 40.0;
+
+		const float c_v2g_sdpRetransmissionTimeout := 0.25;
 	}
 }
 with {