Moved up common definitions to AtsCommon. (b72d391e) · Commits · CABLE - Integrated broadband cable telecommunication networks / CableIPv6

ttcn/Ats6RD/Ats6RD_Pixits.ttcn3

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ module Ats6RD_Pixits {
		/**
		* @desc The MSS value.
		*/
		modulepar UInt PX_NAT64_MSS_SIZE := 1500;
		modulepar UInt PX_6RD_MSS_SIZE := 1500;

		/**
		* @desc The TCP_time_wait timer value.

ttcn/Ats6RD/Ats6RD_TestCases.ttcn3

+2 −2

Original line number	Diff line number	Diff line
		@@ -797,7 +797,7 @@ module Ats6RD_TestCases {
		m_tcp_packet(
		PX_MSSC_HOST_V6_LIST_CPE[v_host].srcPort,
		PX_MSSC_HOST_V6_LIST_CPE[v_host].dstPort,
		m_tcpRawPayload(int2oct(42, PX_NAT64_MSS_SIZE + 10))
		m_tcpRawPayload(int2oct(42, PX_6RD_MSS_SIZE + 10))
		)
		)
		)
		@@ -2007,7 +2007,7 @@ module Ats6RD_TestCases {
		f_selfOrClientSyncAndVerdict(c_poDone, e_success);
		log("* " & __SCOPE__ & ": INFO: Postamble done. *");

		} // End of function f_TC_NAT64_LSN_NT_BV_001_lsn
		} // End of function f_TC_6RD_BR_NT_BV_001_br

		function f_TC_6RD_BR_NT_BV_001_host(in Ipv4Packet p_ipv4Packet, in Ipv4Packet p_ipv4Packet2) runs on HostComponent {

ttcn/AtsCommon/AtsCommon_Interfaces.ttcn3

+24 −5

Original line number	Diff line number	Diff line
		@@ -5,10 +5,6 @@
		*/
		module AtsCommon_Interfaces {

		import from AtsNat64_Interfaces all; // TODO Move FTP port and others
		// import from Ats6RD_Interfaces all; // TODO Move HTTP port
		import from AtsDSLite_Interfaces all; // TODO Move HTTP port

		// LibCommon
		import from LibCommon_Sync {type SelfSyncComp;}
		import from LibCommon_Time {modulepar PX_TAC, PX_TNOAC, PX_TWAIT;}
		@@ -20,7 +16,7 @@ module AtsCommon_Interfaces {
		import from LibIpv6_Rfc6334Dhcp_TypesAndValues {type AFTRNameOption;}

		// AtsCommon
		import from AtsCommon_TypesAndValues {type ComponentAddress;}
		import from AtsCommon_TypesAndValues all;
		import from AtsCommon_Dhcpv4_CommonRfcs_TypesAndValues {type DHCPv4Msg;}
		import from AtsCommon_DNS_CommonRfcs_TypesAndValues {type DnsMsg;}

		@@ -51,6 +47,29 @@ module AtsCommon_Interfaces {
		inout all;
		}

		type port HttpPort mixed {
		out s_httpSendData; //initiate actions
		}

		type port FtpPort mixed {
		out s_ftpLoginV4, s_ftpLoginV6, s_ftpLogoutV4, s_ftpLogoutV6, s_ftpSendDataV4, s_ftpSendDataV6; //initiate actions
		in Ipv4Packet; //monitors traffic
		}

		type port SipPort mixed {
		out s_sipAuthenticate, s_sipSendPacket; //initiate actions
		in Ipv4Packet; //monitors traffic
		}

		type port RtspPort mixed {
		out s_rtspSessionSetup, s_rtspSendPacket; //initiate actions
		in Ipv4Packet; //monitors traffic
		}

		type port PptpPort mixed {
		out s_pptpSessionSetup, s_pptpSendPacket; //initiate actions
		in Ipv4Packet; //monitors traffic
		}

		}

ttcn/AtsCommon/AtsCommon_TypesAndValues.ttcn

+53 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,59 @@

		} // End of group ut

		group httpTypes {

		/**
		* @desc Send multiple HTTP requests to the specified HTTP server
		* @param p_srcAddress The host HTTP address
		* @param p_httpServerAddress The HTTP server address
		* @param p_noOfDataRequests The nimber of HTTP request to be sent
		* @return true on success, false otherwise
		*/
		signature s_httpSendData(in Ipv4Address p_srcAddress, in Ipv4Address p_httpServerAddress, in UInt p_noOfDataRequests) return boolean; // TODO To be continued

		} // End of group httpTypes

		group ftpTypes {

		signature s_ftpLoginV4(in Ipv4Address p_srcAddress, in Ipv4Address p_dstAddress) return boolean;

		signature s_ftpLoginV6(in Ipv6Address p_srcAddress, in Ipv6Address p_dstAddress) return boolean;

		signature s_ftpLogoutV4(in Ipv4Address p_srcAddress, in Ipv4Address p_dstAddress) return boolean;

		signature s_ftpLogoutV6(in Ipv6Address p_srcAddress, in Ipv6Address p_dstAddress) return boolean;

		signature s_ftpSendDataV4(in Ipv4Address p_srcAddress, in Ipv4Address p_dstAddress, in UInt16 dataPort, in UInt p_noOfDataRequests) return boolean;

		signature s_ftpSendDataV6(in Ipv6Address p_srcAddress, in Ipv6Address p_dstAddress, in UInt16 dataPort, in UInt p_noOfDataRequests) return boolean;

		} // End of group ftpTypes

		group sipTypes {

		signature s_sipAuthenticate(in Ipv6Address p_srcAddress, in Ipv6Address p_dstAddress) return boolean;

		signature s_sipSendPacket(in Ipv6Address p_srcAddress, in Ipv6Address p_dstAddress, in UInt16 dataPort, in UInt p_noOfDataRequests) return boolean;

		} // End of group sipTypes

		group rtspTypes {

		signature s_rtspSessionSetup(in Ipv6Address p_srcAddress, in Ipv6Address p_dstAddress) return boolean;

		signature s_rtspSendPacket(in Ipv6Address p_srcAddress, in Ipv6Address p_dstAddress, in UInt16 dataPort, in UInt p_noOfDataRequests) return boolean;

		} // End of group rtspTypes

		group pptpTypes {

		signature s_pptpSessionSetup(in Ipv6Address p_srcAddress, in Ipv6Address p_dstAddress) return boolean;

		signature s_pptpSendPacket(in Ipv6Address p_srcAddress, in Ipv6Address p_dstAddress, in UInt16 dataPort, in UInt p_noOfDataRequests) return boolean;

		} // End of group pptpTypes

		group auxiliary {

		type set of integer IntList;

ttcn/AtsDSlite/AtsDSLite_Functions.ttcn3

+5 −4

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ module AtsDSLite_Functions {
		import from LibIpv6_CommonRfcs_TypesAndValues all;

		// AtsCommon
		import from AtsCommon_TypesAndValues all;
		import from AtsCommon_Interfaces all;
		import from AtsCommon_Functions all;
		import from AtsCommon_DNS_CommonRfcs_TypesAndValues all;
		@@ -376,8 +377,8 @@ module AtsDSLite_Functions {
		return FncRetCode {
		var FncRetCode v_result := e_success;

		ftpPort.call (s_ftpLogin:{p_srcAddress, p_dstAddress}, PX_TAC) {
		[] ftpPort.getreply (s_ftpLogin:{-, -} value true) {
		ftpPort.call (s_ftpLoginV4:{p_srcAddress, p_dstAddress}, PX_TAC) {
		[] ftpPort.getreply (s_ftpLoginV4:{-, -} value true) {
		log("* " & __SCOPE__ & ": FTP client successfully authenticated. *");
		v_result := e_success;
		}
		@@ -398,8 +399,8 @@ module AtsDSLite_Functions {
		return FncRetCode {
		var FncRetCode v_result := e_success;

		ftpPort.call (s_ftpSendData:{p_srcAddress, p_dstAddress, p_dataPort, p_noOfDataRequests}, PX_TAC) {
		[] ftpPort.getreply (s_ftpSendData:{-, -, -, -} value true) {
		ftpPort.call (s_ftpSendDataV4:{p_srcAddress, p_dstAddress, p_dataPort, p_noOfDataRequests}, PX_TAC) {
		[] ftpPort.getreply (s_ftpSendDataV4:{-, -, -, -} value true) {
		log("* " & __SCOPE__ & ": Successfully sent FTP data. *");
		v_result := e_success;
		}