Merge branch 'develop' of https://forge.etsi.org/gitlab/DIAMETER/DiameterShDh into develop (3d3a73ba) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterShDh

LibDiameter @ d0520a15

Original line number	Diff line number	Diff line
		Subproject commit 03e99fe0ee4b9466a9de3a873359f8485863a3d9
		Subproject commit d0520a15a2b12d917a2b966755150a268718d882

ttcn/DiameterShDh_PICS.ttcn3

+8 −2

Original line number	Diff line number	Diff line
		@@ -9,17 +9,23 @@ module DiameterShDh_PICS {

		group PICS_A2{
		/**
		* @desc Does AS act as the IUT?
		* @desc Does IUT act as HSS?
		* @see ETSI TS 103 571-1 V0.0.2 (2018-09) A.2/1
		*/
		modulepar boolean PICS_HSS_IUT := false;

		/**
		* @desc Does CTF act as the IUT?
		* @desc Does IUT act as AS?
		* @see ETSI TS 103 374-1 V1.1.2 (2015-09) A.2/2
		*/
		modulepar boolean PICS_AS_IUT := false;

		/**
		* @desc Does IUT act as SLF?
		* @see ETSI TS 103 374-1 V1.1.2 (2015-09) A.2/2
		*/
		modulepar boolean PICS_SLF_IUT := false;

		} // End of group PICS_A2

		group PICS_A3 {

ttcn/DiameterShDh_TCFunctions.ttcn3

+345 −13

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/DiameterShDh_Templates.ttcn3

+25 −1

Original line number	Diff line number	Diff line
		@@ -141,8 +141,19 @@ module DiameterShDh_Templates {
		aVP_Data := p_aVP_Data
		}

		} // End of group sendingTemplatesForAVPs

		group receivingTemplatesForAVPs{

		template (present) Redirect_Host_AVP mw_redirect_host(
		template (present) Diameter_Identity p_aVP_Data := ?
		) := {
		aVP_Header := mw_aVP_HeaderVid_Mbit1(c_redirect_Host_AVP_Code, ?, ?),
		aVP_Data := p_aVP_Data
		}

		} // End of group receivingTemplatesForAVPs

		} // End of group SpecificAVPHeaders

		} // End of group AvpsTemplates
		@@ -644,6 +655,19 @@ module DiameterShDh_Templates {
		origin_Realm := p_originRealm
		} // End of template mdw_udaBodyAvps

		template (present) UDA_Body_AVP mdw_udaBodyAvps_redirect(
		template (present) Result_Code_AVP p_resultCode,
		template (present) Origin_Host_AVP p_originHost,
		template (present) Origin_Realm_AVP p_originRealm,
		template (present) Redirect_Host_AVP p_redirect_Host_AVP
		) modifies mw_UDA_Body_dummy := {
		result_Code := p_resultCode,
		experimental_Result := omit,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		aVP_Type := superset(AVP_Type: {p_redirect_Host_AVP.aVP_Header, ?})
		} // End of template mdw_udaBodyAvps_redirect

		template (present) Experimental_Result_AVP mw_experimentalResult(
		template (present) Experimental_Result_Type p_expResultCode
		) := {

ttcn/DiameterShDh_TestCases.ttcn3

+279 −135

Original line number	Diff line number	Diff line
		@@ -132,7 +132,11 @@ module DiameterShDh_TestCases {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		// Test control - PICS
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -157,7 +161,7 @@ module DiameterShDh_TestCases {
		* }
		* Expected behaviour:
		* Ensure that the IUT
		on receipt of a UD-Request
		* on receipt of a UD-Request
		* containing a Session-ID AVP
		* containing a Vendor-Specific-Application-Id AVP
		* containing an Auth-Session-State AVP
		@@ -183,7 +187,11 @@ module DiameterShDh_TestCases {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		// Test control - PICS
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -235,7 +243,11 @@ module DiameterShDh_TestCases {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		// Test control - PICS
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -287,7 +299,11 @@ module DiameterShDh_TestCases {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		// Test control - PICS
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -341,7 +357,11 @@ module DiameterShDh_TestCases {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		// Test control - PICS
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -366,7 +386,7 @@ module DiameterShDh_TestCases {
		* }
		* Expected behaviour:
		* Ensure that the IUT
		on receipt of a UD-Request
		* on receipt of a UD-Request
		* containing a Session-ID AVP
		* containing a Vendor-Specific-Application-Id AVP
		* containing an Auth-Session-State AVP
		@@ -377,7 +397,7 @@ module DiameterShDh_TestCases {
		* indicating IMS Public User Identity
		* containing a Data-Reference AVP
		* indicating IPAddressSecurityBindingInformation (22)
		sends a UD-Answer
		* sends a UD-Answer
		* containing a Session-ID AVP
		* containing an Experimental-Result AVP
		* indicating DIAMETER_ERROR_OPERATION_NOT_ALLOWED
		@@ -395,7 +415,11 @@ module DiameterShDh_TestCases {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		// Test control - PICS
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -420,7 +444,7 @@ module DiameterShDh_TestCases {
		* }
		* Expected behaviour:
		* Ensure that the IUT
		on receipt of a UD-Request
		* on receipt of a UD-Request
		* containing a Session-ID AVP
		* containing a Vendor-Specific-Application-Id AVP
		* containing an Auth-Session-State AVP
		@@ -446,7 +470,11 @@ module DiameterShDh_TestCases {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		// Test control - PICS
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -471,7 +499,7 @@ module DiameterShDh_TestCases {
		* }
		* Expected behaviour:
		* Ensure that the IUT
		on receipt of a UD-Request
		* on receipt of a UD-Request
		* containing a Session-ID AVP
		* containing a Vendor-Specific-Application-Id AVP
		* containing an Auth-Session-State AVP
		@@ -1457,7 +1485,7 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_01
		*/
		testcase TP_SH_HSS_PU_01() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_01() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		@@ -1513,7 +1541,7 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_02
		*/
		testcase TP_SH_HSS_PU_02() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_02() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		@@ -1557,7 +1585,7 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_03
		*/
		testcase TP_SH_HSS_PU_03() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_03() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		@@ -1602,7 +1630,7 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_04
		*/
		testcase TP_SH_HSS_PU_04() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_04() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		@@ -1649,7 +1677,7 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_05
		*/
		testcase TP_SH_HSS_PU_05() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_05() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		@@ -1696,7 +1724,7 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_06
		*/
		testcase TP_SH_HSS_PU_06() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_06() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		@@ -1743,7 +1771,7 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_07
		*/
		testcase TP_SH_HSS_PU_07() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_07() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		@@ -1793,11 +1821,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_08
		*/
		testcase TP_SH_HSS_PU_08() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_08() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -1836,11 +1868,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_09
		*/
		testcase TP_SH_HSS_PU_09() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_09() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -1883,11 +1919,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_10
		*/
		testcase TP_SH_HSS_PU_10() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_10() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -1929,11 +1969,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_11
		*/
		testcase TP_SH_HSS_PU_11() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_11() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -1975,11 +2019,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_12
		*/
		testcase TP_SH_HSS_PU_12() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_12() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -2021,11 +2069,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_13
		*/
		testcase TP_SH_HSS_PU_13() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_13() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -2066,11 +2118,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_14
		*/
		testcase TP_SH_HSS_PU_14() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_14() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -2114,11 +2170,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_15
		*/
		testcase TP_SH_HSS_PU_15() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_15() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -2163,11 +2223,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_16
		*/
		testcase TP_SH_HSS_PU_16() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_16() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -2211,11 +2275,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_17
		*/
		testcase TP_SH_HSS_PU_17() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_17() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -2260,11 +2328,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_18
		*/
		testcase TP_SH_HSS_PU_18() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_18() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -2309,11 +2381,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_19
		*/
		testcase TP_SH_HSS_PU_19() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_19() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -2356,11 +2432,15 @@ module DiameterShDh_TestCases {
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_SH_HSS_PU_20
		*/
		testcase TP_SH_HSS_PU_20() runs on DiameterShDh system TestAdapter {
		testcase TC_SH_HSS_PU_20() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_as;

		//TODO Test control - PICS
		//Test control
		if (not PICS_HSS_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Sh_asUp(v_diameterSh_as);
		@@ -2900,6 +2980,70 @@ module DiameterShDh_TestCases {
		//} // End of group TP_SLFRole_MessageSyntax

		group TP_SLFRole_UserData{

		/**
		* @desc Verify that the IUT processes a UD-Request and sends corresponding UD-Answer.
		* <pre>
		* Pics Selection: PICS_SLF_IUT
		* Initial conditions:
		* with {
		*
		* }
		* Expected behaviour:
		* ensure that {
		* when {
		* the IUT receives a UD-Request
		* containing a Session-ID AVP
		* containing a Vendor-Specific-Application-Id AVP
		* containing an Auth-Session-State AVP
		* containing an Origin-Host AVP
		* containing an Origin-Realm AVP
		* containing a Destination-Realm AVP
		* not containing a User-Identity AVP
		* containing a Data-Reference AVP
		* }
		* then {
		* the IUT sends a UD-Answer
		* containing a Session-ID AVP
		* containing a Vendor-Specific-Application-Id AVP
		* containing an Auth-Session-State AVP
		* containing an Origin-Host AVP
		* containing an Origin-Realm AVP
		* containing an Redirect-Host AVP
		* indicating the HSS identity to be used
		* not containing an Experimental-Result AVP
		* containing a Result-Code AVP
		* indicating DIAMETER_REDIRECT_INDICATION (3006).
		* }
		* }
		* </pre>
		*
		* @version 0.0.6
		* @see ETSI TS 103 571-2 TP_DH_SLF_UD_01
		*/
		testcase TC_DH_SLF_UD_01() runs on DiameterShDh system TestAdapter {
		// Local variables
		var DiameterShDh v_diameterSh_slf;

		// Test control
		if (not PICS_SLF_IUT) {
		log("* " & __SCOPE__ & ": ERROR: 'PICS_SLF_IUT' required for executing the TC. *");
		stop;
		}

		// Test component configuration
		f_cf_1Dh_slfUp(v_diameterSh_slf);

		// Start
		v_diameterSh_slf.start(f_TC_DH_SLF_UD_01());

		// synchronize PTC on 1 sychronization points
		f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});

		f_cf_1Dh_slfDown(v_diameterSh_slf);

		} // End of testcase TC_DH_SLF_UD_01

		} // End of group TP_SLFRole_UserData

		group TP_SLFRole_ProfileUpdate{