Corrections done: STF500 validation/week47 (60cd3213) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterCxDx

DiameterCxDx/ttcn/DiameterCxDx_Cx_TCFunctions.ttcn3

+25 −11

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ module DiameterCxDx_Cx_TCFunctions {
		}
		import from LibCommon_VerdictControl all;

		import from LibSip_Steps {function f_RemoveRegistration, f_SendINVITE};
		import from LibSip_Steps {function f_RemoveRegistration, f_SendINVITE;}
		import from LibSip_SIPTypesAndValues all;

		// LibDiameter
		@@ -29,7 +29,17 @@ module DiameterCxDx_Cx_TCFunctions {

		//DiameterCx
		import from DiameterCxDx_Templates all;
		import from DiameterCxDx_Steps all;
		import from DiameterCxDx_Steps {
		function
		f_deRegistratonCx,
		f_initialRegistratonCx,
		f_postamble_HSS,
		f_preamble_HSS,
		f_preamble_ICSCF,
		f_registratonCx,
		f_s_MAR_MAA,
		f_s_SAR_SAA;
		}
		import from DiameterCxDx_PIXITS all;
		import from DiameterCxDx_TestSystem {type DiameterCx;}

		@@ -1536,6 +1546,10 @@ module DiameterCxDx_Cx_TCFunctions {
		// Preamble
		// Clause 'Initial conditions'
		f_preamble_ICSCF();

		// TODO Yann: Need UAR first, I cannot start a HSS script by awaitibg a message
		f_registratonCx();

		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Test Body
		@@ -5167,7 +5181,6 @@ module DiameterCxDx_Cx_TCFunctions {

		// Test Body
		// Clause 'when': the IUT receives a RT-Request

		f_send_RTR(
		m_RTR_Msg(
		vc_sessionId, // containing a Session-ID AVP
		@@ -5231,11 +5244,11 @@ module DiameterCxDx_Cx_TCFunctions {
		0 // with IMS-Emergency-Registration bit not set
		))));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		// Postamble
		f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_AUTHENTICATION_REJECTED_E))));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_awaiting_MAR(mw_MAR_Msg(?, mw_MAR_basic));
		f_send_MAA(m_MAA_Msg(vc_sessionId, m_MAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		@@ -5245,7 +5258,6 @@ module DiameterCxDx_Cx_TCFunctions {
		f_awaiting_SAR(mw_SAR_Msg(?, mw_SAR_basic));
		f_send_SAA(m_SAA_Msg(vc_sessionId, m_SAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		f_postamble_HSS();
		//de-registration
		f_awaiting_UAR(mw_UAR_Msg(?, mw_UAR()));
		f_send_UAA(m_UAA_Msg(vc_sessionId, m_UAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));
		@@ -5253,7 +5265,9 @@ module DiameterCxDx_Cx_TCFunctions {
		f_awaiting_SAR(mw_SAR_Msg(?, mw_SAR_basic));
		f_send_SAA(m_SAA_Msg(vc_sessionId, m_SAA_basic(vc_originHost, vc_originRealm, m_resultCode(DIAMETER_SUCCESS_E))));

		f_postamble_HSS();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());

		}

		function f_TC_CX_CSCF_UA_02_HSS() runs on DiameterCx {

DiameterCxDx/ttcn/DiameterCxDx_Templates.ttcn

+41 −41

Original line number	Diff line number	Diff line
		@@ -43,19 +43,19 @@ module DiameterCxDx_Templates {

		template Vendor_Specific_Appl_Id_AVP m_vendor_Specific_Appl_Id_Cx
		modifies m_vendor_Specific_Appl_Id_dummy := {
		aVP_Header := m_aVP_Header_Mbit1(c_vendor_Specific_Appl_Id_AVP_Code),
		aVP_Header := m_aVP_Header_Mbit1(c_vendor_Specific_Appl_Id_AVP_Code, 12+12),
		vendor_Id := {m_vendorId(c_vendId3gpp)},
		auth_Application_Id := {m_authApplicationId ( c_applId3GPPCxDx )},
		acct_Application_Id := omit
		}

		template User_Authorization_Type_AVP m_user_Authorization_Reg_Cx := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_user_Authorization_Type_AVP_Code, 4, omit),
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_user_Authorization_Type_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := REGISTRATION
		}

		template User_Authorization_Type_AVP m_user_Authorization_RegCap_Cx := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_user_Authorization_Type_AVP_Code, 4, omit),
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_user_Authorization_Type_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := REGISTRATION_AND_CAPABILITIES
		}

		@@ -79,26 +79,26 @@ module DiameterCxDx_Templates {

		template Originating_Request_AVP m_originating_Request_AVP(in Originating_Request_Code p_aVP_Data := ORIGINATING
		) := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_originating_Request_AVP_Code, 4, omit),
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_originating_Request_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := p_aVP_Data
		}

		template UAR_Flags_AVP m_uar_Flags_Cx := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_uAR_Flags_AVP_Code, 4, omit),
		aVP_Header := m_aVP_HeaderVid_Mbit0(c_uAR_Flags_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := 0
		}

		template UAR_Flags_AVP m_uar_FlagsEm_Cx := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_uAR_Flags_AVP_Code, 4, omit),
		aVP_Header := m_aVP_HeaderVid_Mbit0(c_uAR_Flags_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := 1
		}

		template Public_Identity_AVP m_publicIdentity(template (value) UTF8String p_avpData) := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_public_Identity_AVP_Code, lengthof(p_avpData), omit),
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_public_Identity_AVP_Code, lengthof(p_avpData), c_vendId3gpp),
		aVP_Data := p_avpData
		}

		template Visited_Network_Id_AVP m_visitedNetworkId(template (value) octetstring p_avpData) := {
		template Visited_Network_Identifier_AVP m_visitedNetworkId(template (value) octetstring p_avpData) := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_visited_Network_Identifier_AVP_Code, lengthof(p_avpData), c_vendId3gpp),
		aVP_Data := p_avpData
		}
		@@ -256,7 +256,7 @@ module DiameterCxDx_Templates {
		aVP_Data := p_avpData
		}

		template Visited_Network_Id_AVP mw_visitedNetworkId (template (present) octetstring p_avpData
		template Visited_Network_Identifier_AVP mw_visitedNetworkId (template (present) octetstring p_avpData
		) := {
		aVP_Header := mw_aVP_Header_VMbit1(c_visited_Network_Identifier_AVP_Code),
		aVP_Data := p_avpData
		@@ -640,7 +640,7 @@ module DiameterCxDx_Templates {
		template (value) 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 )
		template (omit) Visited_Network_Identifier_AVP p_visited_Network_Id )
		modifies m_UAR_Body_dummy := {
		vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_Cx,
		auth_Application_Id := omit, //not present in CxDx TS 129 229
		@@ -655,7 +655,7 @@ module DiameterCxDx_Templates {
		sIP_User_Authorization_Type := omit, //not present in CxDx TS 129 229
		supported_Features := omit,
		public_Identity := p_public_Identity,
		visited_Network_Id := p_visited_Network_Id,
		visited_Network_Identifier := p_visited_Network_Id,
		user_Authorization_Type := omit,
		uAR_Flags := omit,
		proxy_Info := omit,
		@@ -1009,7 +1009,7 @@ module DiameterCxDx_Templates {
		sIP_User_Authorization_Type := *, // not present in TS 129 229
		supported_Features := *, // optional in TS 129 229
		public_Identity := ?, // mandatory in TS 129 229
		visited_Network_Id := ?, // mandatory in TS 129 229
		visited_Network_Identifier := ?, // mandatory in TS 129 229
		user_Authorization_Type := *, // optional in TS 129 229
		uAR_Flags := *, // optional in TS 129 229
		proxy_Info := *, // optional in TS 129 229
		@@ -1297,7 +1297,7 @@ module DiameterCxDx_Templates {
		template (value) 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,
		template (omit) Visited_Network_Identifier_AVP p_visited_Network_Id,
		template (omit) User_Authorization_Type_AVP p_user_Authorization_Type,
		template (omit) Destination_Host_AVP p_destination_Host,
		template (omit) UAR_Flags_AVP p_uAR_Flags
		@@ -1390,7 +1390,7 @@ module DiameterCxDx_Templates {
		template (present) Destination_Realm_AVP p_destinationRealm := ?,
		template (present) User_Name_AVP p_userName := ?,
		template (present) Public_Identity_AVP p_public_Identity := ?,
		template (present) Visited_Network_Id_AVP p_visited_Network_Id := ?,
		template (present) Visited_Network_Identifier_AVP p_visited_Network_Id := ?,
		template (present) Auth_Session_State_AVP p_sessionState := ?,
		template User_Authorization_Type_AVP p_user_Authorization_Type := ?,
		template UAR_Flags_AVP p_uAR_Flags := ?
		@@ -1402,7 +1402,7 @@ module DiameterCxDx_Templates {
		destination_Realm := p_destinationRealm, // mandatory in TS 129 229
		user_Name := p_userName, // mandatory in TS 129 229
		public_Identity := p_public_Identity, // mandatory in TS 129 229
		visited_Network_Id := p_visited_Network_Id, // mandatory in TS 129 229
		visited_Network_Identifier := p_visited_Network_Id, // mandatory in TS 129 229
		user_Authorization_Type := p_user_Authorization_Type, // optional in TS 129 229
		uAR_Flags := p_uAR_Flags // optional in TS 129 229
		}

DiameterCxDx/ttcn/DiameterCxDx_TestCases.ttcn

+131 −57

File changed.

Preview size limit exceeded, changes collapsed.

DiameterCxDx/ttcn/DiameterCxDx_TestControl.ttcn

+26 −31

Original line number	Diff line number	Diff line
		@@ -6,9 +6,6 @@

		module DiameterCxDx_TestControl {

		// LibSip
		import from LibSip_SIPTypesAndValues all;

		// DiameterCx
		import from DiameterCxDx_PICS all;
		import from DiameterCxDx_TestCases all;
		@@ -16,8 +13,6 @@ module DiameterCxDx_TestControl {

		control {

		var CSeq v_cSeq_s := c_empty_cSeq;

		if (PICS_HSS_IUT) {
		if (PICS_HSS_LOCATION_MANAGEMENT_PROCS) {
		execute(TC_CX_HSS_MS_01());
		@@ -141,31 +136,31 @@ module DiameterCxDx_TestControl {

		if (PICS_SCSCF_IUT) {
		execute(TC_CX_CSCF_MS_01());
		execute(TC_CX_CSCF_SA_01(v_cSeq_s));
		execute(TC_CX_CSCF_SA_02(v_cSeq_s));
		execute(TC_CX_CSCF_SA_03(v_cSeq_s));
		execute(TC_CX_CSCF_SA_04(v_cSeq_s));
		execute(TC_CX_CSCF_RT_01(v_cSeq_s));
		execute(TC_CX_CSCF_RT_02(v_cSeq_s));
		execute(TC_CX_CSCF_RT_03(v_cSeq_s));
		execute(TC_CX_CSCF_PP_01(v_cSeq_s));
		execute(TC_CX_CSCF_PP_02(v_cSeq_s));
		execute(TC_CX_CSCF_PP_03(v_cSeq_s));
		execute(TC_CX_CSCF_PP_04(v_cSeq_s));
		execute(TC_CX_CSCF_PP_05(v_cSeq_s));
		execute(TC_CX_CSCF_MA_01(v_cSeq_s));
		execute(TC_CX_CSCF_MA_02(v_cSeq_s));
		execute(TC_CX_CSCF_MA_03(v_cSeq_s));
		execute(TC_CX_CSCF_MA_04(v_cSeq_s));
		execute(TC_CX_CSCF_MA_05(v_cSeq_s));
		execute(TC_CX_CSCF_SA_01());
		execute(TC_CX_CSCF_SA_02());
		execute(TC_CX_CSCF_SA_03());
		execute(TC_CX_CSCF_SA_04());
		execute(TC_CX_CSCF_RT_01());
		execute(TC_CX_CSCF_RT_02());
		execute(TC_CX_CSCF_RT_03());
		execute(TC_CX_CSCF_PP_01());
		execute(TC_CX_CSCF_PP_02());
		execute(TC_CX_CSCF_PP_03());
		execute(TC_CX_CSCF_PP_04());
		execute(TC_CX_CSCF_PP_05());
		execute(TC_CX_CSCF_MA_01());
		execute(TC_CX_CSCF_MA_02());
		execute(TC_CX_CSCF_MA_03());
		execute(TC_CX_CSCF_MA_04());
		execute(TC_CX_CSCF_MA_05());
		}

		if (PICS_ICSCF_IUT) {
		execute(TC_CX_CSCF_UA_01(v_cSeq_s));
		execute(TC_CX_CSCF_UA_02(v_cSeq_s));
		execute(TC_CX_CSCF_UA_03(v_cSeq_s));
		execute(TC_CX_CSCF_UA_04(v_cSeq_s));
		execute(TC_CX_CSCF_LI_01(v_cSeq_s));
		execute(TC_CX_CSCF_UA_01());
		execute(TC_CX_CSCF_UA_02());
		execute(TC_CX_CSCF_UA_03());
		execute(TC_CX_CSCF_UA_04());
		execute(TC_CX_CSCF_LI_01());
		}

		if (PICS_SLF_IUT) {
		@@ -176,10 +171,10 @@ module DiameterCxDx_TestControl {
		}

		if (PICS_CSCF_ROLE_FOR_DX) {
		execute(TC_DX_CSCF_UA_01(v_cSeq_s));
		execute(TC_DX_CSCF_SA_01(v_cSeq_s));
		execute(TC_DX_CSCF_LI_01(v_cSeq_s));
		execute(TC_DX_CSCF_MA_01(v_cSeq_s));
		execute(TC_DX_CSCF_UA_01());
		execute(TC_DX_CSCF_SA_01());
		execute(TC_DX_CSCF_LI_01());
		execute(TC_DX_CSCF_MA_01());
		}

		} // End of 'Control' statement

DiameterCxDx/ttcn/DiameterCxDx_TestSystem.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ module DiameterCxDx_TestSystem {
		type component DiameterCx extends ServerSyncComp, DiameterComponent {
		var template (value) User_Name_AVP vc_userName;
		var template (omit) Public_Identity_AVP vc_publicIdentity;
		var template (value) Visited_Network_Id_AVP vc_visitedNetworkId;
		var template (value) Visited_Network_Identifier_AVP vc_visitedNetworkId;
		var template (value) Server_Name_AVP vc_serverName;
		} // End of component DiameterCx