fixing errors due to lib V3 and ttwb29 (4bae571f) · Commits · INT - Core Network and Interoperability Testing / Voice and Video over LTE / VxLTE Interoperability Tests

.project

+22 −0

Original line number	Diff line number	Diff line
		@@ -6,13 +6,35 @@
		<project>Abstract_Socket_CNL113384</project>
		</projects>
		<buildSpec>
		<buildCommand>
		<name>org.eclipse.jdt.core.javabuilder</name>
		<arguments>
		</arguments>
		</buildCommand>
		<buildCommand>
		<name>com.testingtech.ttworkbench.ttthree.modelBuilder</name>
		<arguments>
		</arguments>
		</buildCommand>
		<buildCommand>
		<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
		<arguments>
		</arguments>
		</buildCommand>
		<buildCommand>
		<name>com.testingtech.ttworkbench.ttthree.todoBuilder</name>
		<arguments>
		</arguments>
		</buildCommand>
		<buildCommand>
		<name>com.testingtech.ttworkbench.ttthree.tt3pluginbuilder</name>
		<arguments>
		</arguments>
		</buildCommand>
		</buildSpec>
		<natures>
		<nature>com.testingtech.ttworkbench.core.ttcn3nature</nature>
		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
		<nature>org.eclipse.jdt.core.javanature</nature>
		</natures>
		</projectDescription>

ttcn/AtsImsIot/AtsImsIot_Behavior.ttcn

+11 −4

Original line number	Diff line number	Diff line
		@@ -15,6 +15,13 @@ module AtsImsIot_Behavior {
		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
		@@ -33,7 +40,7 @@ module AtsImsIot_Behavior {
		};
		// LibDiameter
		import from LibDiameter_Templates all;
		import from DiameterRx_Templates all;
		// import from DiameterRx_Templates all;

		group checks {

		@@ -3407,8 +3414,8 @@ group checksTC_IMS_SS_0008 {
		var Via v_Via;
		var template Via vt_pcscfVia := {
		fieldName := VIA_E,
		viaBody := ({mw_ViaBody_interface(v_pcscfEutAUrl.hostPort), *},
		{mw_ViaBody_interface(v_pcscfEutAIpUrl.hostPort), *} )
		viaBody := ({mw_ViaBody_interface(v_pcscfEutAUrl.components.sip.hostPort), *},
		{mw_ViaBody_interface(v_pcscfEutAIpUrl.components.sip.hostPort), *} )
		};

		p_monitorCompRef.start(
		@@ -5049,7 +5056,7 @@ group checksTC_IMS_SHARE_0009 {
		mw_msrpSEND_toPath_fromPath_contentType(
		mw_toPath(v_toPath), // ToPath_header indicating the msrp_path from SDP attribute within SIP 200_response
		mw_fromPath(v_fromPath), // FromPath_header indicating the msrp_path from SDP attribute within SIP INVITE
		mw_contentType("text", "plain") // Content-Type_header indicating text/plain
		LibMsrp_Templates.mw_contentType("text", "plain") // Content-Type_header indicating text/plain
		)
		)
		},

ttcn/AtsImsIot/AtsImsIot_PIXITS.ttcn

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* @author STF 574
		* @version $Id$
		* @desc This module provides the module parameter
		*/

		module AtsImsIot_PIXITS
		{

		group SUT {

		group SUT_CONF {
		/**
		* @desc charstring for SUT/conference domain
		*/
		modulepar charstring PX_IMS_SUT_CONF_HOME_DOMAIN := "conf.sut.net";
		/**
		* @desc charstring for conference factory URI name
		*/
		modulepar charstring PX_IMS_SUT_CONF_FACTORY_NAME := "factory.uri.name";

		} // end group SUT_CONF

		} // end group SUT
		group TS {

		} // end group TS
		} // end module AtsImsIot_PIXITS

ttcn/AtsImsIot/AtsImsIot_Templates.ttcn

+52 −32

Original line number	Diff line number	Diff line
		@@ -29,6 +29,11 @@ module AtsImsIot_Templates {
		};
		import from LibSip_SIPTypesAndValues all;
		import from LibSip_Templates all;
		import from LibSip_Common {
		type
		GenericParam,
		SemicolonParam_List
		}
		import from LibMsrp_TypesAndValues {
		type
		SEND_request,
		@@ -45,7 +50,7 @@ module AtsImsIot_Templates {
		PX_IOT_MERGE_TOOL_PATH,
		PX_IOT_IFACES;
		}
		import from LibIms_PIXITS {
		import from AtsImsIot_PIXITS {
		modulepar
		PX_IMS_SUT_CONF_FACTORY_NAME, PX_IMS_SUT_CONF_HOME_DOMAIN
		};
		@@ -118,7 +123,11 @@ module AtsImsIot_Templates {
		template NAPTRmessage mw_EnumQuery_Base := {
		enumMessage := {
		query := {
		enumQuestion_list := ? length (1 .. infinity)
		header := ?,
		enumQuestion_list := ? length (1 .. infinity),
		enumResponse_list := *,
		authority_list := *,
		additional_list := *
		}
		}
		}
		@@ -175,7 +184,7 @@ module AtsImsIot_Templates {

		template GenericParam mw_User_Caps ( charstring p_rcseTags ) := {
		id := ?,
		paramValue := p_rcseTags
		paramValue := { quotedString := p_rcseTags }
		}
		}

		@@ -230,7 +239,7 @@ module AtsImsIot_Templates {
		*
		}
		},
		authorization := m_Authorization(mw_credentialIntegrityNo),
		authorization := mw_Authorization(mw_credentialIntegrityNo),
		securityClient := omit,
		securityVerify :=omit,
		pVisitedNetworkID := mw_PVisitedNetworkIDAny
		@@ -276,7 +285,7 @@ module AtsImsIot_Templates {
		{id := "orig-ioi", paramValue := ?},
		*
		}),
		authorization := m_Authorization(mw_credentialIntegrityYes),
		authorization := mw_Authorization(mw_credentialIntegrityYes),
		securityClient := omit,
		securityVerify :=omit,
		pVisitedNetworkID := mw_PVisitedNetworkIDAny
		@@ -312,7 +321,7 @@ module AtsImsIot_Templates {
		*
		}
		},
		authorization := m_Authorization(mw_credentialIntegrityIpAssocPending),
		authorization := mw_Authorization(mw_credentialIntegrityIpAssocPending),
		securityClient := omit,
		securityVerify :=omit,
		pVisitedNetworkID := mw_PVisitedNetworkIDAny
		@@ -332,7 +341,7 @@ module AtsImsIot_Templates {
		{id := "orig-ioi", paramValue := ?},
		*
		}),
		authorization := m_Authorization(mw_credentialIntegrityIpAssocYes),
		authorization := mw_Authorization(mw_credentialIntegrityIpAssocYes),
		securityClient := omit,
		securityVerify :=omit,
		pVisitedNetworkID := mw_PVisitedNetworkIDAny
		@@ -345,7 +354,7 @@ module AtsImsIot_Templates {
		*/
		template REGISTER_Request mdw_TP_IMS_5089_01_ic_when modifies mw_REGISTER_Request_Base := {
		msgHeader := {
		authorization := m_Authorization(mw_credentialIntegrityNo)
		authorization := mw_Authorization(mw_credentialIntegrityNo)
		}
		}

		@@ -355,7 +364,7 @@ module AtsImsIot_Templates {
		*/
		template REGISTER_Request mdw_TP_IMS_5089_02_ic_when modifies mw_REGISTER_Request_Base := {
		msgHeader := {
		authorization := m_Authorization(mw_credentialIntegrityIpAssocPending)
		authorization := mw_Authorization(mw_credentialIntegrityIpAssocPending)
		}
		}

		@@ -365,7 +374,7 @@ module AtsImsIot_Templates {
		*/
		template REGISTER_Request mdw_TP_IMS_5092_01_ic_when modifies mw_REGISTER_Request_Base := {
		msgHeader := {
		authorization := m_Authorization(mw_credentialIntegrityNo)
		authorization := mw_Authorization(mw_credentialIntegrityNo)
		}
		}

		@@ -431,7 +440,7 @@ module AtsImsIot_Templates {
		},
		msgHeader := {
		fromField := mw_From (p_eutAUri),
		toField := mw_To_NameAddr_SipUrl (p_EUTB_PublicId, ?, ?),
		toField := mw_To_NameAddr_SipUrl ({quotedString:=p_EUTB_PublicId}, ?, ?),
		event := m_Event_reg,
		expires := ?, // checked outside the template
		pAssertedID := mw_PAssertedID(mw_PAssertedIDValue(p_eutAUri)),
		@@ -1967,7 +1976,7 @@ module AtsImsIot_Templates {
		}

		template REGISTER_Request mdw_TP_IMS_5088_01_gm modifies mw_REGISTER_Request_Base := {
		msgHeader := {authorization := m_Authorization(mw_credentialIntegrityYes)}
		msgHeader := {authorization := mw_Authorization(mw_credentialIntegrityYes)}
		}

		template NOTIFY_Request mdw_TP_IMS_5088_01_ic(template CallId p_callId, template SipUrl p_PCSCF_SIP_URI) modifies mw_NOTIFY_Request_Base := {
		@@ -2178,10 +2187,10 @@ module AtsImsIot_Templates {
		displayName := *,
		addrSpec := {
		scheme := "sip",
		components := {sip := {
		userInfo := *,
		hostPort := {
		host := p_Host,
		portField := *},
		hostPort := {host := p_Host,portField := *}
		}},
		urlParameters := *,
		headers := omit}
		},
		@@ -2196,6 +2205,7 @@ module AtsImsIot_Templates {

		template PChargingVector mw_PChargingVector (template SemicolonParam_List p_List) := {
		fieldName := P_CHARGING_VECTOR_E,
		icidValue := ?,
		chargeParams := p_List
		} // template

		@@ -2237,7 +2247,7 @@ module AtsImsIot_Templates {
		{id := "autn", paramValue := ?},
		{id := "ik", paramValue := ?},
		{id := "ck", paramValue := ?},
		{id := "algorithm", paramValue := "AKAv1-MD5"},
		{id := "algorithm", paramValue := { quotedString := "AKAv1-MD5" }},
		*}

		}
		@@ -2250,7 +2260,7 @@ module AtsImsIot_Templates {
		{id := "realm", paramValue := ?}, // TODO containing operator ID
		{id := "nonce", paramValue := ?},
		{id := "qop", paramValue := ?},
		{id := "algorithm", paramValue := "MD5"},
		{id := "algorithm", paramValue := { quotedString := "MD5" }},
		*}

		}
		@@ -2264,7 +2274,7 @@ module AtsImsIot_Templates {
		acRcParams := {
		{
		id := "Video Sharing Feature Tag",
		paramValue := "+g.3gpp.cs-voice"
		paramValue := {quotedString:="+g.3gpp.cs-voice"}
		}
		}
		}
		@@ -2280,7 +2290,7 @@ module AtsImsIot_Templates {
		contactParams := {
		{
		id := "Video Sharing Feature Tag",
		paramValue := "+g.3gpp.cs-voice"
		paramValue := {quotedString:="+g.3gpp.cs-voice"}
		}
		}
		}
		@@ -2294,21 +2304,24 @@ module AtsImsIot_Templates {
		group AuxiliaryInformationElementTemplates {

		template Credentials mw_credentialIntegrityYes := {
		otherResponse := {authScheme := ?, authParams := { {"integrity-protected", "yes"},*} // TODO
		otherResponse := {authScheme := ?, authParams := { {"integrity-protected", {quotedString:="yes"}},*} // TODO
		}}

		template Credentials mw_credentialIntegrityNo := {
		otherResponse := {authScheme := ?, authParams := { {"integrity-protected", "no"},*} // TODO
		otherResponse := {authScheme := ?, authParams := { {"integrity-protected", {quotedString:="no"}},*} // TODO
		}}

		template Credentials mw_credentialIntegrityIpAssocPending := {
		otherResponse := {
		authScheme := ?,
		authParams := {
		complement ({"integrity-protected", "no"},{"integrity-protected", "yes"},{"integrity-protected", "ip-assoc-yes"}), *//alowed parameters are {"integrity-protected" id with "ip-assoc-pending" value or no "integrity-protected" id}
		complement ({"integrity-protected", {quotedString:="no"}},{"integrity-protected", {quotedString:="yes"}},{"integrity-protected", {quotedString:="ip-assoc-yes"}}), * //alowed parameters are {"integrity-protected" id with "ip-assoc-pending" value or no "integrity-protected" id}
		}
		}
		}

		template Credentials mw_credentialIntegrityIpAssocYes := {
		otherResponse := {authScheme := ?, authParams := { {"integrity-protected", "ip-assoc-yes"},*} // TODO
		otherResponse := {authScheme := ?, authParams := { {"integrity-protected", {quotedString:="ip-assoc-yes"}},*} // TODO
		}}

		template RouteBody mw_routeBodyTH (template SipUrl p_sipurl):= {
		@@ -2330,24 +2343,31 @@ module AtsImsIot_Templates {

		template SipUrl mw_SIP_URI_Base := {
		scheme := "sip", // meaning "not tel"
		components := { sip := {
		userInfo := ?,
		hostPort := ?,
		hostPort := ?
		}
		},
		urlParameters := *,
		headers := *
		}

		template SipUrl mw_TEL_URI_Base := {
		scheme := "tel",
		userInfo := ?,
		hostPort := *,
		components := { tel := {
		subscriber := ?
		}
		},
		urlParameters := *,
		headers := *
		}

		template SipUrl mw_SIP_URI_ConfFactory
		modifies mw_SIP_URI_Base := {
		components := { sip := {
		userInfo := {userOrTelephoneSubscriber:=PX_IMS_SUT_CONF_FACTORY_NAME, password:=*},
		hostPort := {host := PX_IMS_SUT_CONF_HOME_DOMAIN, portField := *}
		} }
		}

		} //end group

LibCommon @ 22cc04e3

Original line number	Diff line number	Diff line
		Subproject commit 21bad7c51917d19bebdff5b36983e22922421976
		Subproject commit 22cc04e32b0e37f70a7df30df12727a6546e2916