Commit 66cec2e6 authored by wattelet's avatar wattelet
Browse files

S6a template, type, PIXIT updated

parent 1eca4301
Loading
Loading
Loading
Loading
+7 −8
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ module DiameterS6a_PIXITS {
    
    // LibDiameter
    import from LibDiameter_TypesAndValues {
        type RAT_Type 
        type RAT_Type,  Diameter_Identity, UTF8String
    };
    
    // DiameterS6a
@@ -64,31 +64,31 @@ module DiameterS6a_PIXITS {
         * @desc The Session-Id identifying a specific session
         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/5 
         */
        modulepar charstring PX_SessionID := "sessionId";
        modulepar UTF8String PX_SessionID := "sessionId";
        
        /**
         * @desc The Origin-Host identifying the endpoint that originates the Diameter messages
         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/6 
         */
        modulepar charstring PX_OriginHost := "orgHost";
        modulepar Diameter_Identity PX_OriginHost := "orgHost";
        
        /**
         * @desc The Origin-Realm identifying the Realm of the originator of any Diameter messages
         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/7 
         */
        modulepar charstring PX_OriginRealm := "realm";
        modulepar Diameter_Identity PX_OriginRealm := "realm";
        
        /**
         * @desc The Destination-Host identifying the endpoint to which the Diameter messages are destined
         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/8 
         */
        modulepar charstring PX_DestinationHost := "destHost";
        modulepar Diameter_Identity PX_DestinationHost := "destHost";
        
        /**
         * @desc The Destination-Realm identifying the Realm of the destination of any Diameter messages
         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/9 
         */
        modulepar charstring PX_DestinationRealm := "destRealm";
        modulepar Diameter_Identity PX_DestinationRealm := "destRealm";
    
    } // End of group group fieldValues
    
@@ -105,12 +105,11 @@ module DiameterS6a_PIXITS {
         */
        modulepar RAT_Type PX_RAT_TYPE := GERAN_E;

        modulepar UInt32 PX_DSR_FLAGS := 0;
        modulepar UInt32 PX_ULR_FLAGS := 0;

        modulepar Oct3 PX_VISITED_PLMN_ID := '000000'O;
        
		modulepar UInt32 PX_DSR_FLAGS := 0;

        modulepar Cancellation_Type_Code PX_CANCELLATION_TYPE := MME_UPDATE_PROCEDURE_E;
        
    } //end group DiameterCommonS6aData
+410 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ module DiameterS6a_Templates {
    } //end group SubFields

    group HeaderFieldTemplates {

		template S6aDiameterHeader m_s6adiameterHeaderReq_dummy ( S6a_Command_Code p_cmdcode, UInt32 p_applid ) := {
			version										:= c_versionId,
			msglen										:= 0,				//Message lenght with AVPs has to be calculated
@@ -44,6 +43,31 @@ module DiameterS6a_Templates {
			hopid										:= ?,
			endid										:= ?
		}
		template S6aDiameterHeader m_s6adiameterHeaderAns_dummy ( S6a_Command_Code p_cmdcode, UInt32 p_applid ) := {
			version										:= c_versionId,
			msglen										:= 0,               //Message lenght with AVPs has to be calculated
			cmdflags									:= m_cmdFlagsAns,	//RPETrrrr
			cmdcode										:= p_cmdcode,
			applid										:= p_applid,
			hopid										:= 0,
			endid 										:= 0
		}
		template S6aDiameterHeader mw_s6adiameterHeaderAns_dummy ( S6a_Command_Code p_cmdcode, template (present) UInt32 p_applid ) := {
			version										:= c_versionId,
			msglen										:= ?,
			cmdflags									:= mw_cmdFlagsAns,
			cmdcode										:= p_cmdcode,
			applid										:= p_applid,
			hopid										:= ?,
			endid										:= ?
		}
		template Command_Flags mw_cmdFlagsAns := {
			r_bit										:= '0'B,			//Answer message
			p_bit										:= ?,
			e_bit										:= ?,
			t_bit										:= ?,
			reserved_bits								:= '0000'B
		}
        group DummyAVPHeaders{
            template RAT_Type_AVP m_rATType_dummy := {
                aVP_Header								:= m_aVP_HeaderVid_Mbit1 ( c_rAT_Type_AVP_Code, 4, c_vendId3gpp ),
@@ -289,6 +313,33 @@ module DiameterS6a_Templates {
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template NOR_MSG m_S6a_NOR_dummy := {
                	header								:= m_s6adiameterHeaderReq_dummy ( NOx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    nOR_Body							:= m_S6a_NOR_Body_dummy
				}
				template NOR_Body_AVP m_S6a_NOR_Body_dummy := {
					vendor_Specific_Application_Id		:= omit,
                    auth_Session_State					:= m_auth_Session_State_dummy,
                	origin_Host							:= m_originHost_dummy,
                	origin_Realm						:= m_originRealm_dummy,
                	destination_Host					:= omit,
                	destination_Realm					:= m_destinationRealm_dummy,
                    user_Name							:= m_user_Name_dummy,
					supported_Features					:= omit,
                	terminal_Information				:= omit,
					mIP6_Agent_Info						:= omit,
                	visited_Network_Identifier			:= omit,
                	context_Identifier					:= omit,
                	service_Selection					:= omit,
                	alert_Reason						:= omit,
					uE_SRVCC_Capability					:= omit,
               		nOR_Flags							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}
          	} // end group S6aDummy_request_templates_send

          	group S6aDummy_request_templates_receive {
@@ -446,12 +497,369 @@ module DiameterS6a_Templates {
					route_Record						:= *,
					aVP_Type							:= *
				}

				template NOR_MSG mw_S6a_NOR_dummy := {
                	header								:= mw_s6adiameterHeaderReq_dummy ( NOx_E, c_applId_S6a ),
					session_Id							:= ?,
                    nOR_Body							:= mw_S6a_NOR_Body_dummy
				}
				template NOR_Body_AVP mw_S6a_NOR_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
                	destination_Host					:= *,
                	destination_Realm					:= ?,
                    user_Name							:= ?,
					supported_Features					:= *,
                	terminal_Information				:= *,
					mIP6_Agent_Info						:= *,
                	visited_Network_Identifier			:= *,
                	context_Identifier					:= *,
                	service_Selection					:= *,
                	alert_Reason						:= *,
					uE_SRVCC_Capability					:= *,
               		nOR_Flags							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}
			}//end group S6aDummy_request_templates_receive

          	group S6aDummy_answer_templates_send {
				template ULA_MSG m_S6a_ULA_dummy := {
                	header								:= m_s6adiameterHeaderAns_dummy ( ULx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    uLA_Body							:= m_S6a_ULA_Body_dummy
				}
				template ULA_Body_AVP m_S6a_ULA_Body_dummy := {
					vendor_Specific_Application_Id		:= omit,
					result_Code							:= omit,
					experimental_Result					:= omit,
					error_Diagnostic					:= omit,
                    auth_Session_State					:= m_auth_Session_State_dummy,
                	origin_Host							:= m_originHost_dummy,
                	origin_Realm						:= m_originRealm_dummy,
					supported_Features					:= omit,
                	ula_Flags							:= omit,
                	subscription_Data					:= omit,
					failed_AVP							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template AIA_MSG m_S6a_AIA_dummy := {
                	header								:= m_s6adiameterHeaderAns_dummy ( AIx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    aIA_Body							:= m_S6a_AIA_Body_dummy
				}
				template AIA_Body_AVP m_S6a_AIA_Body_dummy := {
					vendor_Specific_Application_Id		:= omit,
					result_Code							:= omit,
					experimental_Result					:= omit,
					error_Diagnostic					:= omit,
                    auth_Session_State					:= m_auth_Session_State_dummy,
                	origin_Host							:= m_originHost_dummy,
                	origin_Realm						:= m_originRealm_dummy,
					supported_Features					:= omit,
                    authentication_Info					:= omit,
					failed_AVP							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template CLA_MSG m_S6a_CLA_dummy := {
                	header								:= m_s6adiameterHeaderAns_dummy ( CLx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    cLA_Body							:= m_S6a_CLA_Body_dummy
				}
				template CLA_Body_AVP m_S6a_CLA_Body_dummy := {
					vendor_Specific_Application_Id		:= omit,
					supported_Features					:= omit,
					result_Code							:= omit,
					experimental_Result					:= omit,
                    auth_Session_State					:= m_auth_Session_State_dummy,
                	origin_Host							:= m_originHost_dummy,
                	origin_Realm						:= m_originRealm_dummy,
					failed_AVP							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template IDA_MSG m_S6a_IDA_dummy := {
                	header								:= m_s6adiameterHeaderAns_dummy ( IDx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    iDA_Body							:= m_S6a_IDA_Body_dummy
				}
				template IDA_Body_AVP m_S6a_IDA_Body_dummy := {
					vendor_Specific_Application_Id		:= omit,
					supported_Features					:= omit,
					result_Code							:= omit,
					experimental_Result					:= omit,
                    auth_Session_State					:= m_auth_Session_State_dummy,
                	origin_Host							:= m_originHost_dummy,
                	origin_Realm						:= m_originRealm_dummy,
                	iMS_Voice_PS_Sessions_Support		:= omit,
                	last_UE_Activity_Time_AVP			:= omit,
                	rAT_Type							:= omit,
                	iDA_Flags							:= omit,
                	ePS_User_State						:= omit,
                	ePS_Location_Information			:= omit,
					failed_AVP							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template DSA_MSG m_S6a_DSA_dummy := {
                	header								:= m_s6adiameterHeaderAns_dummy ( DSx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    dSA_Body							:= m_S6a_DSA_Body_dummy
				}
				template DSA_Body_AVP m_S6a_DSA_Body_dummy := {
					vendor_Specific_Application_Id		:= omit,
					supported_Features					:= omit,
					result_Code							:= omit,
					experimental_Result					:= omit,
					error_Diagnostic					:= omit,
                    auth_Session_State					:= m_auth_Session_State_dummy,
                	origin_Host							:= m_originHost_dummy,
                	origin_Realm						:= m_originRealm_dummy,
                    dSA_Flags							:= omit,
					failed_AVP							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template S6a_PUA_MSG m_S6a_PUA_dummy := {
                	header								:= m_s6adiameterHeaderAns_dummy ( PUx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    pUA_Body							:= m_S6a_PUA_Body_dummy
				}
				template PUA_Body_AVP m_S6a_PUA_Body_dummy := {
					vendor_Specific_Application_Id		:= omit,
					supported_Features					:= omit,
					result_Code							:= omit,
					experimental_Result					:= omit,
                    auth_Session_State					:= m_auth_Session_State_dummy,
                	origin_Host							:= m_originHost_dummy,
                	origin_Realm						:= m_originRealm_dummy,
                    pUA_Flags							:= omit,
					failed_AVP							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template RSA_MSG m_S6a_RSA_dummy := {
                	header								:= m_s6adiameterHeaderAns_dummy ( RSx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    rSA_Body							:= m_S6a_RSA_Body_dummy
				}
				template RSA_Body_AVP m_S6a_RSA_Body_dummy := {
					vendor_Specific_Application_Id		:= omit,
					supported_Features					:= omit,
					result_Code							:= omit,
					experimental_Result					:= omit,
                    auth_Session_State					:= m_auth_Session_State_dummy,
                	origin_Host							:= m_originHost_dummy,
                	origin_Realm						:= m_originRealm_dummy,
					failed_AVP							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template NOA_MSG m_S6a_NOA_dummy := {
                	header								:= m_s6adiameterHeaderAns_dummy ( NOx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    nOA_Body							:= m_S6a_NOA_Body_dummy
				}
				template NOA_Body_AVP m_S6a_NOA_Body_dummy := {
					vendor_Specific_Application_Id		:= omit,
					result_Code							:= omit,
					experimental_Result					:= omit,
                    auth_Session_State					:= m_auth_Session_State_dummy,
                	origin_Host							:= m_originHost_dummy,
                	origin_Realm						:= m_originRealm_dummy,
					supported_Features					:= omit,
					failed_AVP							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}
          	}

          	group S6aDummy_answer_templates_receive {
				template ULA_MSG mw_S6a_ULA_dummy := {
                	header								:= mw_s6adiameterHeaderAns_dummy ( ULx_E, c_applId_S6a ),
					session_Id							:= ?,
                    uLA_Body							:= mw_S6a_ULA_Body_dummy
				}
				template ULA_Body_AVP mw_S6a_ULA_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
					result_Code							:= *,
					experimental_Result					:= *,
					error_Diagnostic					:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
					supported_Features					:= *,
                	ula_Flags							:= *,
                	subscription_Data					:= *,
					failed_AVP							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}

				template AIA_MSG m_wS6a_AIA_dummy := {
                	header								:= mw_s6adiameterHeaderAns_dummy ( AIx_E, c_applId_S6a ),
					session_Id							:= ?,
                    aIA_Body							:= mw_S6a_AIA_Body_dummy
				}
				template AIA_Body_AVP mw_S6a_AIA_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
					result_Code							:= *,
					experimental_Result					:= *,
					error_Diagnostic					:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
					supported_Features					:= *,
                    authentication_Info					:= *,
					failed_AVP							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}

				template CLA_MSG mw_S6a_CLA_dummy := {
                	header								:= mw_s6adiameterHeaderAns_dummy ( CLx_E, c_applId_S6a ),
					session_Id							:= ?,
                    cLA_Body							:= mw_S6a_CLA_Body_dummy
				}
				template CLA_Body_AVP mw_S6a_CLA_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
					supported_Features					:= *,
					result_Code							:= *,
					experimental_Result					:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
					failed_AVP							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}

				template IDA_MSG mw_S6a_IDA_dummy := {
                	header								:= mw_s6adiameterHeaderAns_dummy ( IDx_E, c_applId_S6a ),
					session_Id							:= ?,
                    iDA_Body							:= mw_S6a_IDA_Body_dummy
				}
				template IDA_Body_AVP mw_S6a_IDA_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
					supported_Features					:= *,
					result_Code							:= *,
					experimental_Result					:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
                	iMS_Voice_PS_Sessions_Support		:= *,
                	last_UE_Activity_Time_AVP			:= *,
                	rAT_Type							:= *,
                	iDA_Flags							:= *,
                	ePS_User_State						:= *,
                	ePS_Location_Information			:= *,
					failed_AVP							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}

				template DSA_MSG mw_S6a_DSA_dummy := {
                	header								:= mw_s6adiameterHeaderAns_dummy ( DSx_E, c_applId_S6a ),
					session_Id							:= ?,
                    dSA_Body							:= mw_S6a_DSA_Body_dummy
				}
				template DSA_Body_AVP mw_S6a_DSA_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
					supported_Features					:= *,
					result_Code							:= *,
					experimental_Result					:= *,
					error_Diagnostic					:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
                    dSA_Flags							:= *,
					failed_AVP							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}

				template S6a_PUA_MSG mw_S6a_PUA_dummy := {
                	header								:= mw_s6adiameterHeaderAns_dummy ( PUx_E, c_applId_S6a ),
					session_Id							:= ?,
                    pUA_Body							:= mw_S6a_PUA_Body_dummy
				}
				template PUA_Body_AVP mw_S6a_PUA_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
					supported_Features					:= *,
					result_Code							:= *,
					experimental_Result					:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
                    pUA_Flags							:= *,
					failed_AVP							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}

				template RSA_MSG mw_S6a_RSA_dummy := {
                	header								:= mw_s6adiameterHeaderAns_dummy ( RSx_E, c_applId_S6a ),
					session_Id							:= ?,
                    rSA_Body							:= mw_S6a_RSA_Body_dummy
				}
				template RSA_Body_AVP mw_S6a_RSA_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
					supported_Features					:= *,
					result_Code							:= *,
					experimental_Result					:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
					failed_AVP							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}
 
				template NOA_MSG mw_S6a_NOA_dummy := {
                	header								:= mw_s6adiameterHeaderAns_dummy ( NOx_E, c_applId_S6a ),
					session_Id							:= ?,
                    nOA_Body							:= mw_S6a_NOA_Body_dummy
				}
				template NOA_Body_AVP mw_S6a_NOA_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
					result_Code							:= *,
					experimental_Result					:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
					supported_Features					:= *,
					failed_AVP							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}
          	}
      	} //end group S6aDummy_templates

+1 −1
Original line number Diff line number Diff line
@@ -1749,7 +1749,7 @@ group HeaderAndBodyTypes {
				Destination_Realm_AVP               destination_Realm,
				User_Name_AVP                       user_Name,
				set of Supported_Features_AVP       supported_Features				optional,
                Terminal_Information_AVP			ierminal_Information			optional,
                Terminal_Information_AVP			terminal_Information			optional,
				MIP6_Agent_Info_AVP					mIP6_Agent_Info					optional,
                Visited_Network_Identifier_AVP		visited_Network_Identifier		optional,
                Context_Identifier_AVP				context_Identifier				optional,