Commit 147b233b authored by garciay's avatar garciay
Browse files

Deleted commented lines, 

Implement some TODOs,
Remove TODOs in PIXITs
Minor bugs fixed
parent 91087d8f

ttcn/Ats6RD/Ats6RD_Functions.ttcn3

+1 −48
Original line number Diff line number Diff line 
/*

 *  @author     STF 440

 *  @version    $Id$

 *  @version    $Id:$

 *  @desc       This module defines the ATS interface

 */

module Ats6RD_Functions {
@@ -33,52 +33,6 @@ module Ats6RD_Functions { 
    

    group initialiseFunctions {

        

//        /**

//         * @desc Setup communication port for CPE role

//         * @verdict Unchanged

//         */

//        function f_cf01Up_cpe() 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_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 MTC

         * @verdict Unchanged
@@ -284,7 +238,6 @@ module Ats6RD_Functions { 
        

        /**

         * @desc 

         * TODO enable functionality!

         */

        altstep a_default_MTC() runs on SixRDComponent {

ttcn/Ats6RD/Ats6RD_Interfaces.ttcn3

+1 −21
Original line number Diff line number Diff line 
/*

 *  @author     STF 440

 *  @version    $Id$

 *  @version    $Id:$

 *  @desc       This module defines the ATS interface

 */

module Ats6RD_Interfaces {
@@ -33,40 +33,20 @@ module Ats6RD_Interfaces { 
            var HostComponents vc_hostComponents := null;

            /** DHCPv4 component reference */

            var HostComponent vc_dhcpv4Component := null;

//            /** Host HTTP component reference */

//            var HostHTTPComponents vc_hostHttpComponents := null;

        } // End of component SixRDComponent

        

        type record of HostComponent HostComponents;

        

//        type record of HostHTTPComponent HostHTTPComponents;

        

    } // End of group mtcDesc

    

    group componentDesc {

        

        group componentPorts {

            

//            type component HostComponent extends UtComponent, LibIpv6Node, SelfSyncComp {

//            } // End of component HostComponent

            

            type component BRComponent extends UtComponent, LibIpv6Node, SelfSyncComp {

                /** Inter-component communication port */

                port InterCompDataPort dataPort;

            } // End of component BRComponent

//            

//            type component HostHTTPComponent extends UtComponent, SelfSyncComp {

//                /** HTTP message port */

//                port HttpPort httpPort;

//                /** Inter-component communication port */

//                port InterCompDataPort dataPort;

//                /** 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_wait:= PX_TWAIT;

//            } // End of component HostHTTPComponent

            

        } // End of group componentPorts

ttcn/Ats6RD/Ats6RD_Pics.ttcn3

+1 −1
Original line number Diff line number Diff line 
/*

 *  @author     STF 440

 *  @version    $Id$

 *  @version    $Id:$

 *  @desc       This module defines the ATS interface

 */

    /**

ttcn/Ats6RD/Ats6RD_Pixits.ttcn3

+3 −3
Original line number Diff line number Diff line 
/*

 *  @author     STF 440

 *  @version    $Id$

 *  @version    $Id:$

 *  @desc       This module defines the ATS interface

 */

module Ats6RD_Pixits {
@@ -86,7 +86,7 @@ module Ats6RD_Pixits { 
                    rawPayload := c_1280ZeroBytes

                } 

            } // Host #0

            // TODO Could be extended 

            // Could be extended 

        } // End of modulepar PX_MSSC_HOST_V6_LIST_CPE

        

        /**
@@ -159,7 +159,7 @@ module Ats6RD_Pixits { 
                    rawPayload := 'CAFEDECA'O 

                } 

            } // Host #0

            // TODO Could be extended 

            // Could be extended 

        } // End of modulepar PX_MULTIPLE_HOSTS_V6_IN_V4

        

//    } // End of group customersEquipmentSettings

ttcn/Ats6RD/Ats6RD_Templates.ttcn3

+1 −1
Original line number Diff line number Diff line 
/*

 *  @author     STF 440

 *  @version    $Id$

 *  @version    $Id:$

 *  @desc       This module defines the ATS interface

 */

module Ats6RD_Templates {