move unneeded DX request templates (3d710296) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterCxDx

DiameterCxDx/ttcn/DiameterCxDx_Dx_TCFunctions.ttcn3

+37 −7

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ module DiameterCxDx_Dx_TCFunctions {

		f_send_UAR(m_UAR_Msg(
		vc_sessionId,
		m_UAR_Dx(
		m_UAR_basic(
		vc_originHost,
		vc_originRealm,
		vc_destinationRealm,
		@@ -76,13 +76,14 @@ module DiameterCxDx_Dx_TCFunctions {

		f_send_SAR(m_SAR_Msg(
		vc_sessionId,
		m_SAR_Dx(
		m_SAR_withUserNameAndPID(
		vc_originHost,
		vc_originRealm,
		vc_destinationRealm,
		vc_serverName,
		m_serverAssignmentType(UNREGISTERED_USER_E),
		m_userDataAlreadyAvailable(USER_DATA_NOT_AVAILABLE_E),
		omit,
		vc_publicIdentity
		)
		));
		@@ -111,7 +112,7 @@ module DiameterCxDx_Dx_TCFunctions {

		f_send_LIR(m_LIR_Msg(
		vc_sessionId,
		m_LIR_Dx(
		m_LIR_basic(
		vc_originHost,
		vc_originRealm,
		vc_destinationRealm,
		@@ -137,20 +138,20 @@ module DiameterCxDx_Dx_TCFunctions {
		function f_TC_DX_SLF_MA_01()
		runs on DiameterCx {

		f_preamble_SCSCF();
		f_preambleDx_SCSCF();

		f_selfOrClientSyncAndVerdict( c_prDone, f_getVerdict() ); // sync - preamble done

		f_send_MAR(m_MAR_Msg(
		vc_sessionId,
		m_MAR_Dx(
		m_MAR_withServerName(
		vc_originHost,
		vc_originRealm,
		vc_destinationRealm,
		vc_userName,
		vc_publicIdentity,
		m_sIPNumberAuthItems(1),
		m_sIPAuthDataItem_dummy,
		m_sIPAuthDataItem_dummy, //TODO: Set real data here
		vc_serverName
		)
		));
		@@ -161,7 +162,7 @@ module DiameterCxDx_Dx_TCFunctions {

		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync - postamble done

		f_postamble_SCSCF();
		f_postambleDx_SCSCF();

		} // end function f_TC_DX_SLF_MA_01
		} // group TP_SLFRole_MA
		@@ -169,6 +170,35 @@ module DiameterCxDx_Dx_TCFunctions {

		group TP_CSCFRole{ // §5.2.1.2
		group TP_CSCFRole_UA {//Dx UA
		/*
		* @desc This is the test case function TC_DX_SLF_UA_01
		* @param
		*/
		function f_TC_DX_CSCF_UA_01()
		runs on DiameterCx {

		f_preamble_SLF();

		f_selfOrClientSyncAndVerdict( c_prDone, f_getVerdict() ); // sync - preamble done

		//TODO: send UE registration

		// wait for UAR
		f_awaiting_UAR( mw_UAR_Msg( ?, ?));

		// fill UAA
		f_send_UAA(m_UAA_Msg(vc_sessionId,
		m_UAA_Dx(vc_originHost, vc_originRealm,
		m_resultCode(DIAMETER_REDIRECT_INDICATION_E), omit,
		m_redirectHost(PX_DIAMETER_CX_ETS_HSS_IPADDR))));

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

		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync - postamble done

		f_postambleDx_SLF();

		} // end function f_TC_DX_SLF_UA_01
		} // group TP_CSCFRole_UA
		group TP_CSCFRole_SA {//Dx SA
		} // group TP_CSCFRole_SA

DiameterCxDx/ttcn/DiameterCxDx_Templates.ttcn

+47 −56

Original line number	Diff line number	Diff line
		@@ -91,6 +91,12 @@ module DiameterCxDx_Templates {
		aVP_Data := p_avpData
		}

		template (value) Redirect_Host_AVP m_redirectHost(template (value) Diameter_Identity p_avpData) :=
		{
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_redirect_Host_AVP_Code, lengthof(p_avpData), omit),
		aVP_Data := p_avpData
		}

		}//end group sendingTemplatesForAVPs
		group awaitingTemplatesForAVPs{
		template Redirect_Host_AVP mw_redirectHost(template (present) Diameter_Identity p_avpData) :=
		@@ -978,6 +984,32 @@ module DiameterCxDx_Templates {
		uAR_Flags := p_uAR_Flags
		}

		template (value) SAR_Body_AVP m_SAR_withUserNameAndPID( template (omit) Origin_Host_AVP p_originHost,
		template (omit) Origin_Realm_AVP p_originRealm,
		template (omit) Destination_Realm_AVP p_destinationRealm,
		template (omit) Server_Name_AVP p_serverName,
		template (omit) Server_Assignment_Type_AVP p_serverAssignmentType,
		template (omit) User_Data_Already_Available_AVP p_userDataAlreadyAvailable,
		template (omit) User_Name_AVP p_userName,
		template (value)Public_Identity_AVP p_publicIdentity
		)
		modifies m_SAR_basic := {
		user_Name := p_userName,
		public_Identity := {p_publicIdentity}
		}

		template (value) MAR_Body_AVP m_MAR_withServerName( template (omit) Origin_Host_AVP p_originHost,
		template (omit) Origin_Realm_AVP p_originRealm,
		template (omit) Destination_Realm_AVP p_destinationRealm,
		template (omit) User_Name_AVP p_userName,
		template (omit) Public_Identity_AVP p_publicIdentity,
		template (omit) SIP_Number_Auth_Items_AVP p_SIPNumberAuthItems,
		template (omit) SIP_Auth_Data_Item_AVP p_SIPAuthDataItem,
		template (omit) Server_Name_AVP p_serverName
		)
		modifies m_MAR_basic := {
		server_Name := p_serverName
		}
		} // end group CxModified_request_templates_send

		group Cx_modified_request_templates_receive {
		@@ -1017,14 +1049,6 @@ module DiameterCxDx_Templates {

		group Dx_modified_temlates {
		group Dx_modified_templates_send {
		template (value) UAR_Body_AVP m_UAR_Dx( template (omit) Origin_Host_AVP p_originHost,
		template (omit) Origin_Realm_AVP p_originRealm,
		template (omit) Destination_Realm_AVP p_destinationRealm,
		template (omit) User_Name_AVP p_userName,
		template (omit) Public_Identity_AVP p_public_Identity,
		template (omit) Visited_Network_Id_AVP p_visited_Network_Id)
		modifies m_UAR_basic := {}

		template (value) UAA_Body_AVP m_UAA_Dx( template (omit) Origin_Host_AVP p_originHost,
		template (omit) Origin_Realm_AVP p_originRealm,
		template (omit) Result_Code_AVP p_resultCode,
		@@ -1035,19 +1059,6 @@ module DiameterCxDx_Templates {
		redirect_Host := p_redirectHost
		}

		template (value) SAR_Body_AVP m_SAR_Dx( template (omit) Origin_Host_AVP p_originHost,
		template (omit) Origin_Realm_AVP p_originRealm,
		template (omit) Destination_Realm_AVP p_destinationRealm,
		template (omit) Server_Name_AVP p_serverName,
		template (omit) Server_Assignment_Type_AVP p_serverAssignmentType,
		template (omit) User_Data_Already_Available_AVP p_userDataAlreadyAvailable,
		template (value)Public_Identity_AVP p_publicIdentity
		)
		modifies m_SAR_basic := {
		user_Name := omit,
		public_Identity := {p_publicIdentity}
		}

		template (value) SAA_Body_AVP m_SAA_Dx( template (omit) Origin_Host_AVP p_originHost,
		template (omit) Origin_Realm_AVP p_originRealm,
		template (omit) Result_Code_AVP p_resultCode,
		@@ -1058,13 +1069,6 @@ module DiameterCxDx_Templates {
		redirect_Host := p_redirectHost
		}

		template (value) LIR_Body_AVP m_LIR_Dx( template (omit) Origin_Host_AVP p_originHost,
		template (omit) Origin_Realm_AVP p_originRealm,
		template (omit) Destination_Realm_AVP p_destinationRealm,
		template (omit) Public_Identity_AVP p_public_Identity
		)
		modifies m_LIR_basic := {}

		template (value) LIA_Body_AVP m_LIA_Dx( template (omit) Origin_Host_AVP p_originHost,
		template (omit) Origin_Realm_AVP p_originRealm,
		template (omit) Result_Code_AVP p_resultCode,
		@@ -1075,19 +1079,6 @@ module DiameterCxDx_Templates {
		redirect_Host := p_redirectHost
		}

		template (value) MAR_Body_AVP m_MAR_Dx( template (omit) Origin_Host_AVP p_originHost,
		template (omit) Origin_Realm_AVP p_originRealm,
		template (omit) Destination_Realm_AVP p_destinationRealm,
		template (omit) User_Name_AVP p_userName,
		template (omit) Public_Identity_AVP p_publicIdentity,
		template (omit) SIP_Number_Auth_Items_AVP p_SIPNumberAuthItems,
		template (omit) SIP_Auth_Data_Item_AVP p_SIPAuthDataItem,
		template (omit) Server_Name_AVP p_serverName
		)
		modifies m_MAR_basic := {
		server_Name := p_serverName
		}

		template (value) MAA_Body_AVP m_MAA_Dx( template (omit) Origin_Host_AVP p_originHost,
		template (omit) Origin_Realm_AVP p_originRealm,
		template (omit) Result_Code_AVP p_resultCode,