Commit d541587c authored by mullers's avatar mullers
Browse files

NEW 6TO4 TEST SYSTEM

parent 80f1c1b1

ttcn3/EtsiAts/AtsIpv6/AtsCommon/AtsIpv6_Defaults.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -485,8 +485,8 @@ 
	

	}//end mnOffHome_atHomeDefaults

	

	altstep a_ipv4_tn_nut(	 Ipv4NodeParams p_paramsTn,

							 Ipv4NodeParams p_paramsNut

	altstep a_ipv4_tn_nut(	 Ipv6NodeParams p_paramsTn,

							 Ipv6NodeParams p_paramsNut

	)

	runs on Ipv6Node {		

		[]	ipv4Port.receive(Ipv4Packet:?) {

ttcn3/EtsiAts/AtsIpv6/AtsCommon/AtsIpv6_ModuleParameters.ttcn

+5 −2
Original line number Diff line number Diff line
@@ -252,7 +252,8 @@ module AtsIpv6_ModuleParameters { 
//		modulepar {Oct6to15 PX_MAC_SOL_NODE_MCA_RT01_A := '3333FF00A1A1'O}

		modulepar {Ipv4Address PX_IPV4_GLA_RT01_A := 'D47F1001'O}

	//	modulepar {Ipv6Address PX_6to4_GLA_RT01_A := '2002D47F100100000000000000000001'O};

		modulepar {Oct10 PX_6to4_IF_ID_RT01_A := '00000000000000000001'O};

		modulepar {Oct8 PX_6to4_IF_ID_RT01_A := '0000000000000001'O};

		modulepar {Oct2 PX_IPV4_SUBNET_ID_RT01_A := '0001'O};

		

//		modulepar {Ipv6Address PX_SOL_NODE_MCA_RT01_A := 'FF0200000000000000000001FF00A1A1'O}
@@ -336,7 +337,9 @@ module AtsIpv6_ModuleParameters { 
		

		//modulepar {Ipv6Address PX_6to4_GLA_IUT_1 := '2002D47F110300000000000000000001'O}



		modulepar {Oct10 PX_6to4_IF_ID_IUT_1 := '00000000000000000002'O};

		modulepar {Oct8 PX_6to4_IF_ID_IUT_1 := '0000000000000002'O};



		modulepar {Oct2 PX_IPV4_SUBNET_ID_IUT_1 := '0001'O};

		

//		

//		/*

ttcn3/EtsiAts/AtsIpv6/AtsCommon/AtsIpv6_Postambles.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -501,10 +501,10 @@ 


	

 	function f_PO_6to4_tn_nut(

		Ipv4CfMessage p_cfMsg,

		CfMessage p_cfMsg,

		boolean p_glaCleanup,

		Ipv4NodeParams p_paramsTn,

		Ipv4NodeParams p_paramsNut

		Ipv6NodeParams p_paramsTn,

		Ipv6NodeParams p_paramsNut

	)

	runs on Ipv6Node {

		//Dummy Postamble. Not clear yet if postamble is needed at all.

ttcn3/EtsiAts/AtsIpv6/AtsCommon/AtsIpv6_Preambles.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -418,10 +418,10 @@ group ipSecPreambles { 
	 * @param	p_paramsHut Addresss Information of Node Under Test

	*/

	function f_PR_6to4_tn_nut (

		Ipv4CfMessage p_cfMsg,

		CfMessage p_cfMsg,

		CleanupLevel p_cleanup,

		Ipv4NodeParams p_paramsTn,

		Ipv4NodeParams p_paramsNut)

		Ipv6NodeParams p_paramsTn,

		Ipv6NodeParams p_paramsNut)

	runs on Ipv6Node {

		//Variables

		var FncRetCode v_ret := e_error ;

ttcn3/EtsiAts/AtsIpv6/AtsCommon/AtsIpv6_TestConfiguration.ttcn

+124 −85
Original line number Diff line number Diff line
@@ -440,11 +440,10 @@ 
	group cfTrans01 {

	

		/*

		 * @desc Creates configuration according to CF_CORE_01

		 * @desc Creates configuration for the IPv4 interface of the IPv6to$ NOde

	 	 * @param p_cfMsg Configuration message for Test Adapter

		*/

		function f_cfTrans01Up(

			out Ipv4CfMessage 	p_ipv4CfMsg,

			out CfMessage 		p_cfMsg

		)

		runs on Ipv6Node {
@@ -462,8 +461,9 @@ 
				v_ret := e_error;

			}

			// create cf msg

			p_ipv4CfMsg := f_createIpv4CfMsg_rt01() ;

			p_cfMsg		:= f_createCfMsg_6to4rt01() ;

			//p_ipv4CfMsg := f_createIpv4CfMsg_rt01() ;

			//p_cfMsg		:= f_createCfMsg_6to4rt01() ;

			p_cfMsg := f_createTrans01CfMsg_rt01();

			f_setVerdict(v_ret);

		}//end f_cfTrans01Up
@@ -506,7 +506,9 @@ 
				mnCoa := omit,

				macUca := p_nextHopMacUca,

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}

			

			if(p_nextHopMacUca!=PX_MAC_UCA_HS01) {
@@ -564,7 +566,9 @@ 
				mnCoa := omit,

				macUca := p_nextHopMacUca,

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}

			

			if(p_nextHopMacUca!=PX_MAC_UCA_HS02) {
@@ -622,7 +626,9 @@ 
				mnCoa := omit,

				macUca := p_nextHopMacUca,	

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}			

			

			if(p_nextHopMacUca!=PX_MAC_UCA_HS03) {
@@ -677,7 +683,9 @@ 
				mnCoa := omit,

				macUca := p_nextHopMacUca,

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}

						

			return v_params;
@@ -715,7 +723,9 @@ 
				mnCoa := omit,

				macUca := p_nextHopMacUca,

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}

						

			return v_params;
@@ -753,7 +763,9 @@ 
				mnCoa := omit,

				macUca := p_nextHopMacUca,

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}

			

			return v_params;
@@ -791,7 +803,9 @@ 
				mnCoa := omit,

				macUca := p_nextHopMacUca,

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}

			

			return v_params;
@@ -846,7 +860,9 @@ 
				mnCoa := v_coa,

				macUca := p_nextHopMacUca,

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}	

			

			return v_params;
@@ -904,7 +920,9 @@ 
				mnCoa := v_coa,

				macUca := p_nextHopMacUca,

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}



			return v_params;
@@ -942,7 +960,9 @@ 
				mnCoa := omit,

				macUca := p_nextHopMacUca,

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}



			return v_params;
@@ -980,7 +1000,9 @@ 
				mnCoa := omit,

				macUca := p_nextHopMacUca,

				macSolNodeMca := v_macSolNodeMca,

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}



			return v_params;
@@ -1018,7 +1040,6 @@ 
			v_cfMsg.paramsRt04 := omit;

			v_cfMsg.paramsRt03 := omit;

			v_cfMsg.paramsRt04 := omit;

			v_cfMsg.paramsCn03 := omit;

			v_cfMsg.paramsMn01 := omit;

			v_cfMsg.paramsIut := f_createParamsIutA(PX_MAC_UCA_IUT_1, true);
@@ -1053,7 +1074,7 @@ 
			v_cfMsg.paramsRt02 := omit;			

			v_cfMsg.paramsRt03 :=  f_createParamsRt03(PX_MAC_UCA_IUT_2, true);//newly added by SMU for IpSec

			v_cfMsg.paramsRt04 := omit;

			v_cfMsg.paramsCn03 := omit;

			//v_cfMsg.paramsCn03 := omit;

			v_cfMsg.paramsMn01 := omit;

			v_cfMsg.paramsIut := f_createParamsIutB(PX_MAC_UCA_IUT_2, true);
@@ -1249,7 +1270,7 @@ 
			v_cfMsg.paramsRt02 := omit;

			v_cfMsg.paramsRt03 := omit;

			v_cfMsg.paramsRt04 := omit;

			v_cfMsg.paramsCn03 := omit;

			//v_cfMsg.paramsCn03 := omit;

			v_cfMsg.paramsMn01 := v_params;

			v_cfMsg.paramsIut  := f_createParamsIutA(PX_MAC_UCA_IUT_1, true);
@@ -1280,7 +1301,9 @@ 
				mnCoa := omit,

				macUca := PX_MAC_UCA_RT01_A,

				macSolNodeMca := v_paramsRt01.macSolNodeMca,//from normal IPv6 Node

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}

			//Calculate values for normal IPv6 Node

			v_paramsIut := f_createParamsIutA(PX_MAC_UCA_IUT_1, false);
@@ -1295,7 +1318,9 @@ 
				mnCoa := omit,

				macUca := PX_MAC_UCA_IUT_1,

				macSolNodeMca := v_paramsIut.macSolNodeMca,//from normal IPv6 Node

				prefixLength := PX_PREFIX_LENGTH

				prefixLength := PX_PREFIX_LENGTH,

				ipv4Addr := omit,

				subnetId := omit

			}
@@ -1337,6 +1362,85 @@ 
		}//end function f_createCfMsg_rt01



		

		/*

		 * @desc This function creates a test adapter configuration message

		 *       for the test component acting as RT01

		*/

		function f_createTrans01CfMsg_rt01()

		return CfMessage {

			//Variables

			var CfMessage v_cfMsg ;

			var Ipv6NodeParams v_paramsRt01, v_paramsIut;

									

			var FncRetCode v_ret := e_error;

			

			//fill v_cfMsg

			v_cfMsg.role := c_ptcRoleRt01 ;

			v_cfMsg.netDeviceId := PX_NET_DEVICE_ID_1 ;

			v_cfMsg.macFilterList := {		PX_MAC_UCA_RT01_A,

											PX_MAC_UCA_HS01,

											c_macBroadcast // to catch ARP

											//v_paramsRt01.macSolNodeMca,

											//v_paramsHs01.macSolNodeMca, 

											//c_macAllNodesMca,

											//c_macAllRoutersMca,

											//v_paramsIut.macSolNodeMca, //see comment 1 below

											//v_paramsMn01.macSolNodeMca // see comment 3 below

										} ;

										

			// Comment 1:							

			// Added to be able to receive DAD NS

			// in the case of HUT: the DAD NS is ignored in the default

			// in the case of MN (returning Home): TTCN replies, otherwise MN would not know that it's home

			

			// Comment 3:

			// Added to be able to receive DAD NS for MN01's HoA sent by HA under test

			

			v_paramsRt01 := {

				useInTa := true, 

				lla := omit,

				gla := c_6to4Prefix & PX_IPV4_GLA_RT01_A & PX_IPV4_SUBNET_ID_RT01_A & PX_6to4_IF_ID_RT01_A,//6to4Addr

				solNodeMca := omit,

				haAca := omit,

				mnHoa := omit,

				mnCoa := omit,

				macUca := PX_MAC_UCA_RT01_A,

				macSolNodeMca := omit,

				prefixLength := omit,

				subnetId := PX_IPV4_SUBNET_ID_RT01_A,

				ipv4Addr := PX_IPV4_GLA_RT01_A

			};



			v_paramsIut  := {

				useInTa := true, 

				lla := omit,

				gla := c_6to4Prefix & PX_IPV4_GLA_IUT_1 & PX_IPV4_SUBNET_ID_IUT_1 & PX_6to4_IF_ID_IUT_1,//6to4Addr

				solNodeMca := omit,

				haAca := omit,

				mnHoa := omit,

				mnCoa := omit,

				macUca := PX_MAC_UCA_IUT_1,

				macSolNodeMca := omit,

				prefixLength := omit,

				subnetId := PX_IPV4_SUBNET_ID_IUT_1,

				ipv4Addr := PX_IPV4_GLA_IUT_1

			};



			v_cfMsg.paramsHs01 := omit; 

			v_cfMsg.paramsHs02 := omit; 

			v_cfMsg.paramsHs03 := omit;

			v_cfMsg.paramsRt01 := v_paramsRt01;

			v_cfMsg.paramsRt02 := omit;			

			v_cfMsg.paramsRt03 := omit;

			v_cfMsg.paramsRt04 := omit;

			v_cfMsg.paramsMn01 := omit;

			v_cfMsg.paramsIut  := v_paramsIut;

			

			return v_cfMsg ;

			

		}//end function f_createTrans01CfMsg_rt01



		

	}//end group create CfMsg
@@ -1614,70 +1718,5 @@ 
	

	}//end group changeMacAddress



	group ipv4Cf01  {

		

		/*

		 * @desc This function creates a test adapter configuration message

		 *       for the test component acting as RT01

		*/

		function f_createIpv4CfMsg_rt01()

		return Ipv4CfMessage {

			//Variables

			var Ipv4CfMessage v_cfMsg ;

			//var Ipv6NodeParams 	v_paramsRt01, v_paramsHs01, v_paramsIut, v_paramsMn01;

			var Ipv4NodeParams v_paramsRt01, v_paramsIut;

								

			//v_paramsRt01 := f_createParamsRt01(PX_MAC_UCA_RT01_A, true);

			//v_paramsIut := f_createParamsIutA(PX_MAC_UCA_IUT_1, true);

			//v_paramsMn01 := f_createParamsMn01(PX_MAC_UCA_RT01_A, true);

			//v_paramsHs01 :=	f_createParamsHs01(PX_MAC_UCA_HS01, true);

			

			var FncRetCode v_ret := e_error;

			

			//fill v_cfMsg

			v_cfMsg.role := c_ptcRoleRt01 ;

			v_cfMsg.netDeviceId := PX_NET_DEVICE_ID_1 ;

			v_cfMsg.macFilterList := {		PX_MAC_UCA_RT01_A,

											PX_MAC_UCA_HS01,

											c_macBroadcast // to catch ARP

											//v_paramsRt01.macSolNodeMca,

											//v_paramsHs01.macSolNodeMca, 

											//c_macAllNodesMca,

											//c_macAllRoutersMca,

											//v_paramsIut.macSolNodeMca, //see comment 1 below

											//v_paramsMn01.macSolNodeMca // see comment 3 below

										} ;

										

			// Comment 1:							

			// Added to be able to receive DAD NS

			// in the case of HUT: the DAD NS is ignored in the default

			// in the case of MN (returning Home): TTCN replies, otherwise MN would not know that it's home

			

			// Comment 3:

			// Added to be able to receive DAD NS for MN01's HoA sent by HA under test

			

			//v_cfMsg.paramsHs01 := v_paramsHs01; 

			//v_cfMsg.paramsHs02 := f_createParamsHs02(PX_MAC_UCA_RT01_A, true); 

			//v_cfMsg.paramsHs03 := f_createParamsHs03(PX_MAC_UCA_RT03_A, false);

			v_cfMsg.paramsRt01 := {

				useInTa := true,

				ipv4Addr := PX_IPV4_GLA_RT01_A,

				macUca := PX_MAC_UCA_RT01_A

			};

			//v_cfMsg.paramsRt02 := omit;			

			//v_cfMsg.paramsRt03 := f_createParamsRt03(PX_MAC_UCA_RT03_A, false);

			//v_cfMsg.paramsRt04 := omit;

			//v_cfMsg.paramsMn01 := v_paramsMn01;

			v_cfMsg.paramsIut  := {

				useInTa := true,

				ipv4Addr := PX_IPV4_GLA_IUT_1,

				macUca := PX_MAC_UCA_IUT_1

			};

			

			return v_cfMsg ;

			

		}//end function f_createIpv4CfMsg_rt01

		

	}//end ipv4Cf01

	

} // end module AtsIpv6_TestConfiguration