Commit 751f6892 authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Merged PICS and TCFunction modules

parents 2f6e46f0 172106c2

.gitignore

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,3 +2,4 @@ 
.classpath

.classpath

.project

.project

/.settings/

/.settings/

/.gitignore.my

LibDiameter @ c9f25b2f

Original line number Original line Diff line number Diff line 
Subproject commit 271ae9c547a935110758b3182b7bb077901e7b71
 
Subproject commit c9f25b2f33d34138b9092ce747047abfb3e5fc17

ttcn/DiameterShDh_PICS.ttcn3

+2 −2
Original line number Original line Diff line number Diff line
@@ -12,13 +12,13 @@ module DiameterShDh_PICS { 
         * @desc Does AS act as the IUT? 

         * @desc Does AS act as the IUT? 

         * @see  ETSI TS 103 571-1 V0.0.2 (2018-09) A.2/1 

         * @see  ETSI TS 103 571-1 V0.0.2 (2018-09) A.2/1 

         */

         */

        modulepar boolean PICS_SH_AS_IUT := false;

        modulepar boolean PICS_HSS_IUT := false;

        

        

        /**

        /**

         * @desc Does CTF act as the IUT? 

         * @desc Does CTF act as the IUT? 

         * @see  ETSI TS 103 374-1 V1.1.2 (2015-09) A.2/2 

         * @see  ETSI TS 103 374-1 V1.1.2 (2015-09) A.2/2 

         */

         */

        modulepar boolean PICS_SH_OCF_IUT := false;

        modulepar boolean PICS_AS_IUT := false;

        

        

    } // End of group PICS_A2

    } // End of group PICS_A2

ttcn/DiameterShDh_PIXITS.ttcn3

+17 −4
Original line number Original line Diff line number Diff line
@@ -140,8 +140,21 @@ module DiameterShDh_PIXITS { 
        /** @desc    UTF8String

        /** @desc    UTF8String

         *  TODO

         *  TODO

        */

        */

        modulepar charstring PX_public_user_identity := "origin.etsi.org"

        modulepar charstring PX_PublicUserIdentity := "origin.etsi.org";

        /** @desc    UTF8String

         *  TODO

        */

        modulepar charstring PX_NotExistingUserIdentity := "origin.etsi2.org";



        /** @desc    UTF8String

         *  TODO

        */

        modulepar charstring PX_NotRelatedPrivateIdentity := "foo";

        

        

        /** @desc    UTF8String

         *  TODO

        */

        modulepar charstring PX_PublicUser_MSISDN := "foo";

    } // End of group DiameterCommonShDhData

    } // End of group DiameterCommonShDhData

    

    

    group SipParameters {

    group SipParameters {

ttcn/DiameterShDh_Steps.ttcn3

+72 −72
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ module DiameterShDh_Steps { 
            }

            }

            

            

            f_DiameterSh_init();

            f_DiameterSh_init();

            f_preambleDiameterBaseServer(c_applIdSh);

            f_preambleDiameterBaseServer(c_applId3GPPShDh);

            v_def_diameter_catchEvent := activate (a_diameter_event());

            v_def_diameter_catchEvent := activate (a_diameter_event());

            

            

            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later

            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later
@@ -93,7 +93,7 @@ module DiameterShDh_Steps { 
            }

            }

    

    

            f_DiameterSh_init();

            f_DiameterSh_init();

			f_preambleDiameterBaseServer(c_applIdSh);

            f_preambleDiameterBaseServer(c_applId3GPPShDh);

            v_def_diameter_catchEvent := activate (a_diameter_event());

            v_def_diameter_catchEvent := activate (a_diameter_event());

    

    

            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later

            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later
@@ -109,7 +109,7 @@ module DiameterShDh_Steps { 
            }

            }

    

    

            f_DiameterSh_init();

            f_DiameterSh_init();

			f_preambleDiameterBaseServer(c_applIdSh);

            f_preambleDiameterBaseServer(c_applId3GPPShDh);

            v_def_diameter_catchEvent := activate (a_diameter_event());

            v_def_diameter_catchEvent := activate (a_diameter_event());

    

    

            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later

            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later
@@ -125,7 +125,7 @@ module DiameterShDh_Steps { 
            }

            }





            f_DiameterSh_init();

            f_DiameterSh_init();

			f_preambleDiameterBaseServer(c_applIdSh);

            f_preambleDiameterBaseServer(c_applId3GPPShDh);

            v_def_diameter_catchEvent := activate (a_diameter_event());

            v_def_diameter_catchEvent := activate (a_diameter_event());





            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later

            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later