Commit 060f14be authored by poglitsch's avatar poglitsch
Browse files

complement corrected

parent 106e0d0b
Loading
Loading
Loading
Loading
+18 −1
Original line number Diff line number Diff line
@@ -1720,9 +1720,26 @@ group checksTC_IMS_SS_0007 {
	    	boolean p_checkMessage
	    ) runs on ImsTestCoordinator {
		   var charstring v_EUT_A_Addr := f_GetEUTScscfAddress(PX_EUT_A);
           
           p_monitorCompRef.start(
            f_imsIot_receive(
                {},
                {
                	mw_SipRequest(mdw_TP_IMS_5097_05f_mw(*, mw_SipUrl_Host(v_EUT_A_Addr))), 
                	mw_SipRequest(mw_MESSAGE_Request_Base(*))
                },
                {0, omit},
                "TP_IMS_5097_05",
                false,
                true
            )
           );
           p_monitorCompRef.done;
           
           
           p_monitorCompRef.start(
            f_imsIot_receive(
                {mw_SipRequest(mdw_TP_IMS_5097_05_mw(*, mw_SipUrl_Host(v_EUT_A_Addr)))},
                {mw_SipRequest(mdw_TP_IMS_5097_05p_mw(*, mw_SipUrl_Host(v_EUT_A_Addr)))},
                {mw_SipRequest(mw_MESSAGE_Request_Base(*))},
                {0, omit},
                "TP_IMS_5097_05",
+27 −18
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ module AtsImsIot_Templates {
      }
    }
    
    template MESSAGE_Request mdw_TP_IMS_5097_05_mw(
    template MESSAGE_Request mdw_TP_IMS_5097_05p_mw(
    	template CallId p_callId,
    	template SipUrl p_SCSCF_SIP_URI
    ) modifies mw_MESSAGE_Request_Base := {
@@ -488,7 +488,6 @@ module AtsImsIot_Templates {
            route := {
                fieldName := ROUTE_E,
                routeBody := {
                	*, 
                	complement(mw_routeBody(p_SCSCF_SIP_URI)),
                	*
                }
@@ -496,14 +495,32 @@ module AtsImsIot_Templates {
            pChargingVector := {
                fieldName := P_CHARGING_VECTOR_E,
                chargeParams := {
                    *,
                    {id := "icid-value", paramValue := ?},
                    *,
                    {id := "orig-ioi", paramValue := ?},
                    *,
                    complement({id := "term-ioi", paramValue := ?}),
                    *,
                    complement({id := "access-network-charging-info", paramValue := ?}),
                    *
                }
            },
            pAccessNetworkInfo := omit
        }
    }
    
    template MESSAGE_Request mdw_TP_IMS_5097_05f_mw(
    	template CallId p_callId,
    	template SipUrl p_SCSCF_SIP_URI
    ) modifies mw_MESSAGE_Request_Base := {
        msgHeader := {
            route := {
                fieldName := ROUTE_E,
                routeBody := {
                	complement(mw_routeBody(p_SCSCF_SIP_URI)),
                	*
                }
            },
            pChargingVector := {
                fieldName := P_CHARGING_VECTOR_E,
                chargeParams := {
                    {id := "term-ioi", paramValue := ?},
                    {id := "access-network-charging-info", paramValue := ?},
                    *
                }
            },
@@ -527,7 +544,6 @@ module AtsImsIot_Templates {
       		pChargingVector := {
	           fieldName := P_CHARGING_VECTOR_E,
	           chargeParams := {
                    *, 
                    complement({id := "access-network-charging-info", paramValue := ?}),
		            *
	           }
@@ -544,9 +560,7 @@ module AtsImsIot_Templates {
            pAssertedID := {
                fieldName := P_ASSERTED_ID_E,
                pAssertedIDValueList := {
                    *, 
                    {nameAddr := mw_NameAddr(p_SIP_URI)}, 
                    *, 
                    {nameAddr := mw_NameAddr(p_TEL_URI)},
                    *
                }
@@ -559,7 +573,6 @@ module AtsImsIot_Templates {
	        pChargingVector := {
	           fieldName := P_CHARGING_VECTOR_E,
	           chargeParams := {
                    *, 
                    complement({id := "access-network-charging-info", paramValue := ?}),
		            *
	           }
@@ -572,9 +585,7 @@ module AtsImsIot_Templates {
	        pAssertedID := {
                fieldName := P_ASSERTED_ID_E,
                pAssertedIDValueList := {
                    *, 
                    {nameAddr := mw_NameAddr(mw_SIP_URI_Base)}, 
                    *, 
                    {nameAddr := mw_NameAddr(mw_TEL_URI_Base)},
                    *
                }
@@ -587,9 +598,7 @@ module AtsImsIot_Templates {
	        pChargingVector := {
	           fieldName := P_CHARGING_VECTOR_E,
	           chargeParams := {
                   	*,
	                {id := "orig-ioi", paramValue := ?},
	                *,
	                {id := "term-ioi", paramValue := ?},
	                *
	           }