Commit 44fd14d8 authored by schmitting's avatar schmitting
Browse files

End of week 35/2013

parent a27c7f0a
Loading
Loading
Loading
Loading
+18 −23
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ module DiameterRx_ImsGm_TCFunctions {
	import from LibIms_SIPTypesAndValues all;
	import from LibIms_Interface all;



	group TP_BasicCall{

	/*
@@ -269,7 +267,6 @@ module DiameterRx_ImsGm_TCFunctions {

	} // end TP_Termination


	// source from AtsIms_Gm_TCFunctions (STF346)
	group TP_TargetRefresh {

@@ -430,8 +427,6 @@ module DiameterRx_ImsGm_TCFunctions {

	group IMSTemplates {

	
	
        template INVITE_Request m_INVITE_Request_UE_Diameter
        (SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq, From p_from, To p_to,
          Via p_via, Contact p_contact, template Require p_require,
+5 −9
Original line number Diff line number Diff line
@@ -16,16 +16,12 @@ module DiameterRx_PICS
	*/
	modulepar boolean PC_AF_SPONSORED_DATA_CONNECTIVITY_SUPPORTED;


    /** @desc	Does AF support SUBSCRIBE_TO_NOTIFICATION
     *  @remark	PICS ref: A.3/6
     *			True, if SUBSCRIBE_TO_NOTIFICATION is supported
    */
    modulepar boolean PC_AF_SUBSCRIBE_TO_NOTIFICATION_SUPPORTED;

	
    
    
    /** @desc	Does PCRF support SPONSORED_DATA_CONNECTIVITY
     *  @remark	PICS ref: A.4/4
 	 *	        True, if SPONSORED_DATA_CONNECTIVITY is supported
+66 −80
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ module DiameterRx_PIXITS
       that the NAS should select an address for the user (eg, assigned
       from a pool of addresses kept by the NAS);

    
                    Ref: TS 129 214 5-4, table 5-4-1
        */
    	modulepar octetstring PX_UE1_framedIpAddress := '0a0a0a0a'O;
@@ -80,7 +79,6 @@ module DiameterRx_PIXITS
       that the NAS should select an address for the user (eg, assigned
       from a pool of addresses kept by the NAS);

    
                    Ref: TS 129 214 5-4, table 5-4-1
        */
        modulepar octetstring PX_UE2_framedIpAddress := '0a0a0a0a'O;
@@ -95,7 +93,6 @@ module DiameterRx_PIXITS
       that specific IPv6 prefixes are desired, but the server is not
       required to honor the hint in the corresponding response;

    
                    Ref: TS 129 214 5-4, table 5-4-1
        */
        modulepar octetstring PX_UE1_framedIp6Address := '0a0a0a0a'O;
@@ -110,13 +107,10 @@ module DiameterRx_PIXITS
       that specific IPv6 prefixes are desired, but the server is not
       required to honor the hint in the corresponding response;

    
                    Ref: TS 129 214 5-4, table 5-4-1
        */
        modulepar octetstring PX_UE2_framedIp6Address := '0a0a0a0a'O;

    
    	
        /** @desc	UTF8String,  PIXIT item A-1/9

       The Session-Id AVP (AVP Code 263) is of type UTF8String and is used
@@ -130,8 +124,6 @@ module DiameterRx_PIXITS
        */
        modulepar UTF8String PX_SessionID := "pcscf.etsi.org;1317059245;52;21823490";

    
    	
        /** @desc	charstring, PIXIT item A-1/10

       The Origin-Host AVP (AVP Code 264) is of type DiameterIdentity, and
@@ -149,8 +141,6 @@ module DiameterRx_PIXITS
        */
        modulepar charstring PX_OriginHost := "origin.etsi.org";

    
    	
        /** @desc	charstring, PIXIT item A-1/11

       The Origin-Realm AVP (AVP Code 296) is of type DiameterIdentity;
@@ -161,8 +151,6 @@ module DiameterRx_PIXITS
        */
        modulepar charstring PX_OriginRealm := "etsi.org";

    
    	
        /** @desc	charstring, PIXIT item A-1/12

       The Destination-Host AVP (AVP Code 293) is of type DiameterIdentity;
@@ -177,8 +165,6 @@ module DiameterRx_PIXITS
        */
        modulepar charstring PX_DestinationHost := "destination.etsi.org";

    
    	
        /** @desc	charstring, PIXIT item A-1/13

       The Destination-Realm AVP (AVP Code 283) is of type DiameterIdentity,
+284 −319
Original line number Diff line number Diff line
@@ -9,10 +9,6 @@ module DiameterRx_Rx_TCFunctions {
	import from LibCommon_Sync {function f_selfOrClientSyncAndVerdict;
	    						const c_prDone, c_tbDone, c_poDone;}

	// LibSip
	import from LibSip_SIPTypesAndValues all;
	import from LibSip_PIXITS all;
	
	// LibDiameter
	import from LibDiameter_TypesAndValues all;
	import from LibDiameter_Templates all;
@@ -66,7 +62,6 @@ module DiameterRx_Rx_TCFunctions {

		} // end function f_TC_AF_IPS_01

			
        /*
        *  @desc	This is the test case function TC_AF_IPS_02
        *  @param
@@ -189,7 +184,6 @@ module DiameterRx_Rx_TCFunctions {

        } // end function f_TC_AF_MSI_01

                
          /*
        *  @desc	This is the test case function TC_AF_MSI
        *  @param
@@ -496,7 +490,6 @@ module DiameterRx_Rx_TCFunctions {
							(mw_mediaSubComponent_basic
							 (?,*,*,mw_flowUsage(AF_SIGNALLING_E),*,*,*,*))));

                               
            f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));

            //AF session for UE1
@@ -512,7 +505,6 @@ module DiameterRx_Rx_TCFunctions {
                            (mw_mediaSubComponent_basic
                             (?,*,*,mw_flowUsage(AF_SIGNALLING_E),*,*,*,*))));

                               
            f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));

            f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); //     sync
@@ -529,7 +521,6 @@ module DiameterRx_Rx_TCFunctions {

        } // end function f_TC_AF_SN_03

                
        /*
        *  @desc	This is the test case function TC_AF_SN_04
        *  @param
@@ -668,7 +659,6 @@ module DiameterRx_Rx_TCFunctions {

        } // end function f_TC_AF_SN_05

                
        /*
        *  @desc	This is the test case function TC_AF_SN_06
        *  @param
@@ -698,7 +688,6 @@ module DiameterRx_Rx_TCFunctions {
							(mw_mediaSubComponent_basic
							 (?,*,*,mw_flowUsage(AF_SIGNALLING_E),*,*,*,*))));

                               
            f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));

            //AF session for UE1
@@ -714,7 +703,6 @@ module DiameterRx_Rx_TCFunctions {
                            (mw_mediaSubComponent_basic
                             (?,*,*,mw_flowUsage(AF_SIGNALLING_E),*,*,*,*))));

                               
            f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));

            f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); //     sync
@@ -770,7 +758,6 @@ module DiameterRx_Rx_TCFunctions {

        } // end function f_TC_AF_TPE_01


	} //end group TP_AFRole

    group TP_PCRFRole {
@@ -786,7 +773,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); //     sync

                      
                    f_send_AAR(m_AAR_FIP_Media1(vc_sessionId, vc_originHost,
												vc_originRealm,
                    							vc_destinationRealm,
@@ -802,7 +788,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

@@ -840,7 +825,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

@@ -872,7 +856,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

@@ -892,7 +875,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); //     sync

                      
                    f_send_AAR(m_AAR_FIP_Media1(vc_sessionId, vc_originHost,
												vc_originRealm,
                    							vc_destinationRealm,
@@ -908,7 +890,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

@@ -949,13 +930,11 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

                } // end function f_TC_PCRF_MSI_02


        /*
        *  @desc	This is the test case function TC_PCRF_GRP_01
        *  @param
@@ -978,13 +957,11 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

                } // end function f_TC_PCRF_GRP_01


        /*
        *  @desc	This is the test case function TC_PCRF_ST_01
        *  @param
@@ -1007,7 +984,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

@@ -1047,7 +1023,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

@@ -1080,7 +1055,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

@@ -1113,7 +1087,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

@@ -1152,7 +1125,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

@@ -1196,7 +1168,6 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

@@ -1246,13 +1217,11 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

                } // end function f_TC_PCRF_SN_05


        /*
        *  @desc	This is the test case function TC_PCRF_TPE_01
        *  @param
@@ -1275,13 +1244,11 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

                } // end function f_TC_PCRF_TPE_01


        /*
        *  @desc	This is the test case function TC_PCRF_TPE_02
        *  @param
@@ -1310,13 +1277,11 @@ module DiameterRx_Rx_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync

				
                    f_postamble_AF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

                } // end function f_TC_PCRF_TPE_02


    } //end group TP_PCRFRole

} // end module DiameterRx_Rx_TCFunctions
+197 −203
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ module DiameterRx_Templates {
    import from DiameterRx_PIXITS all;



	
	group SubFields{

        template Media_Component_Number_AVP m_mediaComponentNr(UInt32 p_avpData) :=
@@ -260,7 +258,6 @@ module DiameterRx_Templates {
     	group SpecificAVPHeaders {


    
            template (value) Access_Network_Charging_Address_AVP m_accessNetworkChargingAddress(template (value) Address p_avpData) :=
            {
                aVP_Header := m_aVP_HeaderVid_Mbit1(c_access_Network_Charging_Address_AVP_Code, f_IPAdressLength(), c_vendId3gpp),
@@ -505,7 +502,6 @@ module DiameterRx_Templates {
            };



            template Sponsored_Connectivity_Data_AVP mw_sponsoredConnectivityData
    		  (template Sponsor_Identity_AVP p_sponsorIdentity,
    		   template Application_Service_Provider_Identity_AVP p_applicationServiceProviderId,
@@ -526,7 +522,6 @@ module DiameterRx_Templates {
          	}


          	
          	template Experimental_Result_Code_AVP mw_experimentalResultCode(template Experimental_Result_Type p_aVP_Data) := {
				//	Ref: 3GPP TS 29.229	6.2 Result-Code AVP values
					aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_experimental_Result_Code_AVP_Code),
@@ -545,7 +540,6 @@ module DiameterRx_Templates {
            }


            
        } //end group SpecificAVPHeaders
    } //end group HeaderFieldTemplates

Loading