Commit c662127e authored by garciay's avatar garciay
Browse files

Re-organise ports mapping

parent 61951ce6
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -191,7 +191,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 HostHTTPComponent
        function f_httpSendDataV4(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;
            
@@ -211,7 +211,7 @@ module Ats6RD_Functions {
            }
            
            return v_result;
        } // End of function f_httpv4SendData
        } // End of function f_httpSendDataV4
        
        /**
         * @desc Send multiple native V6 HTTP requests to the specified HTTP server
@@ -221,7 +221,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 HostHTTPComponent
        function f_httpSendDataV6(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;
            
@@ -241,7 +241,7 @@ module Ats6RD_Functions {
            }
            
            return v_result;
        } // End of function f_httpv6SendData
        } // End of function f_httpSendDataV6
        
    } // End of group httpFunctions
    
+0 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ module Ats6RD_Interfaces {
    group mtcDesc {
        
        type component SixRDComponent extends UtComponent, LibIpv6Node {
            /** DHCPv4 port for DHCPv4Msg message exchanges */
            port DHCPv4Port dhcpv4Port;
            /** BR port */
            port Ipv4Port brPort;
            /** Host IPv6 port to simulate IPv6 client */
            port Ipv6Port ipv6HostPort;
            /** Host IPv4 port to simulate IPv4 client */
            port Ipv4Port ipv4HostPort;
            /** BR component reference */
            var BRComponent vc_brComponent := null;
            /** Host component reference */
+136 −125
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ module Ats6RD_Pixits {
    // Ats6RD
    import from Ats6RD_TypesAndValues all;
    
    group equipmentsSettings {
        
        /**
         * @desc Indicates the IPv4 address of the CPE equipment
         */
@@ -40,6 +42,28 @@ module Ats6RD_Pixits {
         */
        modulepar float PX_TCP_TIME_WAIT := 15.0;
        
        /**
         * @desc CPE IPv4 source port number
         */
        modulepar UInt16 PX_ETS_PORT := 1234;
        
        /**
         * @desc BR IPv4 port
         */
        modulepar UInt16 PX_IUT_PORT := 34569;
        
        /**
         * @desc BR IPv4 port ranges
         */
        modulepar UInt16 PX_IUT_PORT_RANGE := 3000;
        
    } // End of group equipmentsSettings
    
    /**
     * @desc Define settings for customers equipment behind the CPE
     */
    group customersEquipmentSettings {
        
        /**
         * @desc Defines a list of IPv6 host services with a segment size greater than the IUT MSS value
         * @see TC_6RD_CPE_MSSC_BV_001
@@ -129,19 +153,6 @@ module Ats6RD_Pixits {
            // TODO Could be extended 
        } // End of modulepar PX_MULTIPLE_HOSTS_V6_IN_V4
        
    /**
     * @desc CPE IPv4 source port number
     */
    modulepar UInt16 PX_ETS_PORT := 0;
    
    /**
     * @desc BR IPv4 port
     */
    modulepar UInt16 PX_IUT_PORT := 0;
    
    /**
     * @desc BR IPv4 port
     */
    modulepar UInt16 PX_IUT_PORT_RANGE := 3000;
    } // End of group customersEquipmentSettings
    
} // End of module Ats6RD_Pixits
 No newline at end of file
+47 −47
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ module Ats6RD_TestCases {
                        // Test Body
                        // Clause 'when': the IUT receives multiple HTML IPv6 packets 
                        if (
                            f_httpv6SendData(
                            f_httpSendDataV6(
                                p_srcAddress,                                   // containing source address indicating a public IPv6 address
                                p_httpServerAddress,                            // containing destination address indicating a public IPv6 address
                                p_noOfDataRequests                              // from multiple hosts
@@ -445,7 +445,7 @@ module Ats6RD_TestCases {
                testcase TC_6RD_CPE_PF_BV_001() runs on SixRDComponent system TestAdapter {
                    
                    // Local variables
                    var UInt v_noOfDataRequests := 3;
                    var UInt v_noOfDataRequests := 1; // Only one HTTP request per host
                    
                    // Test control
                    if (not(PICS_ROLE_IS_CPE)) {
@@ -455,14 +455,14 @@ module Ats6RD_TestCases {
                    
                    // Test component configuration
                    vc_brComponent := BRComponent.create(c_COMP_AFTR);
                    vc_hostHttpComponents[0] := HostHTTPComponent.create(c_COMP_HTTP);
                    vc_hostHttpComponents[0] := HostHTTPComponent.create(c_COMP_HTTP); // TODO Add support of multiple host
                    f_cf01Up();
                    
                    // Test adapter configuration
                    
                    // Start all components
                    vc_brComponent.start(f_TC_6RD_CPE_PF_BV_001_br(v_noOfDataRequests));
                    vc_hostHttpComponents[0].start(f_TC_6RD_CPE_PF_BV_001_host_http(
                    vc_hostHttpComponents[0].start(f_TC_6RD_CPE_PF_BV_001_host_http( // TODO Add support of multiple host
                        PX_HTTP_CLIENT_IPV6_ADDRESS,
                        PX_WEB_SERVER_IPv6,
                        v_noOfDataRequests
@@ -567,10 +567,10 @@ module Ats6RD_TestCases {
                        
                        // Test Body
                        // Clause 'when': the IUT receives multiple HTML IPv6 packets 
                        if (f_httpv6SendData(
                        if (f_httpSendDataV6(
                                p_srcAddress,                               // containing source address indicating a public IPv6 address
                                p_httpServerAddress,                        // containing destination address indicating a public IPv6 address
                                p_noOfDataRequests,                         // from multiple hosts
                                p_noOfDataRequests,
                                true                                        // with a packet size greater than the 6RD tunnel MTU
                        ) != e_success) {
                            f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
@@ -671,16 +671,19 @@ module Ats6RD_TestCases {
                    
                    // Test component configuration
                    vc_brComponent := BRComponent.create(c_COMP_AFTR);
                    vc_hostComponents[0] := HostComponent.create(c_COMP_HTTP);
                    vc_hostHttpComponents[0] := HostHTTPComponent.create(c_COMP_HTTP);
                    f_cf01Up();
                    
                    // 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(
//                        PX_HTTP_CLIENT_IPV6_ADDRESS,
                    vc_brComponent.start(f_TC_6RD_CPE_PF_BV_002_br(v_noOfDataRequests));
                    
                    // TODO Use ICMP with a PIC_ICMP_ECHO_REQUEST
                    
//                    vc_hostHttpComponents[0].start(f_TC_6RD_CPE_PF_BV_002_host_http(
//                        PX_WEB_SERVER_IPv6,
//                        PX_HTTP_CLIENT_IPV6_ADDRESS,
//                        v_noOfDataRequests
//                    ));
                    
@@ -722,6 +725,10 @@ module Ats6RD_TestCases {
                    function f_TC_6RD_CPE_PF_BV_002_host() runs on HostComponent {
                        
                        // Local variables
                        var Ipv6Packet v_ipv6Packet;
                        var template (present) TcpPacket v_tcpPacket;
                        var FncRetCode v_result := e_error;
                        var UInt v_noOfDataRequests := 0;
                        
                        // Preamble
                        // Clause 'Initial conditions'
@@ -730,26 +737,14 @@ module Ats6RD_TestCases {
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        // Test Body
                        tc_ac.start;
                        alt {
                            [] ipv6Port.receive
                            {
                                tc_ac.stop;
                                
                                
                            }
                            [] tc_ac.timeout {
                                f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
                                log("*** " & __SCOPE__ & ": INCONC: The IUT drops the packets. ***");
                            }
                        } // End of 'altstep' statement
                        // Clause 'when': the IUT receives multiple HTML IPv6 packets 
                        // TODO Use ICMP with a PIC_ICMP_ECHO_REQUEST
                        
                        // Postamble
                        f_postamble_host();
                        f_selfOrClientSyncAndVerdict(c_poDone, e_success);
                        log("*** " & __SCOPE__ & ": INFO: Postamble done. ***");
                        

                    } // End of function f_TC_6RD_CPE_PF_BV_002_host
                    
                } // End of group f_TC_6RD_CPE_PF_BV_002
@@ -1646,7 +1641,7 @@ module Ats6RD_TestCases {
                testcase TC_6RD_BR_PF_BV_001() runs on SixRDComponent system TestAdapter {
                    
                    // Local variables
                    var UInt v_noOfDataRequests := 3;
                    var UInt v_noOfDataRequests := 1; // Only one HTTP request per host
                    
                    // Test control
                    if (not(PICS_ROLE_IS_CPE)) {
@@ -1656,14 +1651,14 @@ module Ats6RD_TestCases {
                    
                    // Test component configuration
                    vc_brComponent := BRComponent.create(c_COMP_AFTR);
                    vc_hostHttpComponents[0] := HostHTTPComponent.create(c_COMP_HTTP);
                    vc_hostHttpComponents[0] := HostHTTPComponent.create(c_COMP_HTTP); // TODO Add support of multiple host
                    f_cf01Up();
                    
                    // Test adapter configuration
                    
                    // Start all components
                    vc_brComponent.start(f_TC_6RD_BR_PF_BV_001_br(v_noOfDataRequests));
                    vc_hostHttpComponents[0].start(f_TC_6RD_BR_PF_BV_001_host_http(
                    vc_hostHttpComponents[0].start(f_TC_6RD_BR_PF_BV_001_host_http( // TODO Add support of multiple host
                        PX_HTTP_CLIENT_IPV6_ADDRESS,
                        PX_WEB_SERVER_IPv6,
                        v_noOfDataRequests
@@ -1716,10 +1711,11 @@ module Ats6RD_TestCases {
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        // Test Body
                        v_result := f_httpv6SendData(
                        // Clause when: the IUT receives multiple HTML IPv6 packets
                        v_result := f_httpSendDataV6(
                                p_srcAddress,                               // containing source address indicating a public IPv6 address
                                p_httpServerAddress,                        // containing destination address indicating a public IPv6 address
                                p_noOfDataRequests,                         // from multiple hosts
                                p_noOfDataRequests,
                                true                                        // with a packet size greater than the 6RD tunnel MTU
                        );
                        f_selfOrClientSyncAndVerdict(c_tbDone, v_result);
@@ -1775,7 +1771,7 @@ module Ats6RD_TestCases {
                testcase TC_6RD_BR_PF_BV_002() runs on SixRDComponent system TestAdapter {
                    
                    // Local variables
                    var UInt v_noOfDataRequests := 3;
                    var UInt v_noOfDataRequests := 1; // Only one HTTP request per host
                    
                    // Test control
                    if (not(PICS_ROLE_IS_CPE)) {
@@ -1792,11 +1788,7 @@ module Ats6RD_TestCases {
                    
                    // Start all components
                    vc_brComponent.start(f_TC_6RD_BR_PF_BV_002_br(v_noOfDataRequests));
                    vc_hostHttpComponents[0].start(f_TC_6RD_BR_PF_BV_002_host_http(
                        PX_HTTP_CLIENT_IPV6_ADDRESS,
                        PX_WEB_SERVER_IPv6,
                        v_noOfDataRequests
                    ));
                    // TODO Use ICMP with a PIC_ICMP_ECHO_REQUEST
                    
                    // Test Body
                    // Clause 'when': Nothing to do 
@@ -1819,7 +1811,21 @@ module Ats6RD_TestCases {
                     */
                    function f_TC_6RD_BR_PF_BV_002_br(in UInt p_noOfDataRequests) runs on BRComponent {
                        
                        // TODO
                        // Local variables
                        
                        // Preamble
                        // Clause 'Initial conditions'
                        f_preamble_br();
                        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        // Test Body
                            // TODO brPort.send();
                        
                        // Postamble
                        f_postamble_br();
                        f_selfOrClientSyncAndVerdict(c_poDone, e_success);
                        log("*** " & __SCOPE__ & ": INFO: Postamble done. ***");
                            
                    } // End of function f_TC_6RD_BR_PF_BV_002_br
                    
@@ -1830,7 +1836,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 HostHTTPComponent {
                    function f_TC_6RD_BR_PF_BV_002_host() runs on HostComponent {
                        
                        // Local variables
                        var Ipv6Packet v_ipv6Packet;
@@ -1840,25 +1846,19 @@ module Ats6RD_TestCases {
                        
                        // Preamble
                        // Clause 'Initial conditions'
                        f_preamble_host_http();
                        f_preamble_host();
                        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        // Test Body
                        v_result := f_httpv6SendData(
                                p_srcAddress,                               // containing source address indicating a public IPv6 address
                                p_httpServerAddress,                        // containing destination address indicating a public IPv6 address
                                p_noOfDataRequests,                         // from multiple hosts
                                true                                        // with a packet size greater than the 6RD tunnel MTU
                        );
                        f_selfOrClientSyncAndVerdict(c_tbDone, v_result);
                        // TODO Use ICMP with a PIC_ICMP_ECHO_REQUEST
                        
                        // Postamble
                        f_postamble_host_http();
                        f_postamble_host();
                        f_selfOrClientSyncAndVerdict(c_poDone, e_success);
                        log("*** " & __SCOPE__ & ": INFO: Postamble done. ***");
                        
                    } // End of function f_TC_6RD_BR_PF_BV_002_host_http
                    } // End of function f_TC_6RD_BR_PF_BV_002_host
                    
                } // End of group f_TC_6RD_BR_PF_BV_002