No commit message (e13e5a75) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterRx

DiameterRx/ttcn/DiameterRx_Rx_TCFunctions.ttcn

+66 −21

Original line number	Diff line number	Diff line
		@@ -43,8 +43,13 @@ module DiameterRx_Rx_TCFunctions {
		mw_mediaComponentDescription_flowStatus(?))); // should be present

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
		f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost,
		vc_originRealm, vc_authApplicationId));

		//sessionId used from AAR
		vc_originHost := m_originHost(PX_OriginHost);
		vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

		//TODO: setting of optional AVPs
		f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));

		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

		@@ -65,16 +70,17 @@ module DiameterRx_Rx_TCFunctions {
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); // sync

		f_awaiting_AAR(mw_AAR_basic(?,?,?,?,?,?));

		// sessionId used from AAR
		vc_originHost := m_originHost(PX_OriginHost);
		vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

		//TODO: setting of optional AVPs
		f_send_AAA(m_AAA_modified_ResultCode_ANCA(vc_sessionId,
		vc_originHost,
		vc_originRealm,
		vc_authApplicationId
		,
		m_resultCode
		(m_resultCode_diameterSuccess)
		,
		m_accessNetworkChargingAddress
		(f_IPAdresss())));
		m_resultCode(m_resultCode_diameterSuccess),
		m_accessNetworkChargingAddress(f_IPAdresss())));

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

		@@ -101,8 +107,13 @@ module DiameterRx_Rx_TCFunctions {
		mw_sponsoredConnectivityData(?,?,,))); // should be present

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
		f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost,
		vc_originRealm, vc_authApplicationId));

		//sessionId used from AAR
		vc_originHost := m_originHost(PX_OriginHost);
		vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

		//TODO: setting of optional AVPs
		f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));

		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

		@@ -188,8 +199,13 @@ module DiameterRx_Rx_TCFunctions {
		(?,,,mw_flowUsage(AF_SIGNALLING_E),,,,))));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
		f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost,
		vc_originRealm, vc_authApplicationId));

		//sessionId used from AAR
		vc_originHost := m_originHost(PX_OriginHost);
		vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

		//TODO: setting of optional AVPs
		f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));

		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

		@@ -225,8 +241,13 @@ module DiameterRx_Rx_TCFunctions {
		));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
		f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost,
		vc_originRealm, vc_authApplicationId));

		//sessionId used from AAR
		vc_originHost := m_originHost(PX_OriginHost);
		vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

		//TODO: setting of optional AVPs
		f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));

		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync

		@@ -280,11 +301,23 @@ module DiameterRx_Rx_TCFunctions {
		f_preamble_AF();

		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); // sync

		vc_sessionId := m_sessionId(PX_SessionID);

		vc_originHost := m_originHost(PX_OriginHost);

		vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

		vc_destinationHost := m_destinationHost(PX_DestinationHost);

		vc_destinationRealm := m_destinationRealm(PX_DestinationRealm);

		//TODO: setting of optional AVPs

		f_send_AAR(m_AAR_FIP_Media1(vc_sessionId, vc_originHost,
		vc_originRealm,
		vc_destinationRealm,
		vc_destinationHost,
		vc_authApplicationId,
		f_framedIpAddress4_send(),
		f_framedIpAddress6_send(),
		m_mediaComponentDescription_flowStatus(m_flowStatus(ENABLED_E))));
		@@ -344,11 +377,23 @@ module DiameterRx_Rx_TCFunctions {
		f_preamble_AF();

		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); // sync

		vc_sessionId := m_sessionId(PX_SessionID);

		vc_originHost := m_originHost(PX_OriginHost);

		vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

		vc_destinationHost := m_destinationHost(PX_DestinationHost);

		vc_destinationRealm := m_destinationRealm(PX_DestinationRealm);

		//TODO: setting of optional AVPs

		f_send_AAR(m_AAR_FIP_SA_Media1(vc_sessionId, vc_originHost,
		vc_originRealm,
		vc_destinationRealm,
		vc_destinationHost,
		vc_authApplicationId,
		f_framedIpAddress4_send(),
		f_framedIpAddress6_send(),
		m_specificActionsList,

DiameterRx/ttcn/DiameterRx_Steps.ttcn3

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@

		f_awaiting_AAR(mw_AAR_dummy); // IUT esthablish Diameter session

		f_send_AAA(m_AAA_modified_ResultCode_ANCA(vc_sessionId, vc_originHost, vc_originRealm, vc_authApplicationId, m_resultCode(m_resultCode_diameterSuccess), omit));
		f_send_AAA(m_AAA_modified_ResultCode_ANCA(vc_sessionId, vc_originHost, vc_originRealm, m_resultCode(m_resultCode_diameterSuccess), omit));

		} // end function f_AF_IUT_session_esthablishment
		}

DiameterRx/ttcn/DiameterRx_Templates.ttcn

+7 −11

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ module DiameterRx_Templates {
		aVP_Data := p_avpData
		}

		template Auth_Application_Id_AVP m_authApplicationId(LibCommon_BasicTypesAndValues.UInt32 p_avpData):=
		template Auth_Application_Id_AVP m_authApplicationId(UInt32 p_avpData):=
		{
		aVP_Header := m_aVP_HeaderVid(c_vendIdAuth_Application_Id_AVP, 4, omit),
		aVP_Data := p_avpData
		@@ -794,8 +794,8 @@ module DiameterRx_Templates {
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP p_originRealm,
		template Destination_Realm_AVP p_destinationRealm,
		template Destination_Host_AVP p_destinationHost,
		template Auth_Application_Id_AVP p_authApplicationId)
		template Destination_Host_AVP p_destinationHost
		)
		modifies m_AAR_dummy :=
		{
		session_Id := p_sessionId,
		@@ -803,7 +803,7 @@ module DiameterRx_Templates {
		origin_Realm := p_originRealm,
		destination_Realm := p_destinationRealm,
		destination_Host := p_destinationHost,
		auth_Application_Id := p_authApplicationId
		auth_Application_Id := m_authApplicationId(c_applIdRx)
		}

		template STR_MSG m_STR_basic(template Session_Id_AVP p_sessionId,
		@@ -900,14 +900,13 @@ module DiameterRx_Templates {
		group Rxbasic_answer_templates_send {
		template AAA_MSG m_AAA_basic(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP p_originRealm,
		template Auth_Application_Id_AVP p_authApplicationId)
		template Origin_Realm_AVP p_originRealm)
		modifies m_AAA_dummy :=
		{
		session_Id := p_sessionId,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		auth_Application_Id := p_authApplicationId
		auth_Application_Id := m_authApplicationId(c_applIdRx)
		}

		template STA_MSG m_STA_basic(template Session_Id_AVP p_sessionId,
		@@ -937,7 +936,6 @@ module DiameterRx_Templates {
		template Origin_Realm_AVP p_originRealm,
		template Destination_Realm_AVP p_destinationRealm,
		template Destination_Host_AVP p_destinationHost,
		template Auth_Application_Id_AVP p_authApplicationId,
		template Framed_IP_Address_AVP p_framedIpAddress,
		template Framed_IPv6_Prefix_AVP p_framedIp6Address,
		template Media_Component_Description_AVP p_mediaComponentDescription)
		@@ -954,7 +952,6 @@ module DiameterRx_Templates {
		template Origin_Realm_AVP p_originRealm,
		template Destination_Realm_AVP p_destinationRealm,
		template Destination_Host_AVP p_destinationHost,
		template Auth_Application_Id_AVP p_authApplicationId,
		template Framed_IP_Address_AVP p_framedIpAddress,
		template Framed_IPv6_Prefix_AVP p_framedIp6Address,
		template Setof_Specific_Action_AVP p_specificAction,
		@@ -1037,7 +1034,6 @@ module DiameterRx_Templates {
		(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP p_originRealm,
		template Auth_Application_Id_AVP p_authApplicationId,
		template Result_Code_AVP p_resultCode,
		template Access_Network_Charging_Address_AVP p_accessNetworkChargingAddress)
		modifies m_AAA_basic :=