Commit 8b4ca277 authored by pintar's avatar pintar
Browse files

Corrections were done due to STF 512/Diameter RfRo validation against Iskratel SUT

parent 30f99493
......@@ -194,6 +194,7 @@
function f_preamble_Rf_CDF() runs on DiameterRfRo
{
var default v_def_diameter_catchEvent;
if(PX_DIAM_LLP_ENABLED)
{
f_preambleServer();
......@@ -201,10 +202,16 @@
f_DiameterRf_init();
f_preambleDiameterBaseServer(c_applIdRf);
//catch ACR(Event) before test body starts(on 200 OK REGISTER, 200 OK, SUBSCRIBE, 200 OK NOTIFY)
v_def_diameter_catchEvent := activate (a_diameter_event());
//delay before preamble is done - SIP starts with MESSAGE, INVITE request later
f_wait(0.5);
}
function f_preamble_Rf_CDF2() runs on DiameterRfRo
{
var default v_def_diameter_catchEvent;
if(PX_DIAM_LLP_ENABLED)
{
f_preambleServer();
......@@ -212,6 +219,11 @@
f_DiameterRf_init2();
f_preambleDiameterBaseServer(c_applIdRf);
//catch ACR(Event) before test body starts(on 200 OK REGISTER, 200 OK, SUBSCRIBE, 200 OK NOTIFY)
v_def_diameter_catchEvent := activate (a_diameter_event());
//delay before preamble is done - SIP starts with MESSAGE, INVITE request later
f_wait(0.5);
}
function f_preamble_Rf_CTF() runs on DiameterRfRo
......@@ -611,6 +623,7 @@
{
vc_recv_hopid:= vc_recvDiamMsgDefault.aCR_MSG.header.hopid;
vc_recv_endid:= vc_recvDiamMsgDefault.aCR_MSG.header.endid;
vc_accountingRecordNumber := vc_recvDiamMsgDefault.aCR_MSG.aCR_Body.accounting_Record_Number;
f_send_ACA(
md_aCA(
......@@ -629,7 +642,37 @@
);
repeat;
}
}
} //end altstep a_diameter_interim()
altstep a_diameter_event() runs on DiameterRfRo
{
[] DIAMP.receive (DIAMETER_MSG:{aCR_MSG :=
mdw_aCR(?,mdw_acrBody_ServiceInfo_EventTimestamp(?,?,?,mw_accounting_Record_Type(EVENT_RECORD_E),?,*,*))
}) -> value vc_recvDiamMsgDefault
{
vc_recv_hopid:= vc_recvDiamMsgDefault.aCR_MSG.header.hopid;
vc_recv_endid:= vc_recvDiamMsgDefault.aCR_MSG.header.endid;
vc_accountingRecordNumber := vc_recvDiamMsgDefault.aCR_MSG.aCR_Body.accounting_Record_Number;
f_send_ACA(
md_aCA(
vc_sessionId, // containing a Session-ID AVP
md_acaBodyAvps(
m_resultCode( // containing a Result-Code AVP
DIAMETER_SUCCESS_E // indicating DIAMETER_SUCCESS
),
vc_originHost, // containing an Origin-Host AVP
vc_originRealm, // containing an Origin-Realm AVP
m_accounting_Record_Type( // containing an Accounting-Record-Type AVP
EVENT_RECORD_E
),
vc_accountingRecordNumber
))
);
repeat;
}
}//end altstep a_diameter_event()
}//end group DefaultTestStep
} // End of module DiameterGx_Steps
\ No newline at end of file
......@@ -65,24 +65,24 @@ module DiameterRfRo_Templates {
/**
* @desc Received generic command flag template
*/
template (present) Command_Flags mw_cmdFlagsReq_PET(in Bit1 p_P, in Bit1 p_E,in Bit1 p_T) := {
template (present) Command_Flags mw_cmdFlagsReq_PET(in template Bit1 p_P, in Bit1 p_E,in Bit1 p_T) := {
r_bit := '1'B, //Request message
p_bit := p_P,
e_bit := p_E,
t_bit := p_T,
reserved_bits := '0000'B
} // End of template mw_cmdFlagsAns
} // End of template mw_cmdFlagsReq_PET
/**
* @desc Received generic command flag template
*/
template (present) Command_Flags mw_cmdFlagsAns_PET(in Bit1 p_P, in Bit1 p_E,in Bit1 p_T) := {
template (present) Command_Flags mw_cmdFlagsAns_PET(in template Bit1 p_P, in Bit1 p_E,in Bit1 p_T) := {
r_bit := '0'B, //Answer message
p_bit := p_P,
e_bit := p_E,
t_bit := p_T,
reserved_bits := '0000'B
} // End of template mw_cmdFlagsAns
} // End of template mw_cmdFlagsAns_PET
} // End of group HeaderFieldTemplates
......@@ -163,6 +163,7 @@ module DiameterRfRo_Templates {
origin_Realm := p_originRealm,
accounting_Record_Type := p_accounting_Record_Type,
accounting_Record_Number := p_accounting_Record_Number,
acct_Application_Id := m_acct_Application_Id(3),
event_Timestamp := p_event_Timestamp,
service_Information := p_service_Information,
service_Context_Id := p_service_Context_Id,
......@@ -372,7 +373,8 @@ module DiameterRfRo_Templates {
origin_Host := p_originHost,
origin_Realm := p_originRealm,
accounting_Record_Type := p_accounting_Record_Type,
accounting_Record_Number := p_accounting_Record_Number
accounting_Record_Number := p_accounting_Record_Number,
acct_Application_Id := mw_acct_Application_Id(3)
} // End of template mdw_acaBodyAvps
......@@ -1981,7 +1983,7 @@ module DiameterRfRo_Templates {
*/
template (omit) Envelope_AVP m_envelope(
in template (value) Envelope_Start_Time_AVP p_envelope_Start_Time,
in template (omit) Envelope_Start_Time_AVP p_envelope_End_Time := omit,
in template (omit) Envelope_End_Time_AVP p_envelope_End_Time := omit,
in template (omit) CC_Total_Octets_AVP p_cc_Total_Octets := omit,
in template (omit) CC_Input_Octets_AVP p_cc_Input_Octets := omit,
in template (omit) CC_Output_Octets_AVP p_cc_Output_Octets := omit,
......
......@@ -650,7 +650,10 @@ module DiameterRfRo_TestCases
*/
testcase TC_RF_CTF_MS_01() runs on DiameterRfRo system TestAdapter {
// Local variables
var DiameterRfRo v_diameterRf_cdf;
var DiameterRfRo v_diameterRf_cdf;
var ImsComponent v_imsComponent_ue;
var ImsComponent v_imsComponent_cscf;
var CSeq p_cSeq_s := {fieldName := CSEQ_E, seqNumber := 1000, method := "REGISTER"};
// Test control
if (not PICS_RF_CTF_IUT) {
......@@ -659,15 +662,19 @@ module DiameterRfRo_TestCases
}
// Test component configuration
f_cf_1Rf_cdfUp(v_diameterRf_cdf);
f_cf_1Rf_1Gm_1Mw_cdfUp(v_diameterRf_cdf, v_imsComponent_ue, v_imsComponent_cscf);
// Start
v_diameterRf_cdf.start(f_TC_CTF_MS_01());
if (PX_SIPsupport) {
v_imsComponent_ue.start(f_TC_CTF_MS_UE_01(p_cSeq_s));
v_imsComponent_cscf.start(f_TC_CTF_MS_CSCF_01(p_cSeq_s));
}
// synchronize PTC on 1 sychronization points
f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
f_cf_1Rf_cdfDown(v_diameterRf_cdf)
f_cf_1Rf_1Gm_1Mw_cdfDown(v_diameterRf_cdf, v_imsComponent_ue, v_imsComponent_cscf)
} // End of testcase TC_RF_CTF_MS_01
......@@ -705,7 +712,10 @@ module DiameterRfRo_TestCases
*/
testcase TC_RF_CTF_MS_02() runs on DiameterRfRo system TestAdapter {
// Local variables
var DiameterRfRo v_diameterRf_cdf;
var DiameterRfRo v_diameterRf_cdf;
var ImsComponent v_imsComponent_ue;
var ImsComponent v_imsComponent_cscf;
var CSeq p_cSeq_s := {fieldName := CSEQ_E, seqNumber := 1000, method := "REGISTER"};
// Test control
if (not PICS_RF_CTF_IUT) {
......@@ -714,15 +724,19 @@ module DiameterRfRo_TestCases
}
// Test component configuration
f_cf_1Rf_cdfUp(v_diameterRf_cdf);
f_cf_1Rf_1Gm_1Mw_cdfUp(v_diameterRf_cdf, v_imsComponent_ue, v_imsComponent_cscf);
// Start
v_diameterRf_cdf.start(f_TC_CTF_MS_02());
if (PX_SIPsupport) {
v_imsComponent_ue.start(f_TC_CTF_MS_UE_01(p_cSeq_s));
v_imsComponent_cscf.start(f_TC_CTF_MS_CSCF_01(p_cSeq_s));
}
// synchronize PTC on 1 sychronization points
f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
f_cf_1Rf_cdfDown(v_diameterRf_cdf)
f_cf_1Rf_1Gm_1Mw_cdfDown(v_diameterRf_cdf, v_imsComponent_ue, v_imsComponent_cscf)
} // End of testcase TC_RF_CTF_MS_02
......@@ -1213,7 +1227,7 @@ module DiameterRfRo_TestCases
f_cf_2Rf_1Gm_1Mw_cdfUp(v_diameterRf_cdf, v_diameterRf_cdf2, v_imsComponent_ue, v_imsComponent_cscf);
// Start
v_diameterRf_cdf.start(f_TC_CTF_EC_02());
v_diameterRf_cdf.start(f_TC_CTF_EC_02(v_diameterRf_cdf));
v_diameterRf_cdf2.start(f_TC_CTF_EC_02_2ndCDF());
if (PX_SIPsupport) {
v_imsComponent_ue.start(f_TC_CTF_EC_UE_02(p_cSeq_s));
......@@ -1279,7 +1293,7 @@ module DiameterRfRo_TestCases
f_cf_2Rf_1Gm_1Mw_cdfUp(v_diameterRf_cdf, v_diameterRf_cdf2, v_imsComponent_ue, v_imsComponent_cscf);
// Start
v_diameterRf_cdf.start(f_TC_CTF_EC_03());
v_diameterRf_cdf.start(f_TC_CTF_EC_03(v_diameterRf_cdf));
v_diameterRf_cdf2.start(f_TC_CTF_EC_03_2ndCDF());
if (PX_SIPsupport) {
v_imsComponent_ue.start(f_TC_CTF_EC_UE_03(p_cSeq_s));
......@@ -1287,7 +1301,7 @@ module DiameterRfRo_TestCases
}
// synchronize PTC on 1 sychronization points
f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_sync1, c_tbDone, c_poDone});
f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_sync1, c_sync2, c_tbDone, c_poDone});
f_cf_2Rf_1Gm_1Mw_cdfDown(v_diameterRf_cdf, v_diameterRf_cdf2, v_imsComponent_ue, v_imsComponent_cscf)
......@@ -1349,7 +1363,7 @@ module DiameterRfRo_TestCases
f_cf_1Rf_1Gm_1Mw_cdfUp(v_diameterRf_cdf, v_imsComponent_ue, v_imsComponent_cscf);
// Start
v_diameterRf_cdf.start(f_TC_CTF_EC_04());
v_diameterRf_cdf.start(f_TC_CTF_EC_04(v_diameterRf_cdf));
if (PX_SIPsupport) {
v_imsComponent_ue.start(f_TC_CTF_EC_UE_04(p_cSeq_s));
v_imsComponent_cscf.start(f_TC_CTF_EC_CSCF_04(p_cSeq_s));
......@@ -1492,7 +1506,7 @@ module DiameterRfRo_TestCases
f_cf_1Rf_1Gm_1Mw_cdfUp(v_diameterRf_cdf, v_imsComponent_ue, v_imsComponent_cscf);
// Start
v_diameterRf_cdf.start(f_TC_CTF_EC_06());
v_diameterRf_cdf.start(f_TC_CTF_EC_06(v_diameterRf_cdf));
if (PX_SIPsupport) {
v_imsComponent_ue.start(f_TC_CTF_EC_UE_06(p_cSeq_s));
v_imsComponent_cscf.start(f_TC_CTF_EC_CSCF_06(p_cSeq_s));
......
......@@ -177,7 +177,6 @@ module DiameterRfRo_TestControl {
}
if (PICS_RO_CTF_IMMEDIATE_EVENT_CHARGING and PICS_RO_CTF_DDFH_CONTINUE and not(PICS_RO_CTF_FAILOVER)) {
execute(TC_RO_CTF_EC_07());
execute(TC_RO_CTF_EC_08());
}
if (PICS_RO_CTF_EVENT_CHARGING_WITH_UNIT_RESERVATION and PICS_RO_CTF_TARIFF_CHANGES_DURING_ACTIVE_SESSION) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment