Commit f3e5279b authored by rennoch's avatar rennoch
Browse files

additional t3doc comments and some renamings of Dx-Pixits

parent 88404f4d
Loading
Loading
Loading
Loading
+104 −40
Original line number Diff line number Diff line
@@ -17,114 +17,114 @@ module DiameterCxDx_PIXITS
        
        group CxDx_Port_and_addresses{
            
            /** @desc    charstring, PIXIT item A-7/11
            /** @desc    charstring, PIXIT item
             * IP address of the test system
             */
            modulepar charstring PX_DIAMETER_CX_ETS_ICSCF_IPADDR := "1.1.1.10";

            /** @desc    charstring, PIXIT item A-7/12
            /** @desc    charstring, PIXIT item
             * IP address of the test system
             */
            modulepar charstring PX_DIAMETER_CX_ETS_SCSCF_IPADDR := "1.1.1.11";

            /** @desc    charstring, PIXIT item A-7/13
            /** @desc    charstring, PIXIT item
             * IP address of the test system
             */
            modulepar charstring PX_DIAMETER_CX_ETS_SCSCF2_IPADDR := "1.1.1.21";

            /** @desc    charstring, PIXIT item A-7/15
            /** @desc    charstring, PIXIT item
             * IP address of the test system
             */
            modulepar charstring PX_DIAMETER_CX_ETS_HSS_IPADDR := "1.1.1.15";

            /** @desc    charstring, PIXIT item A-7/16
            /** @desc    charstring, PIXIT item
             * IP address of the test system
             */
            modulepar charstring PX_DIAMETER_CX_ETS_SLF_IPADDR := "1.1.1.16";
            modulepar charstring PX_DIAMETER_DX_ETS_SLF_IPADDR := "1.1.1.16";
    
            /** @desc    charstring,  PIXIT item A-7/21
            /** @desc    charstring,  PIXIT item
             * IP address of the system under test
             */
            modulepar charstring PX_DIAMETER_CX_SUT_ICSCF_IPADDR := "1.1.1.50";
            
            /** @desc    charstring,  PIXIT item A-7/22
            /** @desc    charstring,  PIXIT item
             * IP address of the system under test
             */
            modulepar charstring PX_DIAMETER_CX_SUT_SCSCF_IPADDR := "1.1.1.51";

            /** @desc    charstring,  PIXIT item A-7/24
            /** @desc    charstring,  PIXIT item
             * IP address of the system under test
             */
            modulepar charstring PX_DIAMETER_CX_SUT_HSS_IPADDR := "1.1.1.51";
            
            /** @desc    charstring,  PIXIT item A-7/25
            /** @desc    charstring,  PIXIT item
             * IP address of the system under test
             */
            modulepar charstring PX_DIAMETER_CX_SUT_SLF_IPADDR := "1.1.1.51";
            modulepar charstring PX_DIAMETER_DX_SUT_SLF_IPADDR := "1.1.1.51";
    
            /** @desc    charstring, PIXIT item A-7/31
            /** @desc    charstring, PIXIT item
             * Port number of the test system
             */
            modulepar integer PX_DIAMETER_CX_ETS_ICSCF_PORT := 3868;
    
            /** @desc    charstring, PIXIT item A-7/32
            /** @desc    charstring, PIXIT item
             * Port number of the test system
             */
            modulepar integer PX_DIAMETER_CX_ETS_SCSCF_PORT := 3868;

            /** @desc    charstring, PIXIT item A-7/33
            /** @desc    charstring, PIXIT item
             * Port number of the test system
             */
            modulepar integer PX_DIAMETER_CX_ETS_SCSCF2_PORT := 3868;

            /** @desc    charstring, PIXIT item A-7/35
            /** @desc    charstring, PIXIT item
             * Port number of the test system
             */
            modulepar integer PX_DIAMETER_CX_ETS_HSS_PORT := 3868;

            /** @desc    charstring, PIXIT item A-7/36
            /** @desc    charstring, PIXIT item
             * Port number of the test system
             */
            modulepar integer PX_DIAMETER_CX_ETS_SLF_PORT := 3868;
            modulepar integer PX_DIAMETER_DX_ETS_SLF_PORT := 3868;
    
            /** @desc    charstring, PIXIT item A-7/41
            /** @desc    charstring, PIXIT item
             * Port number of the system under test
             */
            modulepar integer PX_DIAMETER_CX_SUT_ICSCF_PORT := 3868;
    
            /** @desc    charstring, PIXIT item A-7/42
            /** @desc    charstring, PIXIT item
             * Port number of the system under test
             */
            modulepar integer PX_DIAMETER_CX_SUT_SCSCF_PORT := 3868;

            /** @desc    charstring, PIXIT item A-7/44
            /** @desc    charstring, PIXIT item
             * Port number of the system under test
             */
            modulepar integer PX_DIAMETER_CX_SUT_HSS_PORT := 3868;
    
            /** @desc    charstring, PIXIT item A-7/45
            /** @desc    charstring, PIXIT item
             * Port number of the system under test
             */
            modulepar integer PX_DIAMETER_CX_SUT_SLF_PORT := 3868;
            modulepar integer PX_DIAMETER_DX_SUT_SLF_PORT := 3868;
        }
        group Gm_Port_and_addresses{

            /** @desc    charstring, PIXIT item A-7/14
            /** @desc    charstring, PIXIT item
             * IP address of the test system
             */
            modulepar charstring PX_DIAMETER_GM_ETS_UE_IPADDR := "1.1.1.100";

            /** @desc    charstring,  PIXIT item A-7/23
            /** @desc    charstring,  PIXIT item
             * IP address of the system under test
             */
            modulepar charstring PX_DIAMETER_GM_SUT_PCSCF_IPADDR := "1.1.1.52";

            /** @desc    charstring, PIXIT item A-7/34
            /** @desc    charstring, PIXIT item
             * Port number of the test system
             */
            modulepar integer PX_DIAMETER_GM_ETS_UE_PORT := 3868;

            /** @desc    charstring, PIXIT item A-7/43
            /** @desc    charstring, PIXIT item
             * Port number of the system under test
             */
            modulepar integer PX_DIAMETER_GM_SUT_PCSCF_PORT := 3868;
@@ -136,7 +136,7 @@ module DiameterCxDx_PIXITS
    group DiameterCommonCxData{

       /** 
        * @desc    UTF8String, PIXIT item A-7/5
        * @desc    UTF8String, PIXIT item
        * The Session-Id AVP (AVP Code 263) is of type UTF8String and is used
        * to identify a specific session (see Section 8);  All messages
        * pertaining to a specific session MUST include only one Session-Id AVP
@@ -148,7 +148,7 @@ module DiameterCxDx_PIXITS
        modulepar UTF8String PX_SessionID := "hss.etsi.org;1317059245;52;21823490";
        
        /** 
         * @desc    charstring, PIXIT item A-7/6
         * @desc    charstring, PIXIT item
         * The Origin-Host AVP (AVP Code 264) is of type DiameterIdentity, and
         * MUST be present in all Diameter messages;  This AVP identifies the
         * endpoint that originated the Diameter message;  Relay agents MUST NOT
@@ -164,7 +164,7 @@ module DiameterCxDx_PIXITS
        modulepar charstring PX_OriginHost := "origin.etsi.org";
        
        /** 
         * @desc    charstring, PIXIT item A-7/7
         * @desc    charstring, PIXIT item
         * The Origin-Realm AVP (AVP Code 296) is of type DiameterIdentity;
         * This AVP contains the Realm of the originator of any Diameter message
         * and MUST be present in all messages;
@@ -173,7 +173,7 @@ module DiameterCxDx_PIXITS
        modulepar charstring PX_OriginRealm := "etsi.org";
        
        /** 
         * @desc    charstring, PIXIT item A-7/8 
         * @desc    charstring, PIXIT item 
         * The Destination-Host AVP (AVP Code 293) is of type DiameterIdentity;
         * This AVP MUST be present in all unsolicited agent initiated messages,
         * MAY be present in request messages, and MUST NOT be present in Answer
@@ -186,7 +186,7 @@ module DiameterCxDx_PIXITS
        modulepar charstring PX_DestinationHost := "destination.etsi.org";
        
        /**
         * @desc    charstring, PIXIT item A-7/9 
         * @desc    charstring, PIXIT item
         *          The Destination-Realm AVP (AVP Code 283) is of type DiameterIdentity,
         *          and contains the realm the message is to be routed to;  The
         *          Destination-Realm AVP MUST NOT be present in Answer messages.
@@ -200,7 +200,7 @@ module DiameterCxDx_PIXITS
        modulepar charstring PX_DestinationRealm := "myalupcrf.etsi.org";
        
        /**
         * @desc   UTF8String, PIXIT item A-7/10 
         * @desc   UTF8String, PIXIT item 
         *         The User-Name AVP (AVP Code 1) [RADIUS] is of type UTF8String, which
         *         contains the User-Name, in a format consistent with the NAI
         *         specification [NAI].
@@ -209,7 +209,7 @@ module DiameterCxDx_PIXITS
        modulepar UTF8String PX_UserName := "private_username@etsi.org";
        
        /**
         * @desc   UTF8String, PIXIT item A-7/10 
         * @desc   UTF8String, PIXIT item 
         *         The User-Name AVP (AVP Code 1) [RADIUS] is of type UTF8String, which
         *         contains the User-Name, in a format consistent with the NAI
         *         specification [NAI].
@@ -217,9 +217,17 @@ module DiameterCxDx_PIXITS
         */
        modulepar UTF8String PX_OtherUserName := "other_private_username@etsi.org";
        
		/**
		 * @desc UTF8String, unknown value for
		 *         the User-Name AVP (AVP Code 1) [RADIUS] of type UTF8String, which
         *         contains the User-Name, in a format consistent with the NAI
         *         specification [NAI].

		 * 
		 */
        modulepar UTF8String PX_UnknownUserName := "unknown_username@etsi.org";
        
        /** @desc   UTF8String, PIXIT item A-7/11 
        /** @desc   UTF8String, PIXIT item 
         *          The Public-Identity AVP is of type UTF8String. 
         *          This AVP contains the public identity of a user in the IMS. The syntax
         *          of this AVP corresponds either to a SIP URL (with the format defined in 
@@ -231,22 +239,52 @@ module DiameterCxDx_PIXITS
         */
        modulepar charstring PX_PublicIdentity := "public_identity@etsi.org";
        
        /** @desc   UTF8String, 
         *          the Public-Identity value shall be different to PX_PublicIdentity.
         * @see 3GPP TS 29.229 6.3.2 Public-Identity AVP
         */
        modulepar UTF8String PX_OtherPublicIdentity := "other_public_identity@etsi.org";
        
        /** @desc   UTF8String, 
         *          the Public-Identity value shall be barred.
         * @see 3GPP TS 29.229 6.3.2 Public-Identity AVP
         */
        modulepar UTF8String PX_PublicIdentityBarred := "barred_public_identity@etsi.org";
        
        /** @desc   UTF8String, 
         *          the Public-Identity value shall be unkown.
         * @see 3GPP TS 29.229 6.3.2 Public-Identity AVP
         */

        modulepar UTF8String PX_UnknownPublicIdentity := "unknown_public_identity@etsi.org";
        
        /** @desc   UTF8String, 
         *          the Public-Identity value shall be inactive.
         * @see 3GPP TS 29.229 6.3.2 Public-Identity AVP
         */
        modulepar UTF8String PX_InactivePublicIdentity := "inactive_public_identity@etsi.org";
        
        /** @desc   UTF8String, 
         *          the Public-Identity value shall not allowed to roam in the visited network.
         * @see 3GPP TS 29.229 6.3.2 Public-Identity AVP
         */
        modulepar UTF8String PX_NoRoamPublicIdentity := "noroam_public_identity@etsi.org";
        
        /** @desc   UTF8String, 
         *          the service-Identity value.
         * @see 3GPP TS 29.229 6.3.2 Public-Identity AVP
         */

        modulepar UTF8String PX_ServiceIdentity := "service_identity@etsi.org";
        
        /** @desc   UTF8String, 
         *          the application server URL.
         * @see 3GPP TS 29.229 6.3.2 Public-Identity AVP
         */

        modulepar UTF8String PX_ApplicationServer := "sip://as.etsi.org";
        
        /** 
         * @desc   UTF8String, PIXIT item A-7/12 
         * @desc   UTF8String, 
         *  The Server-Name AVP is of type UTF8String.
         *  This AVP contains a SIP-URL (as defined in IETF RFC 3261 [3] and
         *  IETF RFC 2396 [4]), used to identify a SIP server (e.g. S-CSCF name).
@@ -254,6 +292,13 @@ module DiameterCxDx_PIXITS
         */
        modulepar UTF8String PX_ServerName := "sip://scscf.etsi.org";
        
        /** 
         * @desc   UTF8String, 
         *  The Server-Name AVP is of type UTF8String.
         *  This AVP contains a SIP-URL (as defined in IETF RFC 3261 [3] and
         *  IETF RFC 2396 [4]), used to identify a SIP server (e.g. S-CSCF name).
         *  @see 3GPP TS 129.229 6.3.3 Server-Name AVP
         */
        modulepar UTF8String PX_OtherServerName := "sip://other_scscf.etsi.org";
        
        /** 
@@ -261,10 +306,12 @@ module DiameterCxDx_PIXITS
         * The Visited-Network-Identifier AVP is of type OctetString. 
         * This AVP contains an identifier that helps the home
         * network to identify the visited network (e.g. the visited network domain name).
         * @see 3GPP TS 29.229 6.3.1 Visited-Network-Identifier AVP
        */
        modulepar octetstring PX_VisitedNetworkId := '0102030405060708'O;

        /** @desc   DiameterURI, 
         *          the Diameter URI MUST follow the Uniform Resource Identifiers (URI).
         */
        modulepar DiameterURI PX_DiameterUri := {
            scheme          := "aaa",
            diameterId_FQDN := "FQDN",
@@ -273,22 +320,39 @@ module DiameterCxDx_PIXITS
            protocol        := "diameter"
        };
        
        /** @desc   Integer SIP-Item-Number AVP 
         * @see RFC4740 9.5.2 SIP-Item-Number AVP
         */
        modulepar UInt32 PIXIT_SIP_ITEM_NUMBER := 0;
        
        /** @desc   charstring Digest-Username Attribute 
         * @see RFC4590 3.13.  Digest-Username Attribute
         */
        modulepar charstring PIXIT_DIGEST_USERNAME := "";
        
        /** @desc   charstring Digest-Realm Attribute            
         *  @see Ref: Ref:RFC4590 3.2.  Digest-Realm Attribute
         */
        modulepar charstring PIXIT_DIGEST_REALM := "";
        
        /** @desc   charstring Digest-Nonce Attribute            
         *  @see Ref:Ref:RFC4590 3.3.  Digest-Nonce Attribute
         */
        modulepar charstring PIXIT_DIGEST_NONCE := "";
        
        /** @desc   charstring Digest_Response_AVP            
         *  @see Ref:Ref:RFC4590
         */
        modulepar charstring PIXIT_DIGEST_RESPONSE := "";
        
        /** @desc   charstring Digest-URI Attribute            
         *  @see Ref:Ref:RFC4590 3.7.  Digest-URI Attribute
         */
        modulepar UTF8String PIXIT_URI := "";
        
    } //end group DiameterCommonCxData
    
    /** @desc    boolean indicator
     * TRUE if the Gm interface(SIP protocol) is accessible to trigger Diameter events at the Cx/Dx interface
    /** 
     * @desc    boolean indicator that is true if the Gm interface (SIP protocol) is accessible to trigger Diameter events at the Cx/Dx interface
    */
    modulepar boolean PX_SIPsupport := false;
    
+5 −5
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@

            vc_ETS_address := PX_DIAMETER_CX_ETS_ICSCF_IPADDR;
            vc_ETS_port    := PX_DIAMETER_CX_ETS_ICSCF_PORT;
            vc_SUT_address := PX_DIAMETER_CX_SUT_SLF_IPADDR;
            vc_SUT_port    := PX_DIAMETER_CX_SUT_SLF_PORT;
            vc_SUT_address := PX_DIAMETER_DX_SUT_SLF_IPADDR;
            vc_SUT_port    := PX_DIAMETER_DX_SUT_SLF_PORT;

            vc_sessionId := m_sessionId(PX_SessionID);

@@ -178,8 +178,8 @@
            //Base LibDiameter init function if there will be any base initialisation
            f_Diameter_Init_Component();

            vc_ETS_address := PX_DIAMETER_CX_ETS_SLF_IPADDR;
            vc_ETS_port    := PX_DIAMETER_CX_ETS_SLF_PORT;
            vc_ETS_address := PX_DIAMETER_DX_ETS_SLF_IPADDR;
            vc_ETS_port    := PX_DIAMETER_DX_ETS_SLF_PORT;
            vc_SUT_address := PX_DIAMETER_CX_SUT_ICSCF_IPADDR;
            vc_SUT_port    := PX_DIAMETER_CX_SUT_ICSCF_PORT;
            //vc_SUT_address1 := PX_DIAMETER_DX_SUT_SCSCF_IPADDR;
@@ -197,7 +197,7 @@
            vc_destinationHost := m_destinationHost(PX_DestinationHost);
            vc_destinationRealm := m_destinationRealm(PX_DestinationRealm);

            vc_hostIPAddress := valueof(f_IPV4or6_String2Address (PX_DIAMETER_CX_ETS_SLF_IPADDR));
            vc_hostIPAddress := valueof(f_IPV4or6_String2Address (PX_DIAMETER_DX_ETS_SLF_IPADDR));

            vc_send_hopid:=hex2int('00000100'H);
            vc_send_endid:=hex2int('01000000'H);