naming for templates aligned to naming conventions (c0fd7a91) · Commits · INT - Core Network and Interoperability Testing / IMS / IMS_IOT

AtsImsIot/AtsImsIot_Behavior.ttcn

+1 −4

Original line number	Diff line number	Diff line
		@@ -11,9 +11,6 @@ module AtsImsIot_Behavior {

		import from AtsImsIot_TypesAndValues {type SipMessage, SipMessageList;}

		import from AtsImsIot_Functions {function f_getHostname, f_getUEHostname;}

		import from Interface_configuration {modulepar PX_EUT_A, PX_EUT_B;}

		import from LibIms_ConfigAndTrigger {type ImsUserInfo;}

AtsImsIot/AtsImsIot_Templates.ttcn

+25 −34

Original line number	Diff line number	Diff line
		@@ -12,15 +12,6 @@ module AtsImsIot_Templates {

		import from LibSip_Templates all;

		import from LibSip_Templates {
		template mw_ACK_Request_Base,
		mw_INVITE_Request_Base,
		mw_MESSAGE_Request_Base,
		mw_NOTIFY_Request_Base,
		mw_REGISTER_Request_Base,
		mw_SUBSCRIBE_Request_Base,
		mw_Response_Base;
		}

		group sipTemplates {

		@@ -70,18 +61,18 @@ module AtsImsIot_Templates {
		// template REGISTER_Request mdw_TP_IMS_5011_01_mw ( charstring p_EUTHostname ) modifies mw_REGISTER_Request_Base := {
		template Request mdw_TP_IMS_5011_01_mw ( charstring p_EUTHostname ) modifies mw_REGISTER_Request_Base := {
		msgHeader := {
		path := h_PathDef (p_EUTHostname),
		require := h_Require ({"path", *}),
		pChargingVector := h_PChargingVector({
		path := mw_PathDef (p_EUTHostname),
		require := mw_Require ({"path", *}),
		pChargingVector := mw_PChargingVector({
		{id := "icid", paramValue := *},
		{id := "orig", paramValue := *},
		{id := "term", paramValue := *},
		*
		}),
		authorization := m_Authorization(ie_credentialIntegrityNo),
		authorization := m_Authorization(mw_credentialIntegrityNo),
		securityClient := omit,
		securityVerify :=omit,
		pVisitedNetworkID := h_PVisitedNetworkIDAny
		pVisitedNetworkID := mw_PVisitedNetworkIDAny
		}
		}

		@@ -92,18 +83,18 @@ module AtsImsIot_Templates {
		// template REGISTER_Request mdw_TP_IMS_5011_02_mw ( charstring p_EUTHostname ) modifies mw_REGISTER_Request_Base := {
		template Request mdw_TP_IMS_5011_02_mw ( charstring p_EUTHostname ) modifies mw_REGISTER_Request_Base := {
		msgHeader := {
		path := h_PathDef (p_EUTHostname),
		require := h_Require ({"path", *}),
		pChargingVector := h_PChargingVector({
		path := mw_PathDef (p_EUTHostname),
		require := mw_Require ({"path", *}),
		pChargingVector := mw_PChargingVector({
		{id := "icid", paramValue := *},
		{id := "orig-ioi", paramValue := *},
		{id := "term-ioi", paramValue := *},
		*
		}),
		authorization := m_Authorization(ie_credentialIntegrityYes),
		authorization := m_Authorization(mw_credentialIntegrityYes),
		securityClient := omit,
		securityVerify :=omit,
		pVisitedNetworkID := h_PVisitedNetworkIDAny
		pVisitedNetworkID := mw_PVisitedNetworkIDAny
		}
		}

		@@ -113,8 +104,8 @@ module AtsImsIot_Templates {
		*/
		template Response mdw_TP_IMS_5092_01_mw (template SipUrl p_eutBUri )modifies mw_200OK_Base := {
		msgHeader := {
		pAssociatedURI := m_PAssociatedURI,
		serviceRoute := h_ServiceRoute (p_eutBUri)
		pAssociatedURI := mw_PAssociatedURI,
		serviceRoute := mw_ServiceRoute (p_eutBUri)
		}
		}
		/**
		@@ -123,7 +114,7 @@ module AtsImsIot_Templates {
		*/
		template Response mdw_TP_IMS_5089_01_mw modifies mw_401Unauthorized_Base := {
		msgHeader := {
		wwwAuthenticate := h_WwwAuthenticate
		wwwAuthenticate := mw_WwwAuthenticate
		}
		}

		@@ -150,7 +141,7 @@ module AtsImsIot_Templates {
		event := m_Event_reg,
		expires := ?, // to be checked outside the template
		pAssertedID := mw_PAssertedID(mw_PAssertedIDValue(p_eutAUri)),
		pChargingVector := h_PChargingVector({
		pChargingVector := mw_PChargingVector({
		{id := "icid", paramValue := *},
		*
		})
		@@ -227,7 +218,7 @@ module AtsImsIot_Templates {
		}//end group
		group HeaderTemplates {

		template Path h_PathDef (charstring p_Host) := {
		template Path mw_PathDef (charstring p_Host) := {
		fieldName := PATH_E,
		pathValues := {{
		nameAddr:= {
		@@ -245,17 +236,17 @@ module AtsImsIot_Templates {
		}}
		} // template

		template Require h_Require (template OptionTag_List p_optionsList) := {
		template Require mw_Require (template OptionTag_List p_optionsList) := {
		fieldName := REQUIRE_E,
		optionsTags := p_optionsList
		} // template

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

		template ServiceRoute h_ServiceRoute (template SipUrl p_eutAddr) := {
		template ServiceRoute mw_ServiceRoute (template SipUrl p_eutAddr) := {
		fieldName := SERVICE_ROUTE_E,
		routeBody := {
		{
		@@ -271,12 +262,12 @@ module AtsImsIot_Templates {



		template PVisitedNetworkID h_PVisitedNetworkIDAny := {
		template PVisitedNetworkID mw_PVisitedNetworkIDAny := {
		fieldName := P_VISITED_NETWORK_E,
		vNetWorkSpec := ?
		} // template

		template PAssociatedURI m_PAssociatedURI :=
		template PAssociatedURI mw_PAssociatedURI :=
		{
		fieldName := P_ASSOCIATED_URI_E,
		nameAddrList:= {
		@@ -289,7 +280,7 @@ module AtsImsIot_Templates {
		*
		}
		}
		template WwwAuthenticate h_WwwAuthenticate := {
		template WwwAuthenticate mw_WwwAuthenticate := {
		fieldName := WWW_AUTHENTICATE_E,
		challenge := {
		digestCln := { {id := "username", paramValue := ?},
		@@ -310,10 +301,10 @@ module AtsImsIot_Templates {

		group AuxiliaryInformationElementTemplates {

		template Credentials ie_credentialIntegrityYes := {
		template Credentials mw_credentialIntegrityYes := {
		otherResponse := {authScheme := "IntegrityYes", authParams := *} // TODO
		}
		template Credentials ie_credentialIntegrityNo := {
		template Credentials mw_credentialIntegrityNo := {
		otherResponse := {authScheme := "IntegrityNo", authParams := *} // TODO
		}

		@@ -333,5 +324,5 @@ module AtsImsIot_Templates {
		}

		} // end group

		}//end module

AtsImsIot/AtsImsIot_TestCases.ttcn

+2 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,8 @@ module AtsImsIot_TestCases {
		f_cf_monitor_down(v_mw);
		}



		/**
		* @desc IMS network supports network initiated re-registration
		* upon receipt of a new registration with new contact information

Admin message