Commit c4decfee authored by wattelet's avatar wattelet
Browse files

S6a update

parent 18218c11
Loading
Loading
Loading
Loading
+18 −99
Original line number Diff line number Diff line
/**
 *	@author 	STF 466
 *  @version    $Id$
 *  @desc       This module provides the PIXITs used for the DiameterS6a tests.
 *  @version    $Id: DiameterS6a_PIXITS.ttcn  $
 *	@desc		This module provides the PIXIT used for the SIP-IMS-DIAMETER tests.
 */

module DiameterS6a_PIXITS {
module DiameterS6a_PIXITS
{

    // LibCommon
    import from LibCommon_DataStrings {
        type Oct3
    };
    import from LibCommon_BasicTypesAndValues {
        type UInt32
    };
    import from LibCommon_BasicTypesAndValues all;
    import from LibCommon_DataStrings all;
    import from LibDiameter_TypesAndValues all;
    import from DiameterS6a_TypesAndValues all;

    // LibDiameter
    import from LibDiameter_TypesAndValues {
        type RAT_Type
    };
    
    /**
     * @desc IP addresses and port numbers
     */
    group ipSettings {
        
        /**
         * @desc IP address of the test system
         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/1 
         */
        modulepar charstring PX_DIAMETER_S6a_ETS_IPADDR := "192.168.42.1";
        
        /**
         * @desc IP address of the system under test
         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/2 
         */
        modulepar charstring PX_DIAMETER_S6a_SUT_IPADDR := "192.168.42.2";
        
        /**
         * @desc Port number of the test system
         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/3 
         */
        modulepar integer PX_DIAMETER_S6a_ETS_PORT := 1300;
        
        /**
         * @desc Port number of the system under test
         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/4 
         */
        modulepar integer PX_DIAMETER_S6a_SUT_PORT := 1301;
        
    } // End of group ipSettings
    
    /**
     * @desc Field values
     */
    group fieldValues {
        
        /**
         * @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";
        
        /**
         * @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";
        
        /**
         * @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";
        
        /**
         * @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";
        
        /**
         * @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";
    
    } // End of group group fieldValues
    
    
    /**
     * @desc SUT specific implementation variants
     */ 
// SUT specific implementation variants
	group DiameterCommonS6aData{

        /**
         *  @desc Radio access technology for the IP-RAT-Type AVP in CCR messages 
         *        Available values: WLAN, VIRTUAL, UTRAN, GERAN, GAN, HSPA_EVOLUTION, EUTRAN, CDMA2000, HRPD, UMB, EHRPD
         *  @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) TODO
         */
    	modulepar RAT_Type PX_RAT_TYPE := GERAN_E;

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

        modulepar Oct3 PX_VISITED_PLMN_ID := '000000'O;
    } //end group DiameterCommonS6aData

} // End of module DiameterS6a_PIXITS
    	modulepar Cancellation_Type_Code PX_CANCELLATION_TYPE := MME_UPDATE_PROCEDURE_E;
	} //end group DiameterCommonS6aData
} // end module DiameterS6a_PIXITS
 No newline at end of file
+412 −175
Original line number Diff line number Diff line
@@ -17,12 +17,6 @@ module DiameterS6a_Templates {
    import from LibDiameter_TypesAndValues all;
    import from LibDiameter_Templates all;
    import from DiameterGx_Templates all;    
    
    // Diameter S6a
    import from DiameterS6a_TypesAndValues {
        type 
        ULR_MSG
    };
    import from DiameterS6a_TypesAndValues all;
    import from DiameterS6a_PIXITS all;

@@ -81,6 +75,47 @@ module DiameterS6a_Templates {
                re_synchronization_Info					:= omit,
				aVP_Type								:= omit
			}

            template Cancellation_Type_AVP m_cancellationType_dummy := {
                aVP_Header								:= m_aVP_HeaderVid_Mbit1 ( c_cancellation_Type_AVP_Code, 4, c_vendId3gpp ),
                cancellation_Type						:= PX_CANCELLATION_TYPE
			}

            template Subscription_Data_AVP m_subscriptionData_dummy := {
                aVP_Header								:= m_aVP_HeaderVid_Mbit1 ( c_subscription_Data_AVP_Code, 4, c_vendId3gpp ),
                subscriber_Status						:= omit,
                mSISDN									:= omit,
                sTN_SR									:= omit,
                iCS_Indicator							:= omit,
                network_Access_Mode						:= omit,
                operator_Determined_Barring				:= omit,
                hPLMN_ODB								:= omit,
                zone_Code								:= omit,
                access_Restriction_Data					:= omit,
                aPN_OI_Replacement						:= omit,
                lCS_Info								:= omit,
                teleservice_List						:= omit,
                call_Barring_Info						:= omit,
                threeGPP_Charging_Char					:= omit,
				aMBR									:= omit,
                aPN_Configuration_Profile				:= omit,
                rAT_Freq_Sel_Priority_ID				:= omit,
                trace_Data								:= omit,
                gPRS_Subscription_Data					:= omit,
                gSG_Subscription_Data					:= omit,
                roaming_Rest_Unsupp_Feature				:= omit,
                subscribed_Perio_RAUTAU_Timer			:= omit,
                mPS_Priority							:= omit,
                vPLMN_LIPA_Allowed						:= omit,
                relay_Node_Indicator					:= omit,
                mDT_User_Consent						:= omit,
				aVP_Type								:= omit
			}

            template DSR_Flags_AVP m_dSRFlags_dummy := {
                aVP_Header								:= m_aVP_HeaderVid_Mbit1 ( c_dsr_Flags_AVP_Code, 4, c_vendId3gpp ),
                aVP_Data								:= PX_DSR_FLAGS
            }
        } //end group DummyAVPHeaders

        group SpecificAVPHeaders {
@@ -149,6 +184,111 @@ module DiameterS6a_Templates {
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template CLR_MSG m_S6a_CLR_dummy := {
                	header								:= m_s6adiameterHeaderReq_dummy ( CLx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    cLR_Body							:= m_S6a_CLR_Body_dummy
				}
				template CLR_Body_AVP m_S6a_CLR_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					:= m_destinationHost_dummy,
                	destination_Realm					:= m_destinationRealm_dummy,
                    user_Name							:= m_user_Name_dummy,
					supported_Features					:= omit,
                	cancellation_Type					:= m_cancellationType_dummy,
               		cLR_Flags							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template IDR_MSG m_S6a_IDR_dummy := {
                	header								:= m_s6adiameterHeaderReq_dummy ( IDx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    iDR_Body							:= m_S6a_IDR_Body_dummy
				}
				template IDR_Body_AVP m_S6a_IDR_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					:= m_destinationHost_dummy,
                	destination_Realm					:= m_destinationRealm_dummy,
                    user_Name							:= m_user_Name_dummy,
					supported_Features					:= omit,
                 	subscription_Data					:= m_subscriptionData_dummy,
                	iDR_Flags							:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template DSR_MSG m_S6a_DSR_dummy := {
                	header								:= m_s6adiameterHeaderReq_dummy ( DSx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    dSR_Body							:= m_S6a_DSR_Body_dummy
				}
				template DSR_Body_AVP m_S6a_DSR_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					:= m_destinationHost_dummy,
                	destination_Realm					:= m_destinationRealm_dummy,
                    user_Name							:= m_user_Name_dummy,
					supported_Features					:= omit,
                	dSR_Flags							:= m_dSRFlags_dummy,
					context_Identifier					:= omit,
               		trace_Reference						:= omit,
                	tS_Code								:= omit,
                	sS_Code								:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template S6a_PUR_MSG m_S6a_PUR_dummy := {
                	header								:= m_s6adiameterHeaderReq_dummy ( PUx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    pUR_Body							:= m_S6a_PUR_Body_dummy
				}
				template PUR_Body_AVP m_S6a_PUR_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,
                	pUR_Flags							:= omit,
					supported_Features					:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}

				template RSR_MSG m_S6a_RSR_dummy := {
                	header								:= m_s6adiameterHeaderReq_dummy ( RSx_E, c_applId_S6a ),
					session_Id							:= m_sessionId_dummy,
                    rSR_Body							:= m_S6a_RSR_Body_dummy
				}
				template RSR_Body_AVP m_S6a_RSR_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					:= m_destinationHost_dummy,
                	destination_Realm					:= m_destinationRealm_dummy,
					supported_Features					:= omit,
               		user_Id								:= omit,
					proxy_Info							:= omit,
					route_Record						:= omit,
					aVP_Type							:= omit
				}
          	} // end group S6aDummy_request_templates_send

          	group S6aDummy_request_templates_receive {
@@ -201,6 +341,111 @@ module DiameterS6a_Templates {
					route_Record						:= *,
					aVP_Type							:= *
				}

				template CLR_MSG mw_S6a_CLR_dummy := {
                	header								:= mw_s6adiameterHeaderReq_dummy ( CLx_E, c_applId_S6a ),
					session_Id							:= ?,
                    cLR_Body							:= mw_S6a_CLR_Body_dummy
				}
				template CLR_Body_AVP mw_S6a_CLR_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
                	destination_Host					:= ?,
                	destination_Realm					:= ?,
                    user_Name							:= ?,
					supported_Features					:= *,
                	cancellation_Type					:= ?,
               		cLR_Flags							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}

				template IDR_MSG mw_S6a_IDR_dummy := {
                	header								:= mw_s6adiameterHeaderReq_dummy ( IDx_E, c_applId_S6a ),
					session_Id							:= ?,
                    iDR_Body							:= mw_S6a_IDR_Body_dummy
				}
				template IDR_Body_AVP mw_S6a_IDR_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
                	destination_Host					:= ?,
                	destination_Realm					:= ?,
                    user_Name							:= ?,
					supported_Features					:= *,
                 	subscription_Data					:= ?,
                	iDR_Flags							:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}

				template DSR_MSG mw_S6a_DSR_dummy := {
                	header								:= mw_s6adiameterHeaderReq_dummy ( DSx_E, c_applId_S6a ),
					session_Id							:= ?,
                    dSR_Body							:= mw_S6a_DSR_Body_dummy
				}
				template DSR_Body_AVP mw_S6a_DSR_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
                	destination_Host					:= ?,
                	destination_Realm					:= ?,
                    user_Name							:= ?,
					supported_Features					:= *,
                	dSR_Flags							:= ?,
					context_Identifier					:= *,
               		trace_Reference						:= *,
                	tS_Code								:= *,
                	sS_Code								:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}

				template S6a_PUR_MSG mw_S6a_PUR_dummy := {
                	header								:= mw_s6adiameterHeaderReq_dummy ( PUx_E, c_applId_S6a ),
					session_Id							:= ?,
                    pUR_Body							:= mw_S6a_PUR_Body_dummy
				}
				template PUR_Body_AVP mw_S6a_PUR_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
                	destination_Host					:= *,
                	destination_Realm					:= ?,
                    user_Name							:= ?,
                	pUR_Flags							:= *,
					supported_Features					:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}

				template RSR_MSG mw_S6a_RSR_dummy := {
                	header								:= mw_s6adiameterHeaderReq_dummy ( RSx_E, c_applId_S6a ),
					session_Id							:= ?,
                    rSR_Body							:= mw_S6a_RSR_Body_dummy
				}
				template RSR_Body_AVP mw_S6a_RSR_Body_dummy := {
					vendor_Specific_Application_Id		:= *,
                    auth_Session_State					:= ?,
                	origin_Host							:= ?,
                	origin_Realm						:= ?,
                	destination_Host					:= ?,
                	destination_Realm					:= ?,
					supported_Features					:= *,
               		user_Id								:= *,
					proxy_Info							:= *,
					route_Record						:= *,
					aVP_Type							:= *
				}
			}//end group S6aDummy_request_templates_receive

          	group S6aDummy_answer_templates_send {
@@ -208,12 +453,9 @@ module DiameterS6a_Templates {

          	group S6aDummy_answer_templates_receive {
          	}

      	} //end group S6aDummy_templates


      	group S6aBase_templates {

        	group S6aBasic_request_templates_send {
        	} // end group S6aBasic_request_templates_send

@@ -228,11 +470,8 @@ module DiameterS6a_Templates {

      	} //end group S6aBase_templates
      
      
      	group S6aModified_templates {

          	group S6aModified_request_templates_send {
         
          	} //     end group S6aModified_request_templates_send

          	group S6aModified_request_templates_receive {
@@ -243,8 +482,6 @@ module DiameterS6a_Templates {

          	group S6aModified_answer_templates_receive {                             
          	} // end group S6aModified_answer_templates_receive

      	} //end group S6aModified_templates
    } //end group S6aMessageTemplates

}//end module DiameterS6a_Templates
 No newline at end of file
+18 −18
Original line number Diff line number Diff line
@@ -1409,8 +1409,8 @@ group HeaderAndBodyTypes {
			IDA_MSG			S6a_IDA_MSG,
			DSR_MSG			S6a_DSR_MSG,
			DSA_MSG			S6a_DSA_MSG,
			PUR_MSG		S6a_PUR_MSG,
			PUA_MSG		S6a_PUA_MSG,
			S6a_PUR_MSG		S6a_PUR_MSG,
			S6a_PUA_MSG		S6a_PUA_MSG,
			RSR_MSG			S6a_RSR_MSG,
			RSA_MSG			S6a_RSA_MSG,
			NOR_MSG			S6a_NOR_MSG,
@@ -1568,7 +1568,7 @@ group HeaderAndBodyTypes {
				Auth_Session_State_AVP             	auth_Session_State,
				Origin_Host_AVP                     origin_Host,
				Origin_Realm_AVP                    origin_Realm,
				Destination_Host_AVP                destination_Host				optional,
				Destination_Host_AVP                destination_Host,
				Destination_Realm_AVP               destination_Realm,
				User_Name_AVP                       user_Name,
				set of Supported_Features_AVP       supported_Features				optional,
@@ -1653,7 +1653,7 @@ group HeaderAndBodyTypes {
			}

			// Purge-UE-Request (PUR) Command - Ref: TS 129 272 7.2.13
			type record  PUR_MSG {
			type record  S6a_PUR_MSG {
                S6aDiameterHeader                   header,							//<PUR>  ::= < Diameter Header: 321, REQ, PXY, 16777251 >
				Session_Id_AVP						session_Id,						//
				PUR_Body_AVP						pUR_Body
@@ -1674,7 +1674,7 @@ group HeaderAndBodyTypes {
			}

			// Purge-UE-Answer (PUA) Command - Ref: TS 129 272 7.2.14
			type record  PUA_MSG {
			type record  S6a_PUA_MSG {
                S6aDiameterHeader                   header,							//<DSA> ::=	< Diameter Header: 321, PXY, 16777251 >
				Session_Id_AVP						session_Id,						//
				PUA_Body_AVP						pUA_Body
+1 −1

File changed.

Contains only whitespace changes.