Commit 2a928094 authored by Axel Rennoch's avatar Axel Rennoch
Browse files

add decoding/matching of Sh_data

parent ea1b92d0

ttcn/DiameterShDh_TCFunctions.ttcn3

+13 −5
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ module DiameterShDh_TCFunctions { 
    import from DiameterShDh_PIXITS all;

    import from DiameterShDh_TestSystem all;



	import from NoTargetNamespace language "XSD" all

	with {

		extension "File:../LibDiameter/xsd/ShDataType_Rel15.xsd";

	}

    

    // 5.2.2.1. CDF Role

    group TP_SH_Role {
@@ -1958,6 +1963,7 @@ module DiameterShDh_TCFunctions { 
                

                function f_TC_SH_HSS_PN_02() runs on DiameterShDh { 

                    // Local variables

					var TSh_Data v_TSh_Data;

					

                    // Preamble

                    f_preamble_Sh_AS();
@@ -1984,9 +1990,11 @@ module DiameterShDh_TCFunctions { 
				    f_awaiting_PNR(

				                mdw_pNR(

										  vc_sessionId,                            // containing a Session-ID AVP

					                      mdw_pnrBodyUserdataAvps(?,?,?,mw_user_Data( char2oct(* & "shdata_repositorydata(0)_serviceinfo_seqnr" & *))) // TODO: Sh_data cp PU21

					                      mdw_pnrBodyUserdataAvps(?,?,?,mw_user_Data(?))

				    ));



                    decvalue_o(vc_recvDiamMsg.pNR_MSG.pNR_Body.user_Data.aVP_Data, v_TSh_Data);

                    if(not match(v_TSh_Data.repositoryData_list[0], mw_repositoryData)) {setverdict(fail)};



                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

ttcn/DiameterShDh_Templates.ttcn3

+20 −0
Original line number Diff line number Diff line
@@ -191,6 +191,26 @@ module DiameterShDh_Templates { 
           extension_ := * //TODO

        }

        

		template TSh_Data mw_tSh_Data (template (present) TSh_Data.repositoryData_list p_repositoryData_list):= {

		  publicIdentifiers := *,

		  repositoryData_list := p_repositoryData_list,

		  sh_IMS_Data := *,

		  cSLocationInformation := *,

		  pSLocationInformation := *,

		  cSUserState := *,

		  pSUserState := *,

		  extension_ := *,

		  elem_list := ?

		}



        template TTransparentData mw_repositoryData:= {

		  serviceIndication := ?,

		  sequenceNumber := ?,

		  serviceData  := *,

		  extension_ := *,

		  elem_list := ?

		}

        

    }// End of group Sh_XML_templates

    

    group Sh_modified_message_templates {