Configurations, PIXITS modified. Errors solved. (5b5fcb10) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterShDh

.gitignore

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,3 +4,5 @@
		/.settings/
		/.gitignore.my
		.DEPENDENCIES
		/LibSip/xsd/*.ttcn3view
		/LibDiameter/xsd/*.ttcn3view

ttcn/DiameterShDh_PIXITS.ttcn3

+12 −2

Original line number	Diff line number	Diff line
		@@ -24,12 +24,12 @@ module DiameterShDh_PIXITS {
		/** @desc charstring, PIXIT item A-7/3
		* IP address of the test system
		*/
		modulepar charstring PX_DIAMETER_SH_ETS_IPADDR2 := "1.1.1.11";
		modulepar charstring PX_DIAMETER_DH_ETS_IPADDR := "1.1.1.11";

		/** @desc integer, PIXIT item A-7/4
		* Port number of the test system
		*/
		modulepar integer PX_DIAMETER_SH_ETS_PORT2 := 3868;
		modulepar integer PX_DIAMETER_DH_ETS_PORT := 3868;

		} // End of group TS_ShDh_Port_and_addresses

		@@ -45,6 +45,16 @@ module DiameterShDh_PIXITS {
		*/
		modulepar integer PX_DIAMETER_SH_SUT_PORT := 3868;

		/** @desc charstring, PIXIT item A-8/1
		* IP address of the system under test
		*/
		modulepar charstring PX_DIAMETER_DH_SUT_IPADDR := "1.1.2.11";

		/** @desc integer, PIXIT item A-8/2
		* Port number of the system under test
		*/
		modulepar integer PX_DIAMETER_DH_SUT_PORT := 3868;

		}//end group SUT_ShDh_Port_and_addresses{

		} // End of group Port_and_addresses

ttcn/DiameterShDh_Steps.ttcn3

+41 −2

Original line number	Diff line number	Diff line
		@@ -63,6 +63,45 @@ module DiameterShDh_Steps {

		} // End of function f_DiameterSh_init

		/*
		* @desc This is a test step that init global variables
		* @param
		*/
		function f_DiameterDh_init()
		runs on DiameterShDh {

		//Defaults
		vc_default_diameter := activate (a_diameter_default());

		//Base LibDiameter init function if there will be any base initialisation
		f_Diameter_Init_Component();

		vc_ETS_address := PX_DIAMETER_DH_ETS_IPADDR;
		vc_ETS_port := PX_DIAMETER_DH_ETS_PORT;
		vc_SUT_address := PX_DIAMETER_DH_SUT_IPADDR;
		vc_SUT_port := PX_DIAMETER_DH_SUT_PORT;

		vc_sessionId := m_sessionId(PX_SessionID);

		vc_originHost := m_originHost(PX_OriginHost);
		vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

		vc_originHost_IUT := m_originHost(PX_DestinationHost);
		vc_originRealm_IUT := m_originRealm(PX_DestinationRealm); // realm of the originator (TS)

		vc_destinationHost := m_destinationHost(PX_DestinationHost);
		vc_destinationRealm := m_destinationRealm(PX_DestinationRealm);

		vc_destinationHost_IUT := m_destinationHost(PX_OriginHost);
		vc_destinationRealm_IUT := m_destinationRealm(PX_OriginRealm);

		vc_hostIPAddress := valueof(f_IPV4or6_String2Address (PX_DIAMETER_DH_ETS_IPADDR));

		vc_send_hopid:=hex2int('00000100'H);
		vc_send_endid:=hex2int('01000000'H);

		} // End of function f_DiameterSh_init

		} // End of group GlobalSteps


		@@ -92,7 +131,7 @@ module DiameterShDh_Steps {
		f_preambleServer();
		}

		f_DiameterSh_init();
		f_DiameterDh_init();
		f_preambleDiameterBaseServer(c_applId3GPPShDh);
		v_def_diameter_catchEvent := activate (a_diameter_event());

		@@ -124,7 +163,7 @@ module DiameterShDh_Steps {
		f_preambleServer();
		}

		f_DiameterSh_init();
		f_DiameterDh_init();
		f_preambleDiameterBaseServer(c_applId3GPPShDh);
		v_def_diameter_catchEvent := activate (a_diameter_event());

ttcn/DiameterShDh_TCFunctions.ttcn3

+32 −7

Original line number	Diff line number	Diff line
		@@ -1043,7 +1043,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(DSAI_E),
		m_user_Data_shData(unichar2oct(encvalue_unichar(m_imsdata_ext2)))
		m_user_Data_dummy//m_user_Data_shData(unichar2oct(encvalue_unichar(m_imsdata_ext2)))//TODO - Commented to avoid ERROR
		)
		)
		);
		@@ -1147,7 +1147,8 @@ module DiameterShDh_TCFunctions {
		mw_resultCode(DIAMETER_SUCCESS_E),
		*,
		vc_originHost_IUT, // containing an Origin-Host AVP
		vc_originRealm_IUT
		vc_originRealm_IUT,
		*
		))
		);

		@@ -2432,6 +2433,29 @@ module DiameterShDh_TCFunctions {
		PX_HSS_IDENTITY// indicating the HSS identity to be used
		)
		)));

		f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_postamble_Dh_SLF();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");

		} // End of function f_TC_DH_AS_UD_01()

		function f_TC_DH_AS_UD_01_HSS() runs on DiameterShDh {
		// Local variables

		// Preamble
		f_preamble_Sh_HSS();
		f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		// TestBody

		f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

		f_awaiting_UDR(
		mdw_uDR_Header_UDRBody(
		?,
		@@ -2445,8 +2469,6 @@ module DiameterShDh_TCFunctions {
		// indicating RepositoryData (0)
		)));

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_send_UDA(
		md_uDA(
		vc_sessionId, // Set in f_awaiting_UDR
		@@ -2455,11 +2477,14 @@ module DiameterShDh_TCFunctions {
		vc_originHost,
		vc_originRealm
		)));
		f_postamble_Dh_SLF();

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

		f_postamble_Sh_HSS();
		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");

		} // End of function f_TC_DH_AS_UD_01()
		} // End of function f_TC_DH_AS_UD_01_HSS()

		} // End of group TP_ASRole_UserData

ttcn/DiameterShDh_Templates.ttcn3

+4 −3

Original line number	Diff line number	Diff line
		@@ -174,7 +174,8 @@ module DiameterShDh_Templates {
		template Repository_Data_ID_AVP mw_repository_data_id := {
		aVP_Header := mw_aVP_HeaderVid_Mbit1(c_repository_Data_Id_AVP_Code, ?, ?),
		service_Indication := ? ,
		sequence_Number := ?
		sequence_Number := ?,
		aVP_Type := *
		}

		} // End of group receivingTemplatesForAVPs
		@@ -186,8 +187,8 @@ module DiameterShDh_Templates {
		group Sh_XML_templates{

		template TShIMSDataExtension2 m_imsdata_ext2:= {
		dSAI_list := ? //TODO
		//extension_ := *
		dSAI_list := ?, //TODO
		extension_ := * //TODO
		}

		}// End of group Sh_XML_templates