Commit 2b7ae361 authored by pintar's avatar pintar
Browse files

solved issues which were discovered in the meantime of adapter preparation

parent d226d612

DiameterS6a/ttcn/DiameterS6a_HSS_TCFunctions.ttcn3

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ module DiameterS6a_HSS_TCFunctions { 
        type DIAMETER_MSG

    };

    import from LibDiameter_Steps {

        function f_getVerdict

        function f_getVerdict, f_IPAdress

    };

    import from LibDiameter_Types_Base_AVPs  {

       type all
@@ -147,7 +147,7 @@ module DiameterS6a_HSS_TCFunctions { 
                            md_contextIdentifier(PX_CONTEXT_ID),                    //     containing a Context-Identifier AVP

                            md_service_Selection_AVP(PX_SERVICE_SEL),               //     containing Service-Selection AVP

                            md_mip6_Agent_Info_AVP (                                //     containing MIP6-Agent-Info AVP

                                md_mip_Home_Agent_Address_AVP(PX_MIP6_AGENT_IP_ADDRESS),

                                md_mip_Home_Agent_Address_AVP(f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6)),

                                md_mip_Home_Agent_Host_AVP(

                                    m_destinationRealm(PX_MIP6_AGENT_DEST_REALM),

                                    m_destinationHost(PX_MIP6_AGENT_DEST_HOST) )),

DiameterS6a/ttcn/DiameterS6a_MME_TCFunctions.ttcn3

+17 −17
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ module DiameterS6a_MME_TCFunctions { 
    

    // LibDiameter 

    import from LibDiameter_Steps {

        function f_getVerdict

        function f_getVerdict, f_IPAdress

    };

    import from LibDiameter_Types_Base_AVPs  {

       type all
@@ -736,7 +736,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP               v_user_Name         := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -799,7 +799,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP               v_user_Name         := md_user_Name ( PX_INVALID_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -862,7 +862,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP               v_user_Name         := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -926,7 +926,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP               v_user_Name         := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -990,7 +990,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP               v_user_Name         := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1053,7 +1053,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP               v_user_Name         := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1116,7 +1116,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP               v_user_Name         := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1179,7 +1179,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP               v_user_Name         := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1242,7 +1242,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP                 v_user_Name               := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP          v_noStateMaintained       := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1304,7 +1304,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP                 v_user_Name               := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP          v_noStateMaintained       := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1368,7 +1368,7 @@ module DiameterS6a_MME_TCFunctions { 
            var User_Name_AVP                 v_user_Name               := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP          v_noStateMaintained       := md_auth_Session_State_noStateMaintained;

            // TODO Gprs subscription instead APN subscription

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1432,7 +1432,7 @@ module DiameterS6a_MME_TCFunctions { 
            var User_Name_AVP                 v_user_Name               := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP          v_noStateMaintained       := md_auth_Session_State_noStateMaintained;

            // TODO generic subscription instead APN subscription

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1500,7 +1500,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP               v_user_Name         := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1567,7 +1567,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP                 v_user_Name         := md_user_Name ( PX_INVALID_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1633,7 +1633,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP                 v_user_Name         := md_user_Name ( PX_INVALID_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,
@@ -1699,7 +1699,7 @@ module DiameterS6a_MME_TCFunctions { 
            // Local variables

            var User_Name_AVP               v_user_Name         := md_user_Name ( PX_USR_NAME );

            var Auth_Session_State_AVP        v_noStateMaintained := md_auth_Session_State_noStateMaintained;

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( PX_MIP6_AGENT_IP_ADDRESS );

            var MIP_Home_Agent_Address_AVP    v_mipHomeAgentAddress     := md_mipHomeAgentAddress ( f_IPAdress(PX_MIP6_AGENT_ipv4,PX_MIP6_AGENT_ipv6) );

            var Destination_Realm_AVP         v_mIP6Destination_Realm   := m_destinationRealm ( PX_MIP6_AGENT_DEST_REALM );

            var Destination_Host_AVP          v_mip6Destination_Host    := m_destinationHost ( PX_MIP6_AGENT_DEST_HOST );

            var MIP_Home_Agent_Host_AVP       v_mipHomeAgentHost        := md_mipHomeAgentHost ( v_mIP6Destination_Realm,

DiameterS6a/ttcn/DiameterS6a_PIXITS.ttcn

+10 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ module DiameterS6a_PIXITS { 
    // LibDiameter

    import from LibDiameter_Types_Base_AVPs {

        type 

            IpAddress, Diameter_Identity, UTF8String 

            IpAddress, Diameter_Identity, UTF8String, IPv4Addr, IPv6Addr 

    };

    import from LibDiameter_Types_Gx_AVPs {

        type RAT_Type
@@ -69,11 +69,15 @@ module DiameterS6a_PIXITS { 
         */

        modulepar Diameter_Identity PX_DESTINATION_REALM := "destination.realm.etsi.org";

        

        /**

         * @desc TODO

        /** @desc The MIP6_Agent in IPv4 format, 

         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/9

        */

        modulepar IPv4Addr PX_MIP6_AGENT_ipv4 := {1,2,3,4};

        

        /** @desc	The MIP6_Agent) in type IPv6 format, PIXIT item A-7/26

         * @see  ETSI DTS/INT-094-1 V0.0.3 (2013-11) A.7/9    

        */

        modulepar IpAddress PX_MIP6_AGENT_IP_ADDRESS := {ipv4 := {192, 168, 50, 1} };

        modulepar IPv6Addr PX_MIP6_AGENT_ipv6 := {1,2,3,4,5,6,7,8};

        

        /**

         * @desc TODO

DiameterS6a/ttcn/DiameterS6a_Steps.ttcn3

+2 −6
Original line number Diff line number Diff line
@@ -16,13 +16,10 @@ 


    // LibDiameter

    import from LibDiameter_TypesAndValues {

        type DIAMETER_MSG, PUR_MSG;

        type DIAMETER_MSG, PUER_MSG, ULR_MSG, CLA_MSG, AIR_MSG;

        const c_applIdS6a

    };

    import from LibDiameter_Types_S6a_AVPs {

        type 

            ULR_MSG, CLA_MSG, AIR_MSG 

    };

    import from LibDiameter_Types_S6a_AVPs all;

    import from LibDiameter_Steps {

        function 

            f_preambleDiameterBaseClient, f_preambleDiameterBaseServer
@@ -39,7 +36,6 @@ 
    }; 

    import from DiameterS6a_Templates all;



    import from LibDiameter_Types_S6a_AVPs all;



    group GlobalSteps {

DiameterS6a/ttcn/DiameterS6a_Templates.ttcn

+19 −21

File changed.

Preview size limit exceeded, changes collapsed.