Harmonized component definitions using now LibIpv6Node and respective ports. (1773934f) · Commits · CABLE - Integrated broadband cable telecommunication networks / CableIPv6

ttcn/Ats6RD/Ats6RD_Functions.ttcn3

+7 −7

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ module Ats6RD_Functions {

		// Map ports
		map(self:ipPort, system:ipv6Port);
		map(self:brPort, system:ipv4Port);
		map(self:ipv4Port, system:ipv4Port);
		map(self:utPort, system:utPort);

		activate(a_default_br());
		@@ -112,7 +112,7 @@ module Ats6RD_Functions {
		f_connect4SelfOrClientSync();

		// Map ports
		map(self:ipv6Port, system:ipv6Port);
		map(self:ipPort, system:ipv6Port);
		map(self:ipv4Port, system:ipv4Port);
		map(self:utPort, system:utPort);

		@@ -284,7 +284,7 @@ module Ats6RD_Functions {
		log("* " & __SCOPE__ & "ERROR: Received an unexpected IPv6 message, process it as an error *");
		f_selfOrClientSyncAndVerdict("error", e_error);
		}
		[] brPort.receive { // Unsolicited messages
		[] ipv4Port.receive { // Unsolicited messages
		tc_ac.stop;
		log("* " & __SCOPE__ & "ERROR: Received an unexpected IPv4 message, process it as an error *");
		f_selfOrClientSyncAndVerdict("error", e_error);
		@@ -293,7 +293,7 @@ module Ats6RD_Functions {
		log("* " & __SCOPE__ & "ERROR: Received an unexpected UT command, ignoring it *");
		repeat;
		}
		[] tc_twait.timeout {
		[] tc_wait.timeout {
		log("* " & __SCOPE__ & "ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		@@ -316,7 +316,7 @@ module Ats6RD_Functions {
		* @desc
		*/
		altstep a_default_host() runs on HostComponent {
		[] ipv6Port.receive { // Unsolicited messages
		[] ipPort.receive { // Unsolicited messages
		tc_ac.stop;
		log("* " & __SCOPE__ & "ERROR: Received an unexpected IPv6 message, process it as an error *");
		f_selfOrClientSyncAndVerdict("error", e_error);
		@@ -330,7 +330,7 @@ module Ats6RD_Functions {
		log("* " & __SCOPE__ & "ERROR: Received an unexpected UT command, ignoring it *");
		repeat;
		}
		[] tc_twait.timeout {
		[] tc_wait.timeout {
		log("* " & __SCOPE__ & "ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		@@ -362,7 +362,7 @@ module Ats6RD_Functions {
		log("* " & __SCOPE__ & "ERROR: Received an unexpected UT command, ignoring it *");
		repeat;
		}
		[] tc_twait.timeout {
		[] tc_wait.timeout {
		log("* " & __SCOPE__ & "ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}

ttcn/Ats6RD/Ats6RD_Interfaces.ttcn3

+3 −23

Original line number	Diff line number	Diff line
		@@ -48,32 +48,12 @@ module Ats6RD_Interfaces {

		group componentPorts {

		type component HostComponent extends UtComponent, SelfSyncComp {
		/** IPv6 message port */
		port Ipv6Port ipv6Port;
		/** IPv4 message port */
		port Ipv4Port ipv4Port;
		/** Timer used for expected received message */
		timer tc_ac:= PX_TAC;
		/** Timer used for unexpected received message */
		timer tc_noac:= PX_TNOAC;
		/** Timer used for receive message */
		timer tc_twait:= PX_TWAIT;
		type component HostComponent extends UtComponent, LibIpv6Node, SelfSyncComp {
		} // End of component HostComponent

		type component BRComponent extends UtComponent, SelfSyncComp {
		/** IPv6 message port */
		port Ipv6Port ipPort;
		/** IPv4 message port */
		port Ipv4Port brPort;
		type component BRComponent extends UtComponent, LibIpv6Node, SelfSyncComp {
		/** Inter-component communication port */
		port InterCompDataPort dataPort;
		/** Timer used for expected received message */
		timer tc_ac:= PX_TAC;
		/** Timer used for unexpected received message */
		timer tc_noac:= PX_TNOAC;
		/** Timer used for receive message */
		timer tc_twait:= PX_TWAIT;
		} // End of component BRComponent

		type component HostHTTPComponent extends UtComponent, SelfSyncComp {
		@@ -86,7 +66,7 @@ module Ats6RD_Interfaces {
		/** Timer used for unexpected received message */
		timer tc_noac:= PX_TNOAC;
		/** Timer used for receive meceige */
		timer tc_twait:= PX_TWAIT;
		timer tc_wait:= PX_TWAIT;
		} // End of component HostHTTPComponent

		} // End of group componentPorts

ttcn/Ats6RD/Ats6RD_TestCases.ttcn3

+10 −10

Original line number	Diff line number	Diff line
		@@ -285,7 +285,7 @@ module Ats6RD_TestCases {
		// Test Body
		tc_ac.start;
		alt {
		[v_dataReceived == true] brPort.receive(
		[v_dataReceived == true] ipv4Port.receive(
		mw_ipv4Packet_tcp(
		c_tunneledIpHdr,
		PX_CPE_IPv4_ADDRESS,
		@@ -504,7 +504,7 @@ module Ats6RD_TestCases {
		// Test Body
		tc_ac.start;
		alt {
		[] brPort.receive(
		[] ipv4Port.receive(
		mw_ipv4Packet_df(
		PX_CPE_IPv4_ADDRESS,
		PX_BR_GW_IPv4_ADDRESS
		@@ -514,7 +514,7 @@ module Ats6RD_TestCases {
		tc_ac.start;
		repeat;
		}
		[] brPort.receive(
		[] ipv4Port.receive(
		mw_ipv4Packet_dummy(
		PX_CPE_IPv4_ADDRESS,
		PX_BR_GW_IPv4_ADDRESS
		@@ -713,7 +713,7 @@ module Ats6RD_TestCases {

		// Test Body
		// Clause when:
		// TODO brPort.send();
		// TODO ipv4Port.send();

		// Postamble
		f_postamble_br();
		@@ -882,7 +882,7 @@ module Ats6RD_TestCases {
		// Test Body
		tc_ac.start;
		alt {
		[] brPort.receive( // the IUT drops the packet
		[] ipv4Port.receive( // the IUT drops the packet
		mw_ipv4Packet_tcp(
		c_tunneledIpHdr,
		?,
		@@ -922,12 +922,12 @@ module Ats6RD_TestCases {

		// Test Body
		// Clause 'when': the IUT receives multiple HTML IPv6 packets
		ipv6Port.send(p_host.payload.ipv6Packet);
		ipPort.send(p_host.payload.ipv6Packet);

		// Clause 'then': the IUT returns a packet-too-big message to the originator
		tc_ac.start;
		alt {
		[] ipv6Port.receive( // the IUT returns a packet-too-big message to the originator
		[] ipPort.receive( // the IUT returns a packet-too-big message to the originator
		mw_packetTooBig_noExtHdr_code(
		p_host.payload.ipv6Packet.ipv6Hdr.destinationAddress, // Source is the SUT
		p_host.payload.ipv6Packet.ipv6Hdr.sourceAddress, // Destination is the host
		@@ -1078,7 +1078,7 @@ module Ats6RD_TestCases {
		// Test Body
		tc_ac.start;
		alt {
		[] brPort.receive(
		[] ipv4Port.receive(
		mw_ipv4Packet_tcp(
		c_tunneledIpHdr,
		?,
		@@ -1133,7 +1133,7 @@ module Ats6RD_TestCases {
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		// Test Body
		ipv6Port.send(p_host.payload.ipv6Packet);
		ipPort.send(p_host.payload.ipv6Packet);
		f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

		// Postamble
		@@ -1820,7 +1820,7 @@ module Ats6RD_TestCases {
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		// Test Body
		// TODO brPort.send();
		// TODO ipv4Port.send();

		// Postamble
		f_postamble_br();

ttcn/AtsCommon/AtsCommon_Functions.ttcn3

+17 −3

Original line number	Diff line number	Diff line
		@@ -11,10 +11,9 @@ module AtsCommon_Functions {

		// LibIpv6
		import from LibIpv6_Interface_TypesAndValues all;
		import from LibIpv6_Interface_Functions all;
		import from LibIpv6_CommonRfcsDhcp_TypesAndValues all;
		import from LibIpv6_ExternalFunctions {
		function fx_calcIpv4PayloadChecksum, fx_ipv4PacketTotalLength, fx_calcIpv4Hcs
		};
		import from LibIpv6_ExternalFunctions {function fx_calcIpv4PayloadChecksum, fx_ipv4PacketTotalLength, fx_calcIpv4Hcs;}

		// AtsCommon
		import from AtsCommon_Interfaces all;
		@@ -75,6 +74,21 @@ module AtsCommon_Functions {

		} // End of group postambleFunctions

		group commonSteps {

		function f_sendIpv6Packet(Ipv6Packet p_ipv6Packet) runs on LibIpv6Node
		return FncRetCode {

		if(f_setExtensionHeaders(p_ipv6Packet) != e_success) {
		log(" ** " & __SCOPE__ & ": Error when calculating length of extension headers **");
		return e_error;
		}
		ipPort.send(p_ipv6Packet);

		return e_success;
		}
		}

		group globalSteps {

		altstep a_dhcpv6Default() runs on DHCPv6Component {

ttcn/AtsCommon/AtsCommon_Interfaces.ttcn3

+2 −20

Original line number	Diff line number	Diff line
		@@ -22,24 +22,6 @@ module AtsCommon_Interfaces {

		group ports {

		/**
		* @desc IPv4 Port
		*/
		type port Ipv4Port message {
		map param (in Ipv4Address p_ip4Address);
		inout
		//Ipv4
		Ipv4Packet, Ipv4EchoRequest, Ipv4DestinationUnreachable
		}

		/**
		* @desc IPv6 Port
		*/
		type port Ipv6Port message {
		inout
		Ipv6Packet, PacketTooBig
		}

		/**
		* @desc Upper Tester port
		*/
		@@ -207,7 +189,7 @@ module AtsCommon_Interfaces {
		* @member dnsPort
		* @member tc_ac
		* @member tc_noac
		* @member tc_twait
		* @member tc_wait
		*/
		type component DNSComponent extends SelfSyncComp {
		/** IPv4 message port */
		@@ -219,7 +201,7 @@ module AtsCommon_Interfaces {
		/** Timer used for unexpected received message */
		timer tc_noac:= PX_TNOAC;
		/** Timer used for receive meceige */
		timer tc_twait:= PX_TWAIT;
		timer tc_wait:= PX_TWAIT;
		} // End of component DNSComponent

		} // End of group componentDesc