Simplify support of HostHTTPComponents (29b0b355) · Commits · CABLE - Integrated broadband cable telecommunication networks / CableIPv6

ttcn/Ats6RD/Ats6RD_Functions.ttcn3

+13 −40

Original line number	Diff line number	Diff line
		@@ -45,13 +45,6 @@ module Ats6RD_Functions {
		if (isbound(vc_brComponent)) {
		connect(vc_brComponent:brPort, self:brPort);
		}
		if (isbound(vc_hostComponents)) {
		v_hosts := lengthof(vc_hostComponents);
		for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {
		connect(vc_hostComponents[v_host]:ipv6Port, self:ipv6HostPort);
		connect(vc_hostComponents[v_host]:ipv4Port, self:ipv4HostPort);
		}
		}
		if (isbound(vc_dhcpv4Component)) {
		connect(vc_dhcpv4Component:dhcpv4Port, self:dhcpv4Port);
		}
		@@ -79,13 +72,13 @@ module Ats6RD_Functions {
		if (isbound(vc_brComponent)) {
		connect(vc_brComponent:brPort, self:brPort);
		}
		// TODO To be removed
		// if (isbound(vc_hostHttpComponents)) {
		// v_hosts := lengthof(vc_hostHttpComponents);
		// for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {
		// connect(vc_hostHttpComponents[v_host]:httpPort, self:httpPort);
		// }
		// }
		if (isbound(vc_hostComponents)) {
		v_hosts := lengthof(vc_hostComponents);
		for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {
		connect(vc_hostComponents[v_host]:ipv6Port, self:ipv6HostPort);
		connect(vc_hostComponents[v_host]:ipv4Port, self:ipv4HostPort);
		}
		}

		// Map ports
		map(self:ipPort, system:ipPort);
		@@ -167,27 +160,16 @@ module Ats6RD_Functions {
		} // End of function f_preamble_dhcpv4

		/**
		* @desc Preamble processing for HostHTTPv4Component
		* @desc Preamble processing for HostHTTPComponent
		* @verdict Unchanged
		* @see HTTPComponent
		*/
		function f_preamble_host_httpv4() runs on HostHTTPv4Component {
		function f_preamble_host_http() runs on HostHTTPComponent {
		// Connect synchronisation ports
		f_connect4SelfOrClientSync();

		} // End of function f_preamble_host_httpv4

		/**
		* @desc Preamble processing for HostHTTPv6Component
		* @verdict Unchanged
		* @see HTTPComponent
		*/
		function f_preamble_host_httpv6() runs on HostHTTPv6Component {
		// Connect synchronisation ports
		f_connect4SelfOrClientSync();

		} // End of function f_preamble_host_httpv6

		} // End of group preambleFunctions

		group postambleFunctions {
		@@ -220,23 +202,14 @@ module Ats6RD_Functions {
		} // End of function f_postamble_dhcpv4

		/**
		* @desc Postamble processing for HostHTTPv4Component
		* @desc Postamble processing for HostHTTPComponent
		* @verdict Unchanged
		* @see HTTPComponent
		*/
		function f_postamble_host_httpv4() runs on HostHTTPv4Component {
		function f_postamble_host_http() runs on HostHTTPComponent {
		// Nothing to do
		} // End of function f_postamble_host_httpv4

		/**
		* @desc Postamble processing for HostHTTPv6Component
		* @verdict Unchanged
		* @see HTTPComponent
		*/
		function f_postamble_host_httpv6() runs on HostHTTPv6Component {
		// Nothing to do
		} // End of function f_postamble_host_httpv6

		} // End of group postambleFunctions

		group httpFunctions {
		@@ -249,7 +222,7 @@ module Ats6RD_Functions {
		* @param p_withHugePayload Set to true if huge packet is required
		* @return e_success on success, e_timeout on call timeout, e_error otherwise
		*/
		function f_httpv4SendData(in Ipv4Address p_srcAddress, in Ipv4Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload := false) runs on HostHTTPv4Component
		function f_httpv4SendData(in Ipv4Address p_srcAddress, in Ipv4Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload := false) runs on HostHTTPComponent
		return FncRetCode {
		var FncRetCode v_result := e_success;

		@@ -279,7 +252,7 @@ module Ats6RD_Functions {
		* @param p_withHugePayload Set to true if huge packet is required
		* @return e_success on success, e_timeout on call timeout, e_error otherwise
		*/
		function f_httpv6SendData(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload := false) runs on HostHTTPv6Component
		function f_httpv6SendData(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload := false) runs on HostHTTPComponent
		return FncRetCode {
		var FncRetCode v_result := e_success;

ttcn/Ats6RD/Ats6RD_Interfaces.ttcn3

+5 −20

Original line number	Diff line number	Diff line
		@@ -42,17 +42,13 @@ module Ats6RD_Interfaces {
		var HostComponents vc_hostComponents := null;
		/** DHCPv4 component reference */
		var DHCPv4Component vc_dhcpv4Component := null;
		/** Host HTTPv4 component reference */
		var HostHTTPv4Components vc_hostHttpv4Components := null;
		/** Host HTTPv6 component reference */
		var HostHTTPv6Components vc_hostHttpv6Components := null;
		/** Host HTTP component reference */
		var HostHTTPComponents vc_hostHttpComponents := null;
		} // End of component SixRDComponent

		type record of HostComponent HostComponents;

		type record of HostHTTPv4Component HostHTTPv4Components;

		type record of HostHTTPv6Component HostHTTPv6Components;
		type record of HostHTTPComponent HostHTTPComponents;

		} // End of group mtcDesc

		@@ -88,18 +84,7 @@ module Ats6RD_Interfaces {
		timer tc_twait:= PX_TWAIT;
		} // End of component BRComponent

		type component HostHTTPv4Component extends UtComponent, SelfSyncComp {
		/** HTTP message port */
		port HttpPort httpPort;
		/** 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 meceige */
		timer tc_twait:= PX_TWAIT;
		} // End of component HostHTTPv4Component

		type component HostHTTPv6Component extends UtComponent, SelfSyncComp {
		type component HostHTTPComponent extends UtComponent, SelfSyncComp {
		/** HTTP message port */
		port HttpPort httpPort;
		/** Inter-component communication port */
		@@ -110,7 +95,7 @@ module Ats6RD_Interfaces {
		timer tc_noac:= PX_TNOAC;
		/** Timer used for receive meceige */
		timer tc_twait:= PX_TWAIT;
		} // End of component HostHTTPv6Component
		} // End of component HostHTTPComponent

		} // End of group componentPorts

ttcn/Ats6RD/Ats6RD_TestCases.ttcn3

+32 −32

Original line number	Diff line number	Diff line
		@@ -232,14 +232,14 @@ module Ats6RD_TestCases {

		// Test component configuration
		vc_brComponent := BRComponent.create(c_COMP_AFTR);
		vc_hostHttpv6Components[0] := HostHTTPv6Component.create(c_COMP_HOST);
		f_cf01Up_cpe();
		vc_hostHttpComponents[0] := HostHTTPComponent.create(c_COMP_HOST);
		f_cf02Up_cpe();

		// Test adapter configuration

		// Start all components
		vc_brComponent.start(f_TC_6RD_CPE_BF_BV_001_br(v_noOfDataRequests));
		vc_hostHttpv6Components[0].start(f_TC_6RD_CPE_BF_BV_001_host_http(
		vc_hostHttpComponents[0].start(f_TC_6RD_CPE_BF_BV_001_host_http(
		PX_HTTP_CLIENT_IPV6_ADDRESS,
		PX_WEB_SERVER_IPv6,
		v_noOfDataRequests
		@@ -341,7 +341,7 @@ module Ats6RD_TestCases {
		* @param p_noOfDataRequests The number of hosts to simulate
		* @verdict pass on success, inconc on timeout, fail otherwise
		*/
		function f_TC_6RD_CPE_BF_BV_001_host_http(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostHTTPv6Component {
		function f_TC_6RD_CPE_BF_BV_001_host_http(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostHTTPComponent {

		// Local variables
		var Ipv6Packet v_ipv6Packet; /** Used to store received IPv6 messages */
		@@ -349,7 +349,7 @@ module Ats6RD_TestCases {

		// Preamble
		// Clause 'Initial conditions'
		f_preamble_host_httpv6();
		f_preamble_host_http();
		f_selfOrClientSyncAndVerdict(c_prDone, e_success);
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		@@ -384,7 +384,7 @@ module Ats6RD_TestCases {
		} // End of 'altstep' statement

		// Postamble
		f_postamble_host_httpv6();
		f_postamble_host_http();
		f_selfOrClientSyncAndVerdict(c_poDone, e_success);
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");

		@@ -455,14 +455,14 @@ module Ats6RD_TestCases {

		// Test component configuration
		vc_brComponent := BRComponent.create(c_COMP_AFTR);
		vc_hostHttpv6Components[0] := HostHTTPv6Component.create(c_COMP_HTTP);
		vc_hostHttpComponents[0] := HostHTTPComponent.create(c_COMP_HTTP);
		f_cf02Up_cpe();

		// Test adapter configuration

		// Start all components
		vc_brComponent.start(f_TC_6RD_CPE_PF_BV_001_br(v_noOfDataRequests));
		vc_hostHttpv6Components[0].start(f_TC_6RD_CPE_PF_BV_001_host_http(
		vc_hostHttpComponents[0].start(f_TC_6RD_CPE_PF_BV_001_host_http(
		PX_HTTP_CLIENT_IPV6_ADDRESS,
		PX_WEB_SERVER_IPv6,
		v_noOfDataRequests
		@@ -551,7 +551,7 @@ module Ats6RD_TestCases {
		* @param p_noOfDataRequests The number of hosts to simulate
		* @verdict pass on success, inconc on timeout, fail otherwise
		*/
		function f_TC_6RD_CPE_PF_BV_001_host_http(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostHTTPv6Component {
		function f_TC_6RD_CPE_PF_BV_001_host_http(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostHTTPComponent {

		// Local variables
		var Ipv6Packet v_ipv6Packet;
		@@ -561,7 +561,7 @@ module Ats6RD_TestCases {

		// Preamble
		// Clause 'Initial conditions'
		f_preamble_host_httpv6();
		f_preamble_host_http();
		f_selfOrClientSyncAndVerdict(c_prDone, e_success);
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		@@ -611,7 +611,7 @@ module Ats6RD_TestCases {
		}

		// Postamble
		f_postamble_host_httpv6();
		f_postamble_host_http();
		f_selfOrClientSyncAndVerdict(c_poDone, e_success);
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");

		@@ -671,7 +671,7 @@ module Ats6RD_TestCases {

		// Test component configuration
		vc_brComponent := BRComponent.create(c_COMP_AFTR);
		vc_hostHttpv6Components[0] := HostHTTPv6Component.create(c_COMP_HTTP);
		vc_hostHttpComponents[0] := HostHTTPComponent.create(c_COMP_HTTP);
		f_cf02Up_cpe();

		// Test adapter configuration
		@@ -704,7 +704,7 @@ module Ats6RD_TestCases {

		} // End of function f_TC_6RD_CPE_PF_BV_002_br

		function f_TC_6RD_CPE_PF_BV_002_host_http(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostHTTPv6Component {
		function f_TC_6RD_CPE_PF_BV_002_host_http(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostHTTPComponent {

		// TODO

		@@ -781,7 +781,7 @@ module Ats6RD_TestCases {
		for (v_host := 0; v_host < v_hostNum; v_host := v_host + 1) {
		vc_hostComponents[v_host] := HostComponent.create(c_COMP_HOST & int2str(v_host));
		} // End of 'for' statement
		f_cf02Up_cpe();
		f_cf01Up_cpe();

		// Test adapter configuration

		@@ -980,7 +980,7 @@ module Ats6RD_TestCases {
		for (v_host := 0; v_host < v_hostNum; v_host := v_host + 1) {
		vc_hostComponents[v_host] := HostComponent.create(c_COMP_HOST & int2str(v_host));
		} // End of 'for' statement
		f_cf02Up_cpe();
		f_cf01Up_cpe();

		// Test adapter configuration

		@@ -1190,7 +1190,7 @@ module Ats6RD_TestCases {
		for (v_host := 0; v_host < v_hostNum; v_host := v_host + 1) {
		vc_hostComponents[v_host] := HostComponent.create(c_COMP_HOST & int2str(v_host));
		} // End of 'for' statement
		f_cf02Up_cpe();
		f_cf01Up_br();

		// Test adapter configuration

		@@ -1408,7 +1408,7 @@ module Ats6RD_TestCases {
		for (v_host := 0; v_host < v_hostNum; v_host := v_host + 1) {
		vc_hostComponents[v_host] := HostComponent.create(c_COMP_HOST & int2str(v_host));
		} // End of 'for' statement
		f_cf02Up_cpe();
		f_cf01Up_br();

		// Test adapter configuration

		@@ -1614,14 +1614,14 @@ module Ats6RD_TestCases {

		// Test component configuration
		vc_brComponent := BRComponent.create(c_COMP_AFTR);
		vc_hostHttpv6Components[0] := HostHTTPv6Component.create(c_COMP_HTTP);
		f_cf02Up_cpe();
		vc_hostHttpComponents[0] := HostHTTPComponent.create(c_COMP_HTTP);
		f_cf01Up_br();

		// Test adapter configuration

		// Start all components
		vc_brComponent.start(f_TC_6RD_BR_PF_BV_001_br(v_noOfDataRequests));
		vc_hostHttpv6Components[0].start(f_TC_6RD_BR_PF_BV_001_host_http(
		vc_hostHttpComponents[0].start(f_TC_6RD_BR_PF_BV_001_host_http(
		PX_HTTP_CLIENT_IPV6_ADDRESS,
		PX_WEB_SERVER_IPv6,
		v_noOfDataRequests
		@@ -1659,7 +1659,7 @@ module Ats6RD_TestCases {
		* @param p_noOfDataRequests The number of hosts to simulate
		* @verdict pass on success, inconc on timeout, fail otherwise
		*/
		function f_TC_6RD_BR_PF_BV_001_host_http(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostHTTPv6Component {
		function f_TC_6RD_BR_PF_BV_001_host_http(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostHTTPComponent {

		// Local variables
		var Ipv6Packet v_ipv6Packet;
		@@ -1669,7 +1669,7 @@ module Ats6RD_TestCases {

		// Preamble
		// Clause 'Initial conditions'
		f_preamble_host_httpv6();
		f_preamble_host_http();
		f_selfOrClientSyncAndVerdict(c_prDone, e_success);
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		@@ -1683,7 +1683,7 @@ module Ats6RD_TestCases {
		f_selfOrClientSyncAndVerdict(c_tbDone, v_result);

		// Postamble
		f_postamble_host_httpv6();
		f_postamble_host_http();
		f_selfOrClientSyncAndVerdict(c_poDone, e_success);
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");

		@@ -1743,14 +1743,14 @@ module Ats6RD_TestCases {

		// Test component configuration
		vc_brComponent := BRComponent.create(c_COMP_AFTR);
		vc_hostHttpv6Components[0] := HostHTTPv6Component.create(c_COMP_HTTP);
		vc_hostHttpComponents[0] := HostHTTPComponent.create(c_COMP_HTTP);
		f_cf02Up_cpe();

		// Test adapter configuration

		// Start all components
		vc_brComponent.start(f_TC_6RD_BR_PF_BV_002_br(v_noOfDataRequests));
		vc_hostHttpv6Components[0].start(f_TC_6RD_BR_PF_BV_002_host_http(
		vc_hostHttpComponents[0].start(f_TC_6RD_BR_PF_BV_002_host_http(
		PX_HTTP_CLIENT_IPV6_ADDRESS,
		PX_WEB_SERVER_IPv6,
		v_noOfDataRequests
		@@ -1788,7 +1788,7 @@ module Ats6RD_TestCases {
		* @param p_noOfDataRequests The number of hosts to simulate
		* @verdict pass on success, inconc on timeout, fail otherwise
		*/
		function f_TC_6RD_BR_PF_BV_002_host_http(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostHTTPv6Component {
		function f_TC_6RD_BR_PF_BV_002_host_http(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostHTTPComponent {

		// Local variables
		var Ipv6Packet v_ipv6Packet;
		@@ -1798,7 +1798,7 @@ module Ats6RD_TestCases {

		// Preamble
		// Clause 'Initial conditions'
		f_preamble_host_httpv6();
		f_preamble_host_http();
		f_selfOrClientSyncAndVerdict(c_prDone, e_success);
		log("* " & __SCOPE__ & ": INFO: Preamble done. *");

		@@ -1812,7 +1812,7 @@ module Ats6RD_TestCases {
		f_selfOrClientSyncAndVerdict(c_tbDone, v_result);

		// Postamble
		f_postamble_host_httpv6();
		f_postamble_host_http();
		f_selfOrClientSyncAndVerdict(c_poDone, e_success);
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");

		@@ -1890,7 +1890,7 @@ module Ats6RD_TestCases {
		// Test component configuration
		vc_brComponent := BRComponent.create(c_COMP_AFTR);
		vc_hostComponents[0] := HostComponent.create(c_COMP_HOST);
		f_cf02Up_cpe();
		f_cf01Up_br();

		// Test adapter configuration

		@@ -2340,7 +2340,7 @@ module Ats6RD_TestCases {
		for (v_host := 0; v_host < v_hostNum; v_host := v_host + 1) {
		vc_hostComponents[v_host] := HostComponent.create(c_COMP_HOST & int2str(v_host));
		} // End of 'for' statement
		f_cf02Up_cpe();
		f_cf01Up_br();

		// Test adapter configuration

		@@ -2559,7 +2559,7 @@ module Ats6RD_TestCases {
		for (v_host := 0; v_host < v_hostNum; v_host := v_host + 1) {
		vc_hostComponents[v_host] := HostComponent.create(c_COMP_HOST & int2str(v_host));
		} // End of 'for' statement
		f_cf02Up_cpe();
		f_cf01Up_br();

		// Test adapter configuration

		@@ -2778,7 +2778,7 @@ module Ats6RD_TestCases {
		for (v_host := 0; v_host < v_hostNum; v_host := v_host + 1) {
		vc_hostComponents[v_host] := HostComponent.create(c_COMP_HOST & int2str(v_host));
		} // End of 'for' statement
		f_cf02Up_cpe();
		f_cf01Up_br();

		// Test adapter configuration

ttcn/AtsCommon/AtsCommon_Interfaces.ttcn3

+1 −0

Original line number	Diff line number	Diff line
		@@ -151,6 +151,7 @@ module AtsCommon_Interfaces {
		* @member ipv6Address The AFTR IPv6 address
		* @member aftrName The AFTR-name option
		* @member domainSearchList DNS IPv6 address
		* @member ipv6Packet IPv6 packet
		*/
		type record InterCompDataMsg {
		Ipv6Address ipv6Address,