Commit 3ad881d5 authored by mullers's avatar mullers
Browse files

TC_TRANS_IPv4withTunneledIPv6 updated

parent d541587c

ttcn3/EtsiAts/AtsIpv6/AtsCommon/AtsIpv6_TestConfiguration.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -1375,7 +1375,7 @@ 
			var FncRetCode v_ret := e_error;

			

			//fill v_cfMsg

			v_cfMsg.role := c_ptcRoleRt01 ;

			v_cfMsg.role := c_ptcRoleIpv4Rt01 ;

			v_cfMsg.netDeviceId := PX_NET_DEVICE_ID_1 ;

			v_cfMsg.macFilterList := {		PX_MAC_UCA_RT01_A,

											PX_MAC_UCA_HS01,

ttcn3/EtsiAts/AtsIpv6/AtsCommon/AtsIpv6_TestConfiguration_TypesAndValues.ttcn

+6 −5
Original line number Diff line number Diff line
@@ -47,14 +47,15 @@ module AtsIpv6_TestConfiguration_TypesAndValues { 
	}///end syncConstants



	group roleConstants {

		const String1To64 c_ptcRoleRt01 := "Router01";

		const String1To64 c_ptcRoleRt02 := "Router02";	/* new */

		const String1To64 c_ptcRoleRt01 := "Router01";//to enqueue to every known router component

		const String1To64 c_ptcRoleRt02 := "Router02";

		const String1To64 c_ptcRoleRt03 := "Router03";

		const String1To64 c_ptcRoleRt04 := "Router04";	/* new */

		const String1To64 c_ptcRoleRt04 := "Router04";

		const String1To64 c_ptcRoleHs01 := "Host01";

		const String1To64 c_ptcRoleHs02 := "Host02";

		const String1To64 c_ptcRoleHs03 := "Host03";

		const String1To64 c_ptcRoleMn01 := "Mn01";

		const String1To64 c_ptcRoleIpv4Rt01 := "Ipv4Router01";

	

	}//end roleConstants
@@ -96,9 +97,9 @@ module AtsIpv6_TestConfiguration_TypesAndValues { 
			Ipv6NodeParams			paramsHs02 optional,

			Ipv6NodeParams			paramsHs03 optional,

			Ipv6NodeParams			paramsRt01 optional,

			Ipv6NodeParams			paramsRt02 optional,/* new */

			Ipv6NodeParams			paramsRt02 optional,

			Ipv6NodeParams			paramsRt03 optional,

			Ipv6NodeParams			paramsRt04 optional,/* new */			

			Ipv6NodeParams			paramsRt04 optional,

			Ipv6NodeParams			paramsMn01 optional,

			Ipv6NodeParams			paramsIut optional

		}

ttcn3/EtsiAts/AtsIpv6/AtsTransitioning/AtsIpv6_Prototype_Testcases.ttcn

+15 −17
Original line number Diff line number Diff line
@@ -38,30 +38,29 @@ module AtsIpv6_Prototype_Testcases { 
	 * @desc  Sends IPv4 Packet which includes IPv6 Packet

	 *        Uses test configuration 1.

	*/

/*	testcase TC_TRANS_IPv4withTunneledIPv6() runs on Ipv6Node system NodeTestAdapter {

	testcase TC_TRANS_IPv4withTunneledIPv6() runs on Ipv6Node system NodeTestAdapter {

		//Variables

		var Ipv4CfMessage v_ipv4CfMsg;

		var CfMessage v_ipv6CfMsg;

		var CfMessage v_ipv6to4CfMsg;

		var FncRetCode v_ret := e_error;



		//Configuration

		f_cfTrans01Up(v_ipv4CfMsg, v_ipv6CfMsg);

		f_cfTrans01Up(v_ipv6to4CfMsg);



		activate(a_ipv4_tn_nut(v_ipv4CfMsg.paramsRt01, v_ipv4CfMsg.paramsIut));

		activate(a_ipv4_tn_nut(v_ipv6to4CfMsg.paramsRt01, v_ipv6to4CfMsg.paramsIut));



		//Preamble

		f_PR_6to4_tn_nut(v_ipv4CfMsg, e_cleanGla, v_ipv4CfMsg.paramsRt01, v_ipv4CfMsg.paramsIut);

		f_PR_6to4_tn_nut(v_ipv6to4CfMsg, e_cleanGla, v_ipv6to4CfMsg.paramsRt01, v_ipv6to4CfMsg.paramsIut);

		

		// test body



		// start f_TP_6to4EchoProcUp

		v_ret := f_sendIpv4Packet ( 

			m_ipv4Packet_tunneledIpv6 (

				v_ipv4CfMsg.paramsRt01.ipv4Addr,//PX_IPV4_GLA_RT01_A,

				v_ipv4CfMsg.paramsIut.ipv4Addr,//PX_IPV4_GLA_IUT_1,

				v_ipv6to4CfMsg.paramsRt01.ipv4Addr,//PX_IPV4_GLA_RT01_A,

				v_ipv6to4CfMsg.paramsIut.ipv4Addr,//PX_IPV4_GLA_IUT_1,

				m_echoRequest_noExtHdr_noData (

					v_ipv6CfMsg.paramsRt01.gla,//PX_6to4_GLA_RT01_A,

					v_ipv6CfMsg.paramsIut.gla,//PX_6to4_GLA_IUT_1

					v_ipv6to4CfMsg.paramsRt01.gla,//PX_6to4_GLA_RT01_A,

					v_ipv6to4CfMsg.paramsIut.gla,//PX_6to4_GLA_IUT_1

					c_defId,

					c_defSeqNo

				)
@@ -72,11 +71,11 @@ module AtsIpv6_Prototype_Testcases { 
		tc_ac.start;

		alt{

			[] ipv4Port.receive(mw_ipv4Packet_tunneledIpv6 (

									v_ipv4CfMsg.paramsIut.ipv4Addr,//PX_IPV4_GLA_IUT_1,

									v_ipv4CfMsg.paramsRt01.ipv4Addr,//PX_IPV4_GLA_RT01_A,

									v_ipv6to4CfMsg.paramsIut.ipv4Addr,//PX_IPV4_GLA_IUT_1,

									v_ipv6to4CfMsg.paramsRt01.ipv4Addr,//PX_IPV4_GLA_RT01_A,

									mw_echoReply_noExtHdr_noData (

										v_ipv6CfMsg.paramsIut.gla,//PX_6to4_GLA_IUT_1

										v_ipv6CfMsg.paramsRt01.gla,//PX_6to4_GLA_RT01_A,

										v_ipv6to4CfMsg.paramsIut.gla,//PX_6to4_GLA_IUT_1

										v_ipv6to4CfMsg.paramsRt01.gla,//PX_6to4_GLA_RT01_A,

										c_defId,

										c_defSeqNo

									)
@@ -91,16 +90,15 @@ module AtsIpv6_Prototype_Testcases { 
		}//end alt

		// end f_TP_6to4EchoProcUp





		// postamble

		f_PO_6to4_tn_nut(v_ipv4CfMsg, c_cleanOnlyLla, v_ipv4CfMsg.paramsRt01, v_ipv4CfMsg.paramsIut);

		f_PO_6to4_tn_nut(v_ipv6to4CfMsg, c_cleanOnlyLla, v_ipv6to4CfMsg.paramsRt01, v_ipv6to4CfMsg.paramsIut);



		deactivate;



		f_ipv4CfPtcDown();



	}//end TC_TRANS_IPv4withTunneledIPv6

*/



		/*

	 * @desc  Sends IPv4 Packet without IPv6 Packet

	 *        Uses test configuration 1.