Commit 292d7fbd authored by reinaortega's avatar reinaortega
Browse files

Review of all test suites, which includes:

- Merging of different component types
- Mapping of components name to role within test configuration
- deep review of DS-Lite and 464XLAT test suites
parent 58f975a1
Loading
Loading
Loading
Loading
+212 −106

File changed.

Preview size limit exceeded, changes collapsed.

+128 −115
Original line number Original line Diff line number Diff line
@@ -19,43 +19,46 @@ module Ats464XLat_Interfaces {
    group mtcDesc {
    group mtcDesc {
        
        
        type component FourSixFourXLatComponent extends UtComponent, LibIpv6Node {
        type component FourSixFourXLatComponent extends UtComponent, LibIpv6Node {
            /** DHCPv6 port for DHCPv6Msg message exchanges */
//            /** DHCPv6 port for DHCPv6Msg message exchanges */
            port DHCPv6Port dhcpv6Port;
//            port DHCPv6Port dhcpv6Port;
            /** DHCPv6 component reference */
            /** DHCPv6 component reference */
            var DHCPv6Component vc_dhcpv6Component := null;
            var HostComponent vc_dhcpv6Component := null;
            /** LSN component reference */
            /** LSN component reference */
            var LSNComponents vc_lsnComponents;
            var Ipv4ServerComponents vc_ipv4ServerComponents;
            /** LSN FTP component reference */
            /** LSN FTP component reference */
            var LSNFTPComponents vc_lsnFtpComponents;
//            var LSNFTPComponents vc_lsnFtpComponents;
            /** LSN SIP component reference */
//            /** LSN SIP component reference */
            var LSNSIPComponents vc_lsnSipComponents;
//            var LSNSIPComponents vc_lsnSipComponents;
            /** LSN RTSP component reference */
//            /** LSN RTSP component reference */
            var LSNRTSPComponents vc_lsnRtspComponents;
//            var LSNRTSPComponents vc_lsnRtspComponents;
            /** LSN PPTP component reference */
//            /** LSN PPTP component reference */
            var LSNPPTPComponents vc_lsnPptpComponents;
//            var LSNPPTPComponents vc_lsnPptpComponents;
            /** Host component reference */
            /** Host component reference */
            var HostComponents vc_hostComponents;
            var HostComponents vc_hostComponents;
            /** Host FTP component reference */
            /** Plat component reference */
            var HostFTPComponents vc_hostFtpComponents;
            var PlatComponent vc_platComponent;
            /** Host SIP component reference */
            
            var HostSIPComponents vc_hostSipComponents;
//            /** Host FTP component reference */
            /** Host RTSP component reference */
//            var HostFTPComponents vc_hostFtpComponents;
            var HostRTSPComponents vc_hostRtspComponents;
//            /** Host SIP component reference */
            /** Host PPTP component reference */
//            var HostSIPComponents vc_hostSipComponents;
            var HostPPTPComponents vc_hostPptpComponents;
//            /** Host RTSP component reference */
//            var HostRTSPComponents vc_hostRtspComponents;
//            /** Host PPTP component reference */
//            var HostPPTPComponents vc_hostPptpComponents;
        } // End of component FourSixFourXLatComponent
        } // End of component FourSixFourXLatComponent
        
        
        type record of LSNComponent LSNComponents;
        type record of Ipv4ServerComponent Ipv4ServerComponents;
        type record of LSNFTPComponent LSNFTPComponents;
//        type record of LSNFTPComponent LSNFTPComponents;
        type record of LSNSIPComponent LSNSIPComponents;
//        type record of LSNSIPComponent LSNSIPComponents;
        type record of LSNRTSPComponent LSNRTSPComponents;
//        type record of LSNRTSPComponent LSNRTSPComponents;
        type record of LSNPPTPComponent LSNPPTPComponents;
//        type record of LSNPPTPComponent LSNPPTPComponents;
        
        
        type record of HostComponent HostComponents;
        type record of HostComponent HostComponents;
        type record of HostFTPComponent HostFTPComponents;
//        type record of HostFTPComponent HostFTPComponents;
        type record of HostSIPComponent HostSIPComponents;
//        type record of HostSIPComponent HostSIPComponents;
        type record of HostRTSPComponent HostRTSPComponents;
//        type record of HostRTSPComponent HostRTSPComponents;
        type record of HostPPTPComponent HostPPTPComponents;
//        type record of HostPPTPComponent HostPPTPComponents;
        
        
    } // End of group mtcDesc
    } // End of group mtcDesc
    
    
@@ -63,100 +66,110 @@ module Ats464XLat_Interfaces {
        
        
        group componentPorts {
        group componentPorts {
            
            
            type component HostComponent extends UtComponent, LibIpv6Node, SelfSyncComp {
//            type component HostComponent extends UtComponent, LibIpv6Node, SelfSyncComp {
            } // End of component HostComponent
//            } // End of component HostComponent
            
            
            type component HostFTPComponent extends UtComponent, SelfSyncComp {
//            type component HostFTPComponent extends UtComponent, SelfSyncComp {
                /** FTP message port */
//                /** FTP message port */
                port FtpPort ftpPort;
//                port FtpPort ftpPort;
                /** Timer used for expected received message */
//                /** Timer used for expected received message */
                timer tc_ac:= PX_TAC;
//                timer tc_ac:= PX_TAC;
                /** Timer used for unexpected received message */
//                /** Timer used for unexpected received message */
                timer tc_noac:= PX_TNOAC;
//                timer tc_noac:= PX_TNOAC;
                /** Timer used for receive message */
//                /** Timer used for receive message */
                timer tc_wait:= PX_TWAIT;
//                timer tc_wait:= PX_TWAIT;
            } // End of component HostFTPComponent
//            } // End of component HostFTPComponent
            
//            
            type component HostSIPComponent extends UtComponent, SelfSyncComp {
//            type component HostSIPComponent extends UtComponent, SelfSyncComp {
                /** SIP message port */
//                /** SIP message port */
                port SipPort sipPort;
//                port SipPort sipPort;
                /** Timer used for expected received message */
//                /** Timer used for expected received message */
                timer tc_ac:= PX_TAC;
//                timer tc_ac:= PX_TAC;
                /** Timer used for unexpected received message */
//                /** Timer used for unexpected received message */
                timer tc_noac:= PX_TNOAC;
//                timer tc_noac:= PX_TNOAC;
                /** Timer used for receive message */
//                /** Timer used for receive message */
                timer tc_wait:= PX_TWAIT;
//                timer tc_wait:= PX_TWAIT;
            } // End of component HostSIPComponent
//            } // End of component HostSIPComponent
            
//            
            type component HostRTSPComponent extends UtComponent, SelfSyncComp {
//            type component HostRTSPComponent extends UtComponent, SelfSyncComp {
                /** RTSP message port */
//                /** RTSP message port */
                port RtspPort rtspPort;
//                port RtspPort rtspPort;
                /** Timer used for expected received message */
//                /** Timer used for expected received message */
                timer tc_ac:= PX_TAC;
//                timer tc_ac:= PX_TAC;
                /** Timer used for unexpected received message */
//                /** Timer used for unexpected received message */
                timer tc_noac:= PX_TNOAC;
//                timer tc_noac:= PX_TNOAC;
                /** Timer used for receive message */
//                /** Timer used for receive message */
                timer tc_wait:= PX_TWAIT;
//                timer tc_wait:= PX_TWAIT;
            } // End of component HostRTSPComponent
//            } // End of component HostRTSPComponent
            
//            
            type component HostPPTPComponent extends UtComponent, SelfSyncComp {
//            type component HostPPTPComponent extends UtComponent, SelfSyncComp {
                /** PPTP message port */
//                /** PPTP message port */
                port PptpPort pptpPort;
//                port PptpPort pptpPort;
                /** Timer used for expected received message */
//                /** Timer used for expected received message */
                timer tc_ac:= PX_TAC;
//                timer tc_ac:= PX_TAC;
                /** Timer used for unexpected received message */
//                /** Timer used for unexpected received message */
                timer tc_noac:= PX_TNOAC;
//                timer tc_noac:= PX_TNOAC;
                /** Timer used for receive message */
//                /** Timer used for receive message */
                timer tc_wait:= PX_TWAIT;
//                timer tc_wait:= PX_TWAIT;
            } // End of component HostPPTPComponent
//            } // End of component HostPPTPComponent
            
            
            type component LSNComponent extends UtComponent, LibIpv6Node, SelfSyncComp {
            type component Ipv4ServerComponent extends HostComponent {
                /** IPv6 message port shall not be used! */
                /** IPv6 message port shall not be used! */
            } // End of component LSNComponent
            } // End of component LSNComponent
            
            
            type component LSNFTPComponent extends UtComponent, SelfSyncComp {
            /** @desc 
                /** FTP message port */
             */
                port FtpPort ftpPort;
            type component ClatComponent extends UtComponent, LibIpv6Node, SelfSyncComp {
                /** Timer used for expected received message */
            } // End of component AftrComponent
                timer tc_ac:= PX_TAC;
            
                /** Timer used for unexpected received message */
            /** @desc 
                timer tc_noac:= PX_TNOAC;
             */
                /** Timer used for receive message */
            type component PlatComponent extends UtComponent, LibIpv6Node, SelfSyncComp {
                timer tc_wait:= PX_TWAIT;
            } // End of component AftrComponent
            } // End of component LSNFTPComponent
            
            
//            type component LSNFTPComponent extends UtComponent, SelfSyncComp {
            type component LSNSIPComponent extends UtComponent, SelfSyncComp {
//                /** FTP message port */
                /** SIP message port */
//                port FtpPort ftpPort;
                port SipPort sipPort;
//                /** Timer used for expected received message */
                /** Timer used for expected received message */
//                timer tc_ac:= PX_TAC;
                timer tc_ac:= PX_TAC;
//                /** Timer used for unexpected received message */
                /** Timer used for unexpected received message */
//                timer tc_noac:= PX_TNOAC;
                timer tc_noac:= PX_TNOAC;
//                /** Timer used for receive message */
                /** Timer used for receive message */
//                timer tc_wait:= PX_TWAIT;
                timer tc_wait:= PX_TWAIT;
//            } // End of component LSNFTPComponent
            } // End of component LSNSIPComponent
//            
            
//            type component LSNSIPComponent extends UtComponent, SelfSyncComp {
            type component LSNRTSPComponent extends UtComponent, SelfSyncComp {
//                /** SIP message port */
                /** RTSP message port */
//                port SipPort sipPort;
                port RtspPort rtspPort;
//                /** Timer used for expected received message */
                /** Timer used for expected received message */
//                timer tc_ac:= PX_TAC;
                timer tc_ac:= PX_TAC;
//                /** Timer used for unexpected received message */
                /** Timer used for unexpected received message */
//                timer tc_noac:= PX_TNOAC;
                timer tc_noac:= PX_TNOAC;
//                /** Timer used for receive message */
                /** Timer used for receive message */
//                timer tc_wait:= PX_TWAIT;
                timer tc_wait:= PX_TWAIT;
//            } // End of component LSNSIPComponent
            } // End of component LSNRTSPComponent
//            
            
//            type component LSNRTSPComponent extends UtComponent, SelfSyncComp {
            type component LSNPPTPComponent extends UtComponent, SelfSyncComp {
//                /** RTSP message port */
                /** PPTP message port */
//                port RtspPort rtspPort;
                port PptpPort pptpPort;
//                /** Timer used for expected received message */
                /** Timer used for expected received message */
//                timer tc_ac:= PX_TAC;
                timer tc_ac:= PX_TAC;
//                /** Timer used for unexpected received message */
                /** Timer used for unexpected received message */
//                timer tc_noac:= PX_TNOAC;
                timer tc_noac:= PX_TNOAC;
//                /** Timer used for receive message */
                /** Timer used for receive message */
//                timer tc_wait:= PX_TWAIT;
                timer tc_wait:= PX_TWAIT;
//            } // End of component LSNRTSPComponent
            } // End of component LSNPPTPComponent
//            
//            type component LSNPPTPComponent extends UtComponent, SelfSyncComp {
//                /** PPTP message port */
//                port PptpPort pptpPort;
//                /** 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_wait:= PX_TWAIT;
//            } // End of component LSNPPTPComponent
            
            
        } // End of group componentPorts
        } // End of group componentPorts
        
        
+1 −1
Original line number Original line Diff line number Diff line
@@ -118,6 +118,6 @@ module Ats464XLat_Pixits {
    /**
    /**
     * @desc The NAT64-Tunnel-MTU value.
     * @desc The NAT64-Tunnel-MTU value.
     */
     */
    modulepar UInt PX_464XLAT_PLAT_MTU := 1500;
    modulepar UInt16 PX_464XLAT_PLAT_MTU := 1500;
    
    
} // End of module Ats464XLat_Pixits
} // End of module Ats464XLat_Pixits
 No newline at end of file
+335 −335

File changed.

Preview size limit exceeded, changes collapsed.

+57 −34
Original line number Original line Diff line number Diff line
@@ -33,42 +33,65 @@ module Ats6RD_Functions {
    
    
    group initialiseFunctions {
    group initialiseFunctions {
        
        
        /**
//        /**
         * @desc Setup communication port for CPE role
//         * @desc Setup communication port for CPE role
         * @verdict Unchanged
//         * @verdict Unchanged
         */
//         */
        function f_cf01Up_cpe() runs on SixRDComponent {
//        function f_cf01Up_cpe() runs on SixRDComponent {
            
//            
            // Connect InterCompDataPort
//            // Connect InterCompDataPort
            if (isbound(vc_hostHttpComponents) and isbound(vc_brComponent)) {
//            if (isbound(vc_hostComponents) and isbound(vc_brComponent)) {
                var integer v_hosts;
//                var integer v_hosts;
                var integer v_host;
//                var integer v_host;
                v_hosts := lengthof(vc_hostComponents);
//                v_hosts := lengthof(vc_hostComponents);
                for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {
//                for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {
                    connect(vc_hostHttpComponents[v_host]:dataPort, vc_brComponent:dataPort);
//                    connect(vc_hostComponents[v_host]:dataPort, vc_brComponent:dataPort);
                }
//                }
            } 
//            } 
            
//            
            // Connect synchronisation ports
//            // Connect synchronisation ports
            f_connect4SelfOrClientSync();
//            f_connect4SelfOrClientSync();
            
//            
            // Default activation
//            // Default activation
            activate(a_default_MTC());
//            activate(a_default_MTC());
        } // End of function f_cf01Up_cpe
//        } // End of function f_cf01Up_cpe
//        
//        /**
//         * @desc Setup communication port for BR role
//         * @verdict Unchanged
//         */
//        function f_cf01Up_br() runs on SixRDComponent {
//            
//            // Connect InterCompDataPort
//            if (isbound(vc_hostComponents) and isbound(vc_brComponent)) {
//                var integer v_hosts;
//                var integer v_host;
//                v_hosts := lengthof(vc_hostComponents);
//                for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {
//                    connect(vc_hostComponents[v_host]:dataPort, vc_brComponent:dataPort);
//                }
//            } 
//            
//            // Connect synchronisation ports
//            f_connect4SelfOrClientSync();
//            
//            // Default activation
//            activate(a_default_MTC());
//        } // End of function f_cf01Up_br
        
        
        /**
        /**
         * @desc Setup communication port for BR role
         * @desc Setup communication port for MTC
         * @verdict Unchanged
         * @verdict Unchanged
         */
         */
        function f_cf01Up_br() runs on SixRDComponent {
        function f_mtcUp() runs on SixRDComponent {
            
            
            // Connect InterCompDataPort
            // Connect InterCompDataPort
            if (isbound(vc_hostHttpComponents) and isbound(vc_brComponent)) {
            if (isbound(vc_hostComponents) and isbound(vc_brComponent)) {
                var integer v_hosts;
                var integer v_hosts;
                var integer v_host;
                var integer v_host;
                v_hosts := lengthof(vc_hostComponents);
                v_hosts := lengthof(vc_hostComponents);
                for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {
                for (v_host:=0; v_host<v_hosts; v_host:=v_host + 1) {
                    connect(vc_hostHttpComponents[v_host]:dataPort, vc_brComponent:dataPort);
                    connect(vc_hostComponents[v_host]:dataPort, vc_brComponent:dataPort);
                }
                }
            } 
            } 
            
            
@@ -77,7 +100,7 @@ module Ats6RD_Functions {
            
            
            // Default activation
            // Default activation
            activate(a_default_MTC());
            activate(a_default_MTC());
        } // End of function f_cf01Up_br
        } // End of function f_mtcUp
        
        
    } // End of group initialiseFunctions
    } // End of group initialiseFunctions
    
    
@@ -125,7 +148,7 @@ module Ats6RD_Functions {
         * @verdict Unchanged
         * @verdict Unchanged
         * @see DNSComponent
         * @see DNSComponent
         */
         */
        function f_preamble_dhcpv4() runs on DHCPv4Component system TestAdapter {
        function f_preamble_dhcpv4() runs on HostComponent system TestAdapter {
            // Connect synchronisation ports
            // Connect synchronisation ports
            f_connect4SelfOrClientSync();
            f_connect4SelfOrClientSync();
            
            
@@ -139,7 +162,7 @@ module Ats6RD_Functions {
         * @verdict Unchanged
         * @verdict Unchanged
         * @see HTTPComponent
         * @see HTTPComponent
         */
         */
        function f_preamble_host_http() runs on HostHTTPComponent system TestAdapter {
        function f_preamble_host_http() runs on HostComponent system TestAdapter {
            // Connect synchronisation ports
            // Connect synchronisation ports
            f_connect4SelfOrClientSync();
            f_connect4SelfOrClientSync();
            
            
@@ -178,7 +201,7 @@ module Ats6RD_Functions {
         * @verdict Unchanged
         * @verdict Unchanged
         * @see DHCPv4Component
         * @see DHCPv4Component
         */
         */
        function f_postamble_dhcpv4() runs on DHCPv4Component {
        function f_postamble_dhcpv4() runs on HostComponent {
            // Nothing to do
            // Nothing to do
        } // End of function f_postamble_dhcpv4
        } // End of function f_postamble_dhcpv4
        
        
@@ -187,7 +210,7 @@ module Ats6RD_Functions {
         * @verdict Unchanged
         * @verdict Unchanged
         * @see HTTPComponent
         * @see HTTPComponent
         */
         */
        function f_postamble_host_http() runs on HostHTTPComponent {
        function f_postamble_host_http() runs on HostComponent {
            // Nothing to do
            // Nothing to do
        } // End of function f_postamble_host_httpv4
        } // End of function f_postamble_host_httpv4
        
        
@@ -203,7 +226,7 @@ module Ats6RD_Functions {
         * @param p_withHugePayload     Set to true if huge packet is required
         * @param p_withHugePayload     Set to true if huge packet is required
         * @return e_success on success, e_timeout on call timeout, e_error otherwise
         * @return e_success on success, e_timeout on call timeout, e_error otherwise
         */
         */
        function f_httpSendDataV4(in Ipv4Address p_srcAddress, in Ipv4Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload := false) runs on HostHTTPComponent
        function f_httpSendDataV4(in Ipv4Address p_srcAddress, in Ipv4Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload := false) runs on HostComponent
        return FncRetCode {
        return FncRetCode {
            var FncRetCode v_result := e_success;
            var FncRetCode v_result := e_success;
            
            
@@ -233,7 +256,7 @@ module Ats6RD_Functions {
         * @param p_withHugePayload     Set to true if huge packet is required
         * @param p_withHugePayload     Set to true if huge packet is required
         * @return e_success on success, e_timeout on call timeout, e_error otherwise
         * @return e_success on success, e_timeout on call timeout, e_error otherwise
         */
         */
        function f_httpSendDataV6(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload := false) runs on HostHTTPComponent
        function f_httpSendDataV6(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload := false) runs on HostComponent
        return FncRetCode {
        return FncRetCode {
            var FncRetCode v_result := e_success;
            var FncRetCode v_result := e_success;
            
            
@@ -352,7 +375,7 @@ module Ats6RD_Functions {
        /**
        /**
         * @desc 
         * @desc 
         */
         */
        altstep a_default_host_http() runs on HostHTTPComponent {
        altstep a_default_host_http() runs on HostComponent {
            [] httpPort.receive  { // Unsolicited messages
            [] httpPort.receive  { // Unsolicited messages
                tc_ac.stop;
                tc_ac.stop;
                log("*** " & __SCOPE__ & "ERROR: Received an unexpected IPv6 message, process it as an error ***");
                log("*** " & __SCOPE__ & "ERROR: Received an unexpected IPv6 message, process it as an error ***");
Loading