Compare Revisions

The credentials to download the source code are:
 Username: svnusers
 Password: svnusers

Ignore whitespace Rev 71 → Rev 72

/trunk/DiameterS9/ttcn/DiameterS9_Gxx_Templates.ttcn
197,7 → 197,7
framed_IP_Address := p_framedIpAddress,
framed_IPv6_Prefix := p_framedIp6Address,
iP_CAN_Type := m_iP_CAN_Type (PX_IP_CAN_TYPE),
rAT_Type := m_rAT_Type (PX_RAT_TYPE),
rat_Type := m_rAT_Type (PX_RAT_TYPE),
subscription_Id := p_subscriptionId,
charging_Rule_Report := p_charging_Rule_Report
}
240,7 → 240,7
template CCR_MSG.cCR_Body.charging_Rule_Report p_charging_Rule_Report,
template CCR_MSG.cCR_Body.event_Trigger p_eventTrigger,
template CCR_MSG.cCR_Body.iP_CAN_Type p_ipCanType,
template CCR_MSG.cCR_Body.rAT_Type p_ratType)
template CCR_MSG.cCR_Body.rat_Type p_ratType)
modifies m_CCR_Gx_basic :={
cCR_Body := {
cC_Request_Type := m_cC_Request_Type(UPDATE_REQUEST_E),
248,7 → 248,7
charging_Rule_Report := p_charging_Rule_Report,
event_Trigger := p_eventTrigger,
iP_CAN_Type := p_ipCanType,
rAT_Type := p_ratType
rat_Type := p_ratType
}
}
 
424,7 → 424,7
framed_IP_Address := p_framedIpAddress,
framed_IPv6_Prefix := p_framedIp6Address,
iP_CAN_Type := m_iP_CAN_Type (PX_IP_CAN_TYPE),
rAT_Type := m_rAT_Type (PX_RAT_TYPE),
rat_Type := m_rAT_Type (PX_RAT_TYPE),
subscription_Id := p_subscriptionId,
aN_GW_Address := p_anGwAddress,
called_Station_Id := p_calledStationId
446,7 → 446,7
framed_IP_Address := p_framedIpAddress,
framed_IPv6_Prefix := p_framedIp6Address,
iP_CAN_Type := m_iP_CAN_Type (PX_IP_CAN_TYPE),
rAT_Type := m_rAT_Type (PX_RAT_TYPE),
rat_Type := m_rAT_Type (PX_RAT_TYPE),
subscription_Id := p_subscriptionId,
event_Trigger := p_eventTrigger,
routing_Rule_Install := p_routingRuleInstall,
470,7 → 470,7
framed_IP_Address := p_framedIpAddress,
framed_IPv6_Prefix := p_framedIp6Address,
iP_CAN_Type := m_iP_CAN_Type (PX_IP_CAN_TYPE),
rAT_Type := m_rAT_Type (PX_RAT_TYPE),
rat_Type := m_rAT_Type (PX_RAT_TYPE),
subscription_Id := p_subscriptionId,
aN_GW_Address := p_anGwAddress,
called_Station_Id := p_calledStationId,
494,7 → 494,7
framed_IP_Address := p_framedIpAddress,
framed_IPv6_Prefix := p_framedIp6Address,
iP_CAN_Type := m_iP_CAN_Type (PX_IP_CAN_TYPE),
rAT_Type := m_rAT_Type (PX_RAT_TYPE),
rat_Type := m_rAT_Type (PX_RAT_TYPE),
subscription_Id := p_subscriptionId,
aN_GW_Address := p_anGwAddress,
called_Station_Id := p_calledStationId,
514,7 → 514,7
cCR_Body := {
cC_Request_Type := m_cC_Request_Type ( UPDATE_REQUEST_E ),
iP_CAN_Type := m_iP_CAN_Type (PX_IP_CAN_TYPE),
rAT_Type := m_rAT_Type (PX_RAT_TYPE),
rat_Type := m_rAT_Type (PX_RAT_TYPE),
subscription_Id := p_subscriptionId,
called_Station_Id := p_calledStationId,
qoS_Rule_Report := p_qoSRuleReport
/trunk/DiameterS9/ttcn/DiameterS9_S9_TCFunctions.ttcn3
2666,10 → 2666,6
var template QoS_Rule_Report_AVP v_qoSRuleReport := mw_qoSRuleReport_RuleName_FailureCode ( { v_qoSRuleName }, v_ruleFailureCode );
var template Subses_Enforcement_Info_AVP v_subsesEnfInfo := mw_subsesEnforcementInfo_qosInfo_ExpResult (
v_subId, v_qOSinf, { v_qoSRuleReport }, v_expResult_subsess );
var template RAA_MSG v_RAA1 := mw_RAA_ExpResult_SubsessEnfInfo (
vc_sessionId, +vc_originHost_IUT, vc_originRealm_IUT, v_expResult, { v_subsesEnfInfo } );
var template RAA_MSG v_RAA2 := mw_RAA_Result_SubsessEnfInfo (
vc_sessionId, +vc_originHost_IUT, vc_originRealm_IUT, v_result, { v_subsesEnfInfo } );
 
f_preamble_HPCRF();
 
2686,7 → 2682,16
m_qosRuleInstall_RuleName(m_qoSRuleName_dummy(PX_QOS_RULE_NAME_NOT_ACCEPTABLE)))
));
 
f_awaiting_2RAA ( v_RAA1, v_RAA2 );
f_awaiting_2RAA (mw_RAA_ExpResult_SubsessEnfInfo (vc_sessionId,
vc_originHost_IUT,
vc_originRealm_IUT,
v_expResult,
{ v_subsesEnfInfo } ),
mw_RAA_Result_SubsessEnfInfo (vc_sessionId,
vc_originHost_IUT,
vc_originRealm_IUT,
mw_resultCode ( DIAMETER_ERROR_SUBSESSION_E ),
{ v_subsesEnfInfo } ) );
 
f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
 
2834,10 → 2839,9
m_sessReleaseCause(UNSPECIFIED_REASON_E)
));
 
f_awaiting_RAA(mw_RAA_ResultCode(vc_sessionId,
vc_originHost_IUT,
vc_originRealm_IUT,
mw_resultCode(mw_resultCode_diameterSuccess)));
f_awaiting_RAA(mw_RAA_basic(vc_sessionId,
vc_originHost_IUT,
vc_originRealm_IUT));
 
f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
 
2871,10 → 2875,9
m_sessReleaseCause(UNSPECIFIED_REASON_E))
));
 
f_awaiting_RAA(mw_RAA_ResultCode(vc_sessionId,
vc_originHost_IUT,
vc_originRealm_IUT,
mw_resultCode(mw_resultCode_diameterSuccess)));
f_awaiting_RAA(mw_RAA_basic(vc_sessionId,
vc_originHost_IUT,
vc_originRealm_IUT));
 
f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
 
2902,8 → 2905,6
//CCR INITIAL REQUEST
f_await_initial_session_send_response_HPCRF();
 
f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // sync
 
f_awaiting_CCR(mw_CCR_chrgRuleReport_EvTri_AnGw(?,
vc_originHost_IUT,
vc_originRealm_IUT,
2911,7 → 2912,7
mw_cC_Request_Type(UPDATE_REQUEST_E),
*,//Subscription id
{mw_chargRuleReport_Name({mw_chrgRuleName})},
{mw_event_Trigger(IP_CAN_CHANGE_E)},
{mw_event_Trigger(AN_GW_CHANGE_E)},
{mw_anGwAddress(f_IPAdress(PX_SGW_AGW_ipv4,PX_SGW_AGW_ipv6))}
));
 
2944,8 → 2945,6
//CCR INITIAL REQUEST
f_await_initial_session_send_response_HPCRF();
 
f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // sync
 
f_awaiting_CCR(mw_CCR_chrgRuleReport_EvTri_IpCan_Rat(?,
vc_originHost_IUT,
vc_originRealm_IUT,
2990,11 → 2989,9
//CCR INITIAL REQUEST
f_await_initial_session_send_response_HPCRF();
 
f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // sync
 
// Ensure that no CCR has been sent
tc_delay.start;
tc_delay.timeout;
tc_wait.start(5.0);
tc_wait.timeout;
 
f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
 
3022,7 → 3019,7
f_await_initial_session_send_response_HPCRF();
if (ispresent(vc_recvDiamMsg.cCR_MSG.cCR_Body.subsesion_Enforcement_Info)) {
v_subSessionId := vc_recvDiamMsg.cCR_MSG.cCR_Body.subsesion_Enforcement_Info[0].subsession_Id;
} else {setverdict(fail); v_subSessionId := mw_subsessionId_dummy(?)};
} else {setverdict(fail, "*** " & __SCOPE__ & ": FAIL: CCR message was received without Subsession-Enforcement-Info AVP. ***"); v_subSessionId := mw_subsessionId_dummy(?)};
//CCR UPDATE REQUEST
f_awaiting_CCR(mw_CCR_SubSessEnfInf_QoS(?,
/trunk/DiameterS9/ttcn/DiameterS9_Templates.ttcn
323,7 → 323,7
charging_Rule_Report := omit,
qoS_Rule_Report := omit,
iP_CAN_Type := omit,
rAT_Type := omit,
rat_Type := omit,
threeGPP_SGSN_MCC_MNC := omit,
threeGPP_SGSN_Address := omit,
threeGPP_SGSN_IPv6_Address := omit,
370,7 → 370,7
charging_Rule_Report := *,
qoS_Rule_Report := *,
iP_CAN_Type := *,
rAT_Type := *,
rat_Type := *,
threeGPP_SGSN_MCC_MNC := *,
threeGPP_SGSN_Address := *,
threeGPP_SGSN_IPv6_Address := *,
1232,7 → 1232,7
framed_IP_Address := p_framedIpAddress,
framed_IPv6_Prefix := p_framedIp6Address,
iP_CAN_Type := m_iP_CAN_Type (PX_IP_CAN_TYPE),
rAT_Type := m_rAT_Type (PX_RAT_TYPE)
rat_Type := m_rAT_Type (PX_RAT_TYPE)
}
}
1720,7 → 1720,7
template CCR_MSG.cCR_Body.charging_Rule_Report p_charging_Rule_Report,
template CCR_MSG.cCR_Body.event_Trigger p_event_Trigger,
template CCR_MSG.cCR_Body.iP_CAN_Type p_ipCanType,
template CCR_MSG.cCR_Body.rAT_Type p_ratType
template CCR_MSG.cCR_Body.rat_Type p_ratType
)
modifies mw_CCR_basic := {
cCR_Body := {
1728,7 → 1728,7
charging_Rule_Report := p_charging_Rule_Report,
event_Trigger := p_event_Trigger,
iP_CAN_Type := p_ipCanType,
rAT_Type := p_ratType
rat_Type := p_ratType
}
}