Commit 94229bc5 authored by berge's avatar berge
Browse files

Various adjustments

parent e949af4f
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -987,7 +987,8 @@ group checksTC_IMS_CALL_0001 {
		   var charstring v_EUT_A_Addr := f_GetEUTScscfAddress(PX_EUT_A);
	       p_monitorCompRef.start(
        	f_imsIot_receive(
                {mw_SipRequest(mdw_TP_IMS_5097_01_mw(mw_SipUrl_Host(v_EUT_A_Addr)))},
                {mw_SipRequest(mdw_TP_IMS_5097_01_mw((mw_SipUrl_Host(v_EUT_A_Addr),
															 		mw_SipUrl_Host(f_GetEUTScscfIpAddress(PX_EUT_A))) ))},
                {},
                {0, omit},
                "TP_IMS_5097_01",
+16 −18
Original line number Diff line number Diff line
@@ -348,22 +348,17 @@ module AtsImsIot_Templates {
	  * 
	  * @desc BYE Request checking TP_IMS_5052_01 on MW
	  */
	template BYE_Request mdw_TP_IMS_5052_01_f_mw(template CallId p_callId, template SipUrl p_pcscfEutAUri)
	template BYE_Request mdw_TP_IMS_5052_01_mw(template CallId p_callId, template SipUrl p_pcscfEutAUri, template RecordRoute p_route)
	 modifies mw_BYE_Request_Base := {
	  msgHeader := {
		route := {
			fieldName := ROUTE_E,
			routeBody := {
				mw_routeBody(p_pcscfEutAUri),
				*, 
				complement(mw_routeBody(p_pcscfEutAUri)),
				*
			}
		}
	  }
	}
	
	template BYE_Request mdw_TP_IMS_5052_01_p_mw(template CallId p_callId, template RecordRoute p_route)
	modifies mw_BYE_Request_Base := {
		msgHeader := {
		},
		recordRoute := p_route
	  }
	}
@@ -407,7 +402,10 @@ module AtsImsIot_Templates {
	template INVITE_Request mdw_TP_IMS_5067_01_mw 
	 modifies mw_INVITE_Request_Base := {
    	msgHeader := {
			pChargingVector := ?
			pChargingVector :=  mw_PChargingVector({
				{id := "access-network-charging-info", paramValue := ?}, 
				*
			})
    	}
	}
    
@@ -475,14 +473,14 @@ module AtsImsIot_Templates {
    template INVITE_Request mdw_TP_IMS_5097_01_mw (template SipUrl p_SCSCF_SIP_URI)
     modifies mw_INVITE_Request_Base := {
      msgHeader := {
		route := {
		route := ({
			fieldName := ROUTE_E,
			routeBody := {
				*, 
				complement(mw_routeBody(p_SCSCF_SIP_URI)),
				*
			}
		},
		}, omit),
      	recordRoute := {
    		fieldName := RECORD_ROUTE_E,
    		routeBody := {mw_routeBody(p_SCSCF_SIP_URI), *}       		
@@ -517,9 +515,9 @@ module AtsImsIot_Templates {
			fieldName := P_ASSERTED_ID_E,
			pAssertedIDValueList := {
				*, 
				{ nameAddr := mw_NameAddr(p_SIP_URI)}, 
				({ nameAddr := mw_NameAddr(p_SIP_URI)}, {addrSpecUnion := mw_SIP_URI_Base}),  
				*, 
				{nameAddr := mw_NameAddr(p_TEL_URI)},
				({nameAddr := mw_NameAddr(p_TEL_URI)}, {addrSpecUnion := mw_TEL_URI_Base}), 
				*
			}
		}			        
@@ -1338,7 +1336,7 @@ module AtsImsIot_Templates {
      template CallId p_callId
    ) modifies mw_MESSAGE_Request_Base := {
       requestLine := { 
       		requestUri := mw_TEL_URI_Base 
       		requestUri := mw_SIP_URI_Base 
       	},
       	msgHeader := {
       		pChargingVector := {
@@ -1360,8 +1358,8 @@ module AtsImsIot_Templates {
            pAssertedID := {
                fieldName := P_ASSERTED_ID_E,
                pAssertedIDValueList := {
                    {nameAddr := mw_NameAddr(p_SIP_URI)}, 
                    {nameAddr := mw_NameAddr(p_TEL_URI)},
                    ({nameAddr := mw_NameAddr(p_SIP_URI)}, {addrSpecUnion := mw_SIP_URI_Base}), 
                    ({nameAddr := mw_NameAddr(p_TEL_URI)}, {addrSpecUnion := mw_TEL_URI_Base}),
                    *
                }
            }
+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ module AtsImsIot_TestConfiguration {
					}
					[] tc_configureGuard.timeout {
						log("**** TC_IMS_MESS_0001: StopTrafficCaptureReq not answered. ****");
						setverdict (inconc);
						//setverdict (inconc);
					}
				} 
				f_cf_monitor_down(p_config.gmA);
+40 −8
Original line number Diff line number Diff line
@@ -113,10 +113,26 @@ module LibIot_PIXITS {
					interfaceInfo	:= {
						IpInterfaceInfo	:= {
							{
								domainName :=	"as.ericsson.etsi",
								domainName :=	"telephonyas.ericsson.etsi",
								IpAddress	:= "192.86.1.109",
								portNumbers	:= {}
							},
							{
								domainName :=	"presenceas.ericsson.etsi",
								IpAddress	:= "192.86.1.106",
								portNumbers	:= {}
							},
							{
								domainName :=	"mtasout.ericsson.etsi",
								IpAddress	:= "0.0.0.0",
								portNumbers	:= {}
							},
							{
								domainName :=	"scscf.ericsson.etsi",
								IpAddress	:= "192.86.1.99",
								portNumbers	:= {5060}
							}
							
						}
					}
				}
@@ -288,6 +304,11 @@ module LibIot_PIXITS {
								domainName :=	"scscf.nsn.etsi",
								IpAddress	:= "10.10.1.67",
								portNumbers	:= {5090}
							},
							{
								domainName :=	"pcscf-mw.nsn.etsi",
								IpAddress	:= "10.10.1.67",
								portNumbers	:= {5070}
							}
						}
					}
@@ -474,6 +495,11 @@ module LibIot_PIXITS {
								domainName :=	"stech.iskratel.etsi",
								IpAddress	:= "10.10.14.18",
								portNumbers	:= {5090}
							},
							{
								domainName :=	"stech.iskratel.etsi",
								IpAddress	:= "10.10.14.6",
								portNumbers	:= {5090}
							}							
						}
					}
@@ -486,7 +512,13 @@ module LibIot_PIXITS {
								domainName :=	"astech.iskratel.etsi",
								IpAddress	:= "10.10.14.30",
								portNumbers	:= {5060}
							},
							{
								domainName :=	"stech.iskratel.etsi",
								IpAddress	:= "10.10.14.6",
								portNumbers	:= {5090}
							}							
							
						}
					}
				}
@@ -763,7 +795,7 @@ module LibIot_PIXITS {
						IpInterfaceInfo	:= {
							{
								domainName :=	"pcscf.hutaro.etsi",
								IpAddress	:= "0.0.0.0",
								IpAddress	:= "10.10.9.26",
								portNumbers	:= {5060}
							},
							{
@@ -815,12 +847,12 @@ module LibIot_PIXITS {
						IpInterfaceInfo	:= {
							{
								domainName :=	"pcscf.hutaro.etsi",
								IpAddress	:= "0.0.0.0",
								IpAddress	:= "10.10.9.26",
								portNumbers	:= {5060}
							},
							{
								domainName :=	"icscf.hutaro.etsi",
								IpAddress	:= "0.0.0.0",
								IpAddress	:= "10.10.9.10",
								portNumbers	:= {5080}
							},
							{
@@ -905,7 +937,7 @@ module LibIot_PIXITS {
	 * 
	 * @desc Selects product based on	index	in PX_PRODCUTS vendor	list for EUT_B
	 */
	modulepar	integer	PX_EUT_B :=	2;
	modulepar	integer	PX_EUT_B := 5;
	
	/**
	 * 
@@ -942,7 +974,7 @@ module LibIot_PIXITS {
		 * @desc
		 *		 In	case of	offline	mode,	it defines the path where all sessions's Pcap files are located.
		 */
		modulepar	charstring PX_IOT_PCAP_SESSIONS_PATH :=	"c:/Captures/Result/MS1 Sun Morning 1"; // Do not forget to upgrade PX_EUT_A and PX_EUT_B
		modulepar	charstring PX_IOT_PCAP_SESSIONS_PATH :=	"c:/Captures/Result/MS4 Mon Afternoon 2"; // Do not forget to upgrade PX_EUT_A and PX_EUT_B
		
		/**
		 * @desc