Commit 7ad2a2e7 authored by garciay's avatar garciay
Browse files

Remove TODOs

parent a2eaa4c2
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@
         * @param p_withHugePayload     Set to true if huge packet is required
         * @return true on success, false otherwise
         */
        signature s_httpSendDataV4(in Ipv4Address p_srcAddress, in Ipv4Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload) return boolean; // TODO To be continued
        signature s_httpSendDataV4(in Ipv4Address p_srcAddress, in Ipv4Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload) return boolean; 
        
        /**
         * @desc Send multiple HTTPv6 requests to the specified HTTP server
@@ -141,7 +141,7 @@
         * @param p_withHugePayload     Set to true if huge packet is required
         * @return true on success, false otherwise
         */
        signature s_httpSendDataV6(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload) return boolean; // TODO To be continued
        signature s_httpSendDataV6(in Ipv6Address p_srcAddress, in Ipv6Address p_httpServerAddress, in UInt p_noOfDataRequests, in boolean p_withHugePayload) return boolean; 
        
    } // End of group httpTypes
    
+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ module AtsDSLite_TestCases {
                        f_selfOrClientSyncAndVerdict(c_poDone, e_success);
                        log("*** " & __SCOPE__ & ": INFO: Postamble done. ***");
                        
                    } // End of function f_TC_DSLITE_B4_GWA_BV_03_host
                    } // End of function f_TC_DSLITE_B4_GWA_BV_03_host_http
                    
                } // End of group f_TC_DSLITE_B4_GWA_BV_03
                
+72 −3
Original line number Diff line number Diff line
@@ -1465,6 +1465,12 @@ module AtsMapE_TestCases {
         */
        group gatewayPrefixAssignment {
            
            group standardSyncPointNames {
                
                const charstring c_startDefaultRouteCheck := "startDefaultRouteCheck";
                
            } // End of group standardSyncPointNames
            
            group validBehaviour {
                
                /**
@@ -1592,6 +1598,7 @@ module AtsMapE_TestCases {
                            }
                        } // End of 'altstep' statement
                        
                        f_selfOrClientSyncAndVerdict(c_startDefaultRouteCheck, e_success);
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                        log("*** " & __SCOPE__ & ": PASS: Successfully received DHCPv6 Reply from the DHCPv6 Server. ***");
                        
@@ -1638,6 +1645,7 @@ module AtsMapE_TestCases {
                testcase TC_MAPE_CPE_GWA_BV_02() runs on MapEComponent system TestAdapter {
                    
                    // Local variables
                    var UInt v_noOfDataRequests := 1;
                    
                    // Test control
                    if (not(PICS_ROLE_IS_CPE)) {
@@ -1647,14 +1655,20 @@ module AtsMapE_TestCases {
                    
                    // Test component configuration
                    vc_dhcpv6Component := HostComponent.create(c_COMP_DHCP);
                    vc_hostComponents[0] := HostComponent.create(c_COMP_HTTP);
                    f_mtcUp();
                    
                    // Test adapter configuration
                    
                    // Start all components
                    vc_dhcpv6Component.start(f_TC_MAPE_CPE_GWA_BV_01_dhcpv6());
                    vc_hostComponents[0].start(f_TC_MAPE_CPE_GWA_BV_02_host_http(
                        PX_MAPE_MAPPING_TABLE_A_PLUS_P.mapInfos[0].ip4Address,
                        PX_IPV4_DESTINATION_INFORMATION.iutAddress,
                        v_noOfDataRequests
                    ));
                    
                    f_serverSyncNClientsAndStop(1, { c_prDone, c_tbDone, c_poDone });
                    f_serverSyncNClientsAndStop(1, { c_prDone, c_startDefaultRouteCheck, c_tbDone, c_poDone });
                    
                    // Test Body
                    action("the IUT goes online");
@@ -1727,7 +1741,8 @@ module AtsMapE_TestCases {
                            }
                        } // End of 'altstep' statement
                        
                        //TODO check the default route configuration using v_ia_naAddress
                        // Check the default route configuration using v_ia_naAddress
                        f_selfOrClientSyncAndVerdict(c_startDefaultRouteCheck, e_success);
                        
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                        log("*** " & __SCOPE__ & ": PASS: Successfully received DHCPv6 Reply from the DHCPv6 Server. ***");
@@ -1739,6 +1754,60 @@ module AtsMapE_TestCases {
                        
                    } // End of function f_TC_MAPE_CPE_GWA_BV_02_dhcpv6
                    
                    /**
                     * @desc Implements multiple host side behavior
                     * @param p_srcAddress          The HTTP client address
                     * @param p_httpServerAddress   The HTTP server address
                     * @param p_noOfDataRequests    The number of hosts to simulate
                     * @verdict pass on success, inconc on timeout, fail otherwise
                     */
                    function f_TC_MAPE_CPE_GWA_BV_02_host_http(in Ipv4Address p_srcAddress, in Ipv4Address p_httpServerAddress, in UInt p_noOfDataRequests) runs on HostComponent {
                        
                        // Local variables
                        var Ipv4Packet v_ipv4Packet;    /** Used to store received IPv4 messages */
                        var InterCompDataMsg v_data;    /** Used to send received IPv4 messages to BRComponent */
                        
                        // Preamble
                        // Clause 'Initial conditions'
                        f_preamble_host_http();
                        f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                        log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                        
                        // 
                        // Test Body: Check the default route configuration using v_ia_naAddress
                        f_selfOrClientSyncAndVerdict(c_startDefaultRouteCheck, e_success);
                        if (
                            f_httpSendDataV4(
                                p_srcAddress,                                   // containing source address indicating a private IPv4 address 
                                p_httpServerAddress,                            // containing destination address indicating a public IPv4 address
                                p_noOfDataRequests                              // from multiple hosts
                            ) == e_error) { 
                            f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                            log("*** " & __SCOPE__ & ": FAIL: Unaible to send HTTP messages. ***");
                        }
                        tc_ac.start;
                        alt {
                            [] httpPort.receive(
                                mw_ipv4Packet_df(
                                    p_srcAddress,
                                    p_httpServerAddress
                            )) -> value v_ipv4Packet {
                                v_data.address_.ipv4Address := v_ipv4Packet.ipv4Hdr.sourceAddress;
                                v_data.ipv4Packet := v_ipv4Packet;
                                dataPort.send(v_data);
                            }
                            [] tc_ac.timeout { 
                                f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                            }
                        } // End of 'altstep' statement
                        
                        // Postamble
                        f_postamble_host_http();
                        f_selfOrClientSyncAndVerdict(c_poDone, e_success);
                        log("*** " & __SCOPE__ & ": INFO: Postamble done. ***");
                        
                    } // End of function f_TC_MAPE_CPE_GWA_BV_02_host_http
                    
                } // End of group f_TC_MAPE_CPE_GWA_BV_02 
                
            } // End of group validBehaviour
@@ -1960,7 +2029,7 @@ module AtsMapE_TestCases {
                        f_selfOrClientSyncAndVerdict(c_poDone, e_success);
                        log("*** " & __SCOPE__ & ": INFO: Postamble done. ***");
                        
                    } // End of function f_TC_MAPE_CPE_BF_BV_01_host
                    } // End of function f_TC_MAPE_CPE_BF_BV_01_host_http
                    
                } // End of group f_TC_MAPE_CPE_BF_BV_01