Commit 3bbb4714 authored by juvancic's avatar juvancic
Browse files

Merge branch 'STF574' of https://forge.etsi.org/rep/vxlte/vxlte-iop into

STF574update
parents e8aa43ad d666324a
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -268,8 +268,6 @@ Package TP_CX {
                        User_Name_AVP
                        Destination_Host_AVP
                        Destination_Realm_AVP
                        UAR_Flags_AVP 
                            indicating value IMS_Emergency_Registration_bit_not_set
                        ;
                    to the IMS_HSS_A entity
                }
+8 −9
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ Package TP_GX {
     
    Test Purpose {
        TP Id TP_GX_PGW_RAA_01
        //TP_EPC_6013_01 and TP_EPC_6014_01 from TS 103 029 V5.1.1
        //TP_EPC_7001_05 and TP_EPC_7001_06 from TS 103 029 V5.1.1
        Test objective  "IUT successfully processes all mandatory AVPs in an RA-Request received due provision of PCC rules and sends RA-Answer."
        
        Reference 
@@ -355,7 +355,7 @@ Package TP_GX {
                    the EPC_PCRF_A entity sends an RAR containing
                        Charging_Rule_Install_AVP containing
                            Charging_Rule_Definition_AVP containing
                                Charging_Rule_Name_AVP containing
                                Charging_Rule_Name_AVP
                                Flows_AVP containing
                                    Media_Component_Number_AVP
                                        indicating value 0
@@ -366,7 +366,6 @@ Package TP_GX {
                            ;
                        ;
                    ;
                    ;
                    to the EPC_PGW_A entity
                }
                then {
+2 −20
Original line number Diff line number Diff line
@@ -52,17 +52,8 @@ Package TP_RX {
                                    indicating value 0,
                                Media_Sub_Component_AVP containing
                                    Flow_Description_AVP
                                        indicating value 
                                        "permit_in_ip from (UE_A-IP_address and UE_A_port_number) to (P-CSCF-IP_address and P-CSCF_port_number) or
                                         permit_in_udp from (UE_A-IP_address and UE_A_port_number) to (P-CSCF-IP_address and P-CSCF_port_number) or
                                         permit_in_tcp from (UE_A-IP_address and UE_A_port_number) to (P-CSCF-IP_address and P-CSCF_port_number)",
                                    Flow_Description_AVP
                                        indicating value 
                                        "permit_out_ip from (P-CSCF-IP_address P-CSCF_port_number) to UE_A-IP_address or
                                         permit_out_udp from (P-CSCF-IP_address P-CSCF_port_number) to UE_A-IP_address or
                                         permit_out_tcp from (P-CSCF-IP_address P-CSCF_port_number) to UE_A-IP_address",
                                    Flow_Usage_AVP
                                        indicating value AF_SIGNALING,
                                        indicating value AF_SIGNALLING,
                                    Flow_Status_AVP
                                        indicating value ENABLED,
                                    AF_Signalling_Protocol_AVP
@@ -180,17 +171,8 @@ Package TP_RX {
                                indicating value 0,
                            Media_Sub_Component_AVP containing
                                Flow_Description_AVP
                                    indicating value 
                                    "permit_in_ip from (UE_A-IP_address and UE_A_port_number) to (P-CSCF-IP_address and P-CSCF_port_number) or
                                     permit_in_udp from (UE_A-IP_address and UE_A_port_number) to (P-CSCF-IP_address and P-CSCF_port_number) or
                                     permit_in_tcp from (UE_A-IP_address and UE_A_port_number) to (P-CSCF-IP_address and P-CSCF_port_number))",
                                Flow_Description_AVP
                                    indicating value
                                    "permit_out_ip from (P-CSCF-IP_address P-CSCF_port_number) to UE_A-IP_address or
                                     permit_out_udp from (P-CSCF-IP_address P-CSCF_port_number) to UE_A-IP_address or
                                     permit_out_tcp from (P-CSCF-IP_address P-CSCF_port_number) to UE_A-IP_address)",
                                Flow_Usage_AVP
                                    indicating value AF_SIGNALING,
                                    indicating value AF_SIGNALLING,
                                Flow_Status_AVP
                                    indicating value ENABLED,
                                AF_Signalling_Protocol_AVP
+98 −0
Original line number Diff line number Diff line
/*
 *  @author     STF 574
 *  @version    $Id$
 *  @desc       This module provides the TP behaviour functions at IC interface
 */

module AtsImsIot_TP_behavior_ISC
{

	import from AtsImsIot_TestSystem { type ImsInterfaceMonitor, ImsTestCoordinator; }
	import from LibIot_PIXITS {modulepar PX_MAX_MSG_WAIT;}
	import from AtsImsIot_Templates {template all;}
	import from AtsImsIot_TypesAndValues { type SipMessage, SipMessageList, NAPTRmessage, EnumResponse, EnumQuery, SkipType; }
	import from LibIot_TestInterface { type EquipmentUser, IotEquipmentUser };
	import from LibIms_UpperTester {type ImsUserInfo;}
	import from LibIot_TypesAndValues {type SetFilterReq, SetFilterRsp;}
	import from LibIot_Functions { function f_setConformanceVerdict, f_setIotVerdictFAIL; }
	import from LibSip_SIPTypesAndValues all;
	import from LibSip_Templates all;
    
	import from LibSip_Common {
		type 
			GenericParam,
			SemicolonParam_List
	}   
    
	import from AtsImsIot_Functions all;
	import from LibIot_PIXITS {modulepar PX_EUT_A, PX_EUT_B;}
	// LibSip
	import from LibSip_SDPTypes { type SDP_media_desc_list };
	// LibMsrp
	import from LibMsrp_TypesAndValues { type MsrpURI };
	import from LibMsrp_Functions { function f_str2msrpUri };
	import from LibMsrp_Templates { 
		template 
			m_msrpSend_Dummy, mw_msrpSEND_toPath_fromPath_contentType, 
			m_msrpReport_Dummy, mw_msrpREPORT_success, 
			m_msrpResponse_Dummy, mw_msrpResponse_toPath_fromPath, 
			mw_toPath,  mw_fromPath, mw_msrpResponse_toPath_fromPath_with_transferReports,
			m_msrpURIs_ToPath_Dummy, m_msrpURIs_FromPath_Dummy, 
			mw_contentType 
	};
	import from DiameterS6a_Templates all;
	import from DiameterS6a_PIXITS all;
	import from DiameterGx_Templates all;
	// LibDiameter
	import from LibDiameter_Templates all;
//	import from DiameterRx_Templates all;

    import from AtsImsIot_Templates_IC all;

    
group g_ISC {

	/**
	* @desc Starts monitor component behavior for TP_ISC_SCSCF_REGISTER_01
	* @param p_monitorCompRef Reference to monitor component
    * @remark source function f_mtc_check_TP_IC_IBCF_REGISTER_02
	*/
	function f_mtc_check_TP_ISC_SCSCF_REGISTER_01(
		ImsInterfaceMonitor p_monitorCompRef, boolean p_checkMessage
	) runs on ImsTestCoordinator {
        var template SipUrl v_request_uri := mw_SipUrl_Host(f_GetEUTPcscfAddress(PX_EUT_A));

		p_monitorCompRef.start(
		f_imsIot_receive(
			{mw_SipRequest(mdw_TP_ISC_SCSCF_REGISTER_01(?,?,v_request_uri))},
			{mw_SipRequest(mw_REGISTER_Request_Base)},
			{0, omit},
			"TP_ISC_SCSCF_REGISTER_01",
			false,
			p_checkMessage
			)
		);
		p_monitorCompRef.done;

        // @remark source function f_mtc_check_TP_IMS_5092_01_ic
		var charstring v_EUT_A_Addr := f_GetEUTPcscfAddress(PX_EUT_A);
		var template SipUrl v_eutBUri := mw_SipUrl_Host(f_GetEUTScscfAddress(PX_EUT_B));
            
		p_monitorCompRef.start(
			f_imsIot_receive(
                {mw_SipResponse(mw_Response_Base_ToFrom(c_statusLine200, ?, ?,?,?))}, //TODO To/From
//				{mw_SipResponse(mdw_TP_IC_IBCF_REGISTER200OK_02(v_EUT_A_Addr, v_eutBUri))},
				{mw_SipResponse (mw_200OK_Base)},
				{0, omit},
				"TP_ISC_SCSCF_REGISTER_01",
				false,
				p_checkMessage
			)
		);
		p_monitorCompRef.done;

	}

} // end of g_ISC

} // end module AtsImsIot_TP_behavior_IC
 No newline at end of file
+28 −0
Original line number Diff line number Diff line
@@ -702,6 +702,34 @@ module AtsImsIot_Templates_IC
			   	}
		}

		/**
		* 
		* @desc REGISTER Request checking TP_ISC_SCSCF_REGISTER_01.
		*/
		template REGISTER_Request mdw_TP_ISC_SCSCF_REGISTER_01(
			template SipUrl p_eutAUri, 
			template charstring p_EUTB_PublicId,
		    template SipUrl p_PCSCF_SIP_URI
		) modifies mw_REGISTER_Request_Base := {
            requestLine := { requestUri := p_PCSCF_SIP_URI }, 
			msgHeader := {
				fromField := mw_From (p_eutAUri),
				toField := mw_To_NameAddr_SipUrl ({quotedString:=p_EUTB_PublicId}, ?, ?),
				authorization := mw_Authorization(mw_credentialIntegrityNo),
				pChargingVector := ?,
				pChargingFunctionAddresses := ?,
				pAccessNetworkInfo := ?,
				pVisitedNetworkID := ?,
				contact := {
					fieldName := CONTACT_E,
					contactBody := {
						contactAddresses := ?
					}
				}
				 
			}
		}

	} // end group g_IBCF_REGISTER

	} // end group g_IBCF