No commit message (397fbe0d) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterCxDx

DiameterCxDx/ttcn/DiameterCxDx_Cx_TCFunctions.ttcn3

+10 −2

Original line number	Diff line number	Diff line
		@@ -250,6 +250,13 @@ module DiameterCxDx_Cx_TCFunctions {
		f_preamble_ICSCF();
		f_initialRegistratonCx();
		f_s_MAR_MAA();

		//TODO: preamble with REGISTRATION exchane:
		// UAR/UAA(DIAMETER_FIRST_REGISTRATION)
		// MAR/MAA
		// UAR/UAA(DIAMETER_SUBSEQUENT_REGISTRATION)
		// SAR/SAA
		//and now for RE-REGITRSTION foilow already prepaired test body
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

		// Test Body
		@@ -294,8 +301,9 @@ module DiameterCxDx_Cx_TCFunctions {
		)));
		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		// Postamble
		f_s_SAR_SAA();
		// Postamble deregistration see A4.3:
		// UAR/UAA exchange
		// SAR/SAA exchange
		f_deRegistratonCx();
		f_s_SAR_SAA();
		f_postamble_HSS();

DiameterCxDx/ttcn/DiameterCxDx_Steps.ttcn

+12 −4

Original line number	Diff line number	Diff line
		@@ -119,6 +119,8 @@

		vc_publicIdentity := m_publicIdentity(PX_PublicIdentity);

		vc_serverName := m_serverName(PX_ServerName);

		vc_hostIPAddress := valueof(f_IPV4or6_String2Address (PX_DIAMETER_CX_ETS_ICSCF_IPADDR));

		vc_send_hopid:=hex2int('00000100'H);
		@@ -450,11 +452,17 @@
		) runs on DiameterCx {
		f_initialRegistratonCx(p_userName, p_publicIdentity, p_uar_Flags_Cx);
		f_s_MAR_MAA();
		f_initialRegistratonCx();
		f_initialRegistratonCx();//TODO need to be UAA with SUBEQUENT_REGISTRATION
		f_s_SAR_SAA();
		}

		function f_deRegistratonCx () runs on DiameterCx {
		//TODO
		//f_s_UAR_UAA_deRegistration();
		//f_s_SAR_SAA_deRegistration()


		//folowing two functions moved into f_s_UAR_UAA_deRegistration();
		f_send_UAR(
		m_UAR_Msg(
		vc_sessionId,
		@@ -497,11 +505,11 @@
		vc_userName,
		vc_publicIdentity,
		m_sIPNumberAuthItems(1),
		m_sIPAuthDataItem_dummy, //TODO: Set real data here
		m_sIPAuthDataItem_authScheme(m_sIPAuthenticationScheme(DIGEST_E)), //TODO: DIGEST_E or DIGEST_AKAv1_MD5_E need to be set
		vc_serverName
		)
		));
		f_awaiting_MAA(mw_MAA_Msg(vc_sessionId, mw_MAA_Body_dummy))
		f_awaiting_MAA(mw_MAA_Msg(vc_sessionId, mw_MAA_basic))
		}

		function f_s_SAR_SAA (
		@@ -520,7 +528,7 @@
		valueof(vc_publicIdentity)
		)
		));
		f_awaiting_SAA(mw_SAA_Msg(vc_sessionId, mw_SAA_Body_dummy))
		f_awaiting_SAA(mw_SAA_Msg(vc_sessionId, mw_SAA_basic))
		}

		} //end group ScscfFunctions

DiameterCxDx/ttcn/DiameterCxDx_Templates.ttcn

+51 −42

Original line number	Diff line number	Diff line
		@@ -214,6 +214,57 @@ module DiameterCxDx_Templates {
		aVP_Type := omit
		}

		template SIP_Auth_Data_Item_AVP m_sIPAuthDataItem_dummy := {
		sIP_Auth_Data_Item_AVP_3GPP :={
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code, 1, c_vendId3gpp),
		sIP_Authentication_Scheme := omit,
		sIP_Item_Number := omit,
		sIP_Authenticate := omit,
		sIP_Authorization := omit,
		sIP_Authentication_Context := omit,
		confidentiality_Key := omit,
		integrity_Key := omit,
		sIP_Digest_Authenticate := omit,
		framed_IP_Address := omit,
		framed_IPv6_Prefix := omit,
		framed_Interface_Id := omit,
		line_Identifier := omit,
		aVP_Type := omit
		}
		}

		template SIP_Auth_Data_Item_AVP m_sIPAuthDataItem_authScheme (template (value) SIP_Authentication_Scheme_AVP p_sIP_Authentication_Scheme
		) modifies m_sIPAuthDataItem_dummy := {
		sIP_Auth_Data_Item_AVP_3GPP :={
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code, 12/correct length calculation needed/, c_vendId3gpp),
		sIP_Authentication_Scheme := p_sIP_Authentication_Scheme
		}
		}

		template SIP_Auth_Data_Item_AVP m_sIPAuthDataItem (template (value) SIP_Authentication_Scheme_AVP p_sIP_Authentication_Scheme,
		template (omit) SIP_Item_Number_AVP p_sIP_Item_Number := omit,
		template (omit) SIP_Authenticate_AVP p_sIP_Authenticate := omit,
		template (omit) SIP_Authorization_AVP p_sIP_Authorization := omit,
		template (omit) SIP_Authentication_Context_AVP p_sIP_Authentication_Context := omit,
		template (omit) Confidentiality_Key_AVP p_confidentiality_Key := omit,
		template (omit) Integrity_Key_AVP p_integrity_Key := omit,
		template (omit) SIP_Digest_Authenticate_AVP p_sIP_Digest_Authenticate := omit,
		template (omit) Line_Identifier_AVP p_line_Identifier := omit
		) modifies m_sIPAuthDataItem_dummy := {
		sIP_Auth_Data_Item_AVP_3GPP :={
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code, 1/correct length calculation needed/, c_vendId3gpp),
		sIP_Authentication_Scheme := p_sIP_Authentication_Scheme,
		sIP_Item_Number := p_sIP_Item_Number,
		sIP_Authenticate := p_sIP_Authenticate,
		sIP_Authorization := p_sIP_Authorization,
		sIP_Authentication_Context := p_sIP_Authentication_Context,
		confidentiality_Key := p_confidentiality_Key,
		integrity_Key := p_integrity_Key,
		sIP_Digest_Authenticate := p_sIP_Digest_Authenticate,
		line_Identifier := p_line_Identifier
		}
		}

		}//end group sendingTemplatesForAVPs

		group awaitingTemplatesForAVPs{
		@@ -371,25 +422,6 @@ module DiameterCxDx_Templates {
		aVP_Data := ?
		}

		template SIP_Auth_Data_Item_AVP m_sIPAuthDataItem_dummy := {
		sIP_Auth_Data_Item_AVP_3GPP :={
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code, 1, c_vendId3gpp),
		sIP_Authentication_Scheme := omit,
		sIP_Item_Number := omit,
		sIP_Authenticate := omit,
		sIP_Authorization := omit,
		sIP_Authentication_Context := omit,
		confidentiality_Key := omit,
		integrity_Key := omit,
		sIP_Digest_Authenticate := omit,
		framed_IP_Address := omit,
		framed_IPv6_Prefix := omit,
		framed_Interface_Id := omit,
		line_Identifier := omit,
		aVP_Type := omit
		}
		}

		template SIP_Auth_Data_Item_AVP mw_sIPAuthDataItem_dummy := {
		sIP_Auth_Data_Item_AVP_3GPP := {
		aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code, ?, c_vendId3gpp),
		@@ -429,29 +461,6 @@ module DiameterCxDx_Templates {
		}
		}

		template SIP_Auth_Data_Item_AVP m_sIPAuthDataItem (template (value) SIP_Authentication_Scheme_AVP p_sIP_Authentication_Scheme,
		template (omit) SIP_Item_Number_AVP p_sIP_Item_Number := omit,
		template (omit) SIP_Authenticate_AVP p_sIP_Authenticate := omit,
		template (omit) SIP_Authorization_AVP p_sIP_Authorization := omit,
		template (omit) SIP_Authentication_Context_AVP p_sIP_Authentication_Context := omit,
		template (omit) Confidentiality_Key_AVP p_confidentiality_Key := omit,
		template (omit) Integrity_Key_AVP p_integrity_Key := omit,
		template (omit) SIP_Digest_Authenticate_AVP p_sIP_Digest_Authenticate := omit,
		template (omit) Line_Identifier_AVP p_line_Identifier := omit
		) modifies m_sIPAuthDataItem_dummy := {
		sIP_Auth_Data_Item_AVP_3GPP :={
		sIP_Authentication_Scheme := p_sIP_Authentication_Scheme,
		sIP_Item_Number := p_sIP_Item_Number,
		sIP_Authenticate := p_sIP_Authenticate,
		sIP_Authorization := p_sIP_Authorization,
		sIP_Authentication_Context := p_sIP_Authentication_Context,
		confidentiality_Key := p_confidentiality_Key,
		integrity_Key := p_integrity_Key,
		sIP_Digest_Authenticate := p_sIP_Digest_Authenticate,
		line_Identifier := p_line_Identifier
		}
		}

		template (present) SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme(template (present) SIP_Auth_Schm_Type p_SIPAuthSchmType) := {
		aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := p_SIPAuthSchmType

Admin message