Commit 7bc3680f authored by rennoch's avatar rennoch
Browse files

more CX_CSCF_PP tests (but missing UserData_AVP: CxData_Type_Rel10.xsd)

parent 1b898fbe

DiameterCxDx/ttcn/DiameterCxDx_Cx_TCFunctions.ttcn3

+101 −2
Original line number Original line Diff line number Diff line
@@ -4219,7 +4219,60 @@ module DiameterCxDx_Cx_TCFunctions { 
                    // Test Body

                    // Test Body

                    // the IUT sends a PP-Request

                    // the IUT sends a PP-Request

                    vc_userName := m_userName(PX_UserName);

                    vc_userName := m_userName(PX_UserName);

                    f_send_PPR(m_PPR_Msg(vc_sessionId, m_PPR(vc_originHost, vc_originRealm, vc_destinationHost, vc_destinationRealm, vc_userName, m_userData('0102'O), omit, omit)));

                    f_send_PPR(m_PPR_Msg(vc_sessionId,

										 m_PPR(vc_originHost, vc_originRealm,

											   vc_destinationHost,

											   vc_destinationRealm,

											   vc_userName,

											   m_userData('0102'O), omit,

											   omit)));

                    f_awaiting_PPA(mw_PPA_Msg(?, mw_PPA_ResulExpre(?, omit)));

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

                    

                    // Postamble



                    //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))));



                    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_PP_02_UA(in CSeq p_cSeq_s) runs on ImsComponent {

					f_TC_CX_CSCF_PP_01_UA(p_cSeq_s)				}

                function f_TC_CX_CSCF_PP_02_HSS() runs on DiameterCx {

                    // Local variables

                    // Preamble: first complete registration

                    f_preamble_HSS();



                    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))));

                  

                    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))));

                  

                    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))));

                  

                    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_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

                    

                    // Test Body

                    // the IUT sends a PP-Request

                    vc_userName := m_userName(PX_UserName);

                    f_send_PPR(m_PPR_Msg(vc_sessionId,

										 m_PPR(vc_originHost, vc_originRealm,

											   vc_destinationHost,

											   vc_destinationRealm,

											   vc_userName,

											   omit,

											   m_chargingInformation_dummy,

											   omit)));

                    f_awaiting_PPA(mw_PPA_Msg(?, mw_PPA_basic));

                    f_awaiting_PPA(mw_PPA_Msg(?, mw_PPA_basic));

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -4235,7 +4288,53 @@ module DiameterCxDx_Cx_TCFunctions { 
                    f_postamble_HSS();

                    f_postamble_HSS();

                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());

                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());

                }					

                }					

				function f_TC_CX_CSCF_PP_03_UA(in CSeq p_cSeq_s) runs on ImsComponent {

					f_TC_CX_CSCF_PP_01_UA(p_cSeq_s)             }

				function f_TC_CX_CSCF_PP_03_HSS() runs on DiameterCx {

					// Local variables

					// Preamble: first complete registration

					f_preamble_HSS();





					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))));

                  

					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))));

                  

					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))));

                  

					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_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

                    

					// Test Body

					// the IUT sends a PP-Request

					vc_userName := m_userName(PX_UserName);

					f_send_PPR(m_PPR_Msg(vc_sessionId,

										 m_PPR(vc_originHost, vc_originRealm,

											   vc_destinationHost,

											   vc_destinationRealm,

											   vc_userName,

											   omit,

											   omit,

					                           m_sIPAuthDataItem_dummy)));

					f_awaiting_PPA(mw_PPA_Msg(?, mw_PPA_basic));

					f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

                    

					// Postamble



					//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))));



					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());

				}

            } // group TP_CSCFRole_PP

            } // group TP_CSCFRole_PP

			group TP_CSCFRole_MA {//Cx MA

			group TP_CSCFRole_MA {//Cx MA

			} // group TP_CSCFRole_MA

			} // group TP_CSCFRole_MA

DiameterCxDx/ttcn/DiameterCxDx_Templates.ttcn

+15 −0
Original line number Original line Diff line number Diff line
@@ -147,6 +147,14 @@ module DiameterCxDx_Templates { 
													c_vendId3gpp),

													c_vendId3gpp),

				aVP_Data := p_aVpData

				aVP_Data := p_aVpData

				}

				}

				template Charging_Information_AVP m_chargingInformation_dummy := {

					aVP_Header                                 := m_aVP_HeaderVid_Mbit1(c_charging_Information_AVP_Code, 4, c_vendId3gpp), //<AVP header: 618 ....>

					primary_Event_Charging_Function_Name       := omit,

					secondary_Event_Charging_Function_Name     := omit,

					primary_Charging_Collection_Function_Name  := omit,

					secondary_Charging_Collection_Function_Name:= omit,

					aVP_Type                                   := omit

				}

                

                

              }//end group sendingTemplatesForAVPs

              }//end group sendingTemplatesForAVPs

              group awaitingTemplatesForAVPs{

              group awaitingTemplatesForAVPs{
@@ -1441,6 +1449,13 @@ module DiameterCxDx_Templates { 
                    server_Capabilities := p_serverCapabilities

                    server_Capabilities := p_serverCapabilities

                }

                }





				template PPA_Body_AVP mw_PPA_ResulExpre (template Result_Code_AVP p_resultCode, 

														 template Experimental_Result_AVP p_experimentalResult)

				modifies mw_PPA_basic := {

					result_Code := p_resultCode,

					experimental_Result := p_experimentalResult

				}

                

            } // end group CxModified_answer_templates_receive

            } // end group CxModified_answer_templates_receive

        } //end group CxModified_templates

        } //end group CxModified_templates