Commit 201b9e89 authored by garciay's avatar garciay
Browse files

Re-organise ETS/SUT pixits

parent 310d706c

ttcn3/S1AP_Pixits.ttcn

+7 −38
Original line number Diff line number Diff line
@@ -21,42 +21,22 @@ module S1AP_Pixits { 
            /** @desc    

             * IP address of the test system

             */

            modulepar charstring PX_S1AP_MME_ETS_IPADDR := "1.1.1.10";

            modulepar charstring PX_S1AP_ETS_IPADDR := "1.1.1.10";

            

            /** @desc    

             * Port number of the test system

             */

            modulepar integer PX_S1AP_MME_ETS_PORT := 3868;

            modulepar integer PX_S1AP_ETS_PORT := 3868;

                        

            /** @desc    

             * IP address of the test system

             */

            modulepar charstring PX_S1AP_MME_ETS_IPADDR2 := "1.1.1.11";

            modulepar charstring PX_S1AP_ETS_IPADDR2 := "1.1.1.13";

            

            /** @desc    

             * Port number of the test system

             */

            modulepar integer PX_S1AP_MME_ETS_PORT2 := 3868;

            

            /** @desc    

             * IP address of the test system

             */

            modulepar charstring PX_S1AP_eNB_ETS_IPADDR := "1.1.1.12";

            

            /** @desc    

             * Port number of the test system

             */

            modulepar integer PX_S1AP_eNB_ETS_PORT := 3868;

            

            /** @desc    

             * IP address of the test system

             */

            modulepar charstring PX_S1AP_eNB_ETS_IPADDR2 := "1.1.1.13";

            

            /** @desc    

             * Port number of the test system

             */

            modulepar integer PX_S1AP_eNB_ETS_PORT2 := 3868;

            modulepar integer PX_S1AP_ETS_PORT2 := 3868;



            

        } // End of group S1AP_TS_Port_and_addresses
@@ -66,23 +46,12 @@ module S1AP_Pixits { 
            /** @desc    

             * IP address of the system under test

             */

            modulepar charstring PX_S1AP_MME_SUT_IPADDR := "1.1.2.10";

            

            /** @desc   

             * Port number of the system under test

             */

            modulepar integer PX_S1AP_MME_SUT_PORT := 3868;

            

            /** @desc    

             * IP address of the system under test

             */

            modulepar charstring PX_S1AP_eNB_SUT_IPADDR := "1.1.2.11";

            modulepar charstring PX_S1AP_SUT_IPADDR := "1.1.2.10";

            

            /** @desc   

             * Port number of the system under test

             */

            modulepar integer PX_S1AP_eNB_SUT_PORT := 3868;

            

            modulepar integer PX_S1AP_SUT_PORT := 3868;

            

        } // End of group S1AP_SUT_Port_and_addresses{

ttcn3/S1AP_Steps.ttcn

+16 −14
Original line number Diff line number Diff line 
/**

 *    @author   ETSI / STF519

 *    @version  $URL:$

 *              $Id:$

 *    @version  $URL$

 *              $Id$

 *    @desc     This module provides ATS specific steps used by the test cases for S1AP test.

 *    @copyright   ETSI Copyright Notification

 *                 No part may be reproduced except as authorized by written permission.
@@ -22,6 +22,7 @@ module S1AP_Steps { 
        

        /**

         * @desc    This is a test step that init global variables

         *          This procedure will be use when the Test System acts as MME (SUT is eNB)

         */

        function f_S1AP_mme_init()

        runs on S1APComponent {
@@ -32,15 +33,16 @@ module S1AP_Steps { 
            // Base LibS1AP init function if there will be any base initialisation

            f_S1AP_Init_Component();

            

            vc_ETS_address := PX_S1AP_MME_ETS_IPADDR;

            vc_ETS_port    := PX_S1AP_MME_ETS_PORT;

            vc_SUT_address := PX_S1AP_MME_SUT_IPADDR;

            vc_SUT_port    := PX_S1AP_MME_SUT_PORT;

            vc_ETS_address := PX_S1AP_ETS_IPADDR;

            vc_ETS_port    := PX_S1AP_ETS_PORT;

            vc_SUT_address := PX_S1AP_SUT_IPADDR;

            vc_SUT_port    := PX_S1AP_SUT_PORT;

            

        } // End of function f_S1AP_init

        

        /**

         * @desc    This is a test step that init global variables

         *          This procedure will be use when the Test System acts as eNB (SUT is MME)

         */

        function f_S1AP_enb_init()

        runs on S1APComponent {
@@ -51,10 +53,10 @@ module S1AP_Steps { 
            // Base LibS1AP init function if there will be any base initialisation

            f_S1AP_Init_Component();

            

            vc_ETS_address := PX_S1AP_eNB_ETS_IPADDR;

            vc_ETS_port    := PX_S1AP_eNB_ETS_PORT;

            vc_SUT_address := PX_S1AP_eNB_SUT_IPADDR;

            vc_SUT_port    := PX_S1AP_eNB_SUT_PORT;

            vc_ETS_address := PX_S1AP_ETS_IPADDR;

            vc_ETS_port    := PX_S1AP_ETS_PORT;

            vc_SUT_address := PX_S1AP_SUT_IPADDR;

            vc_SUT_port    := PX_S1AP_SUT_PORT;

            

        } // End of function f_S1AP_enb_init
@@ -70,10 +72,10 @@ module S1AP_Steps { 
            // Base LibS1AP init function if there will be any base initialisation

            f_S1AP_Init_Component();

            

            vc_ETS_address := PX_S1AP_eNB_ETS_IPADDR2;

            vc_ETS_port    := PX_S1AP_eNB_ETS_PORT2;

            vc_SUT_address := PX_S1AP_eNB_SUT_IPADDR;

            vc_SUT_port    := PX_S1AP_eNB_SUT_PORT;

            vc_ETS_address := PX_S1AP_ETS_IPADDR2;

            vc_ETS_port    := PX_S1AP_ETS_PORT2;

            vc_SUT_address := PX_S1AP_SUT_IPADDR;

            vc_SUT_port    := PX_S1AP_SUT_PORT;

            

        } // End of function f_S1AP_enb_init2