Commit 5743485a authored by garciay's avatar garciay
Browse files

Update Fntp/Fsap ATS

parent 18f879fa
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -569,9 +569,11 @@ module LibItsFntp_Functions {
         * @see ISO/CD 21218 - Clause 8.2.2
         */
        function f_oct2npdu(in octetstring p_data, in charstring p_syncPoint, out FNTPNPDU p_decoded) runs on ItsCalm {
            var bitstring v_data;
            var integer v_result;
            
            v_result := decvalue(oct2bit(p_data), p_decoded);
			v_data := oct2bit(p_data);
            v_result := decvalue(v_data, p_decoded);
            if (v_result == 1) {
                f_selfOrClientSyncAndVerdictTestBody(p_syncPoint, e_error); 
                log("*** f_oct2npdu: FAIL: 'decvalue' operation failed ***");
+19 −1
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ module LibItsFntp_TypesAndValues {
        type union UtFntpCommandRequest { 
            NFsapPrimitivesDown nfSapPrimitives
        }
        with {
            encode (nfSapPrimitives) "LibItsFntp_asn1"
        }
        
        /**
         * @desc Receive a XXX.confirm primitive from the IUT through a SAP.
@@ -97,6 +100,9 @@ module LibItsFntp_TypesAndValues {
        type union UtFntpCommandConfirm { 
            NFsapPrimitivesUp nfSapPrimitives
        }
        with {
            encode (nfSapPrimitives) "LibItsFntp_asn1"
        }
        
        /**
         * @desc Receive a XXX.indication command from the IUT through a SAP.
@@ -104,6 +110,9 @@ module LibItsFntp_TypesAndValues {
        type union UtFntpCommandIndication { 
            NFsapPrimitivesUp nfSapPrimitives
        }
        with {
            encode (nfSapPrimitives) "LibItsFntp_asn1"
        }
        
    } // End of group utPrimitives

@@ -135,6 +144,9 @@ module LibItsFntp_TypesAndValues {
        type record AcGenerateFntpNpdu {
            INsapPrimitivesUp fntpNPDU
        }
        with {
            encode (fntpNPDU) "LibItsFntp_asn1"
        }
        
        /**
         * @desc    Generate a SAM message
@@ -143,6 +155,9 @@ module LibItsFntp_TypesAndValues {
        type record AcGenerateSamMessagePdu {
            INsapPrimitivesUp samPdu
        }
        with {
            encode (samPdu) "LibItsFntp_asn1"
        }
       
        /**
         * @desc    Generate a CTX message
@@ -151,6 +166,9 @@ module LibItsFntp_TypesAndValues {
        type record AcGenerateCtxMessagePdu {
            INsapPrimitivesUp ctxPdu
        }
        with {
            encode (ctxPdu) "LibItsFntp_asn1"
        }
        
    } // End of group acPrimitives

+6 −0
Original line number Diff line number Diff line
@@ -193,6 +193,9 @@ module LibItsCalm_Interface {
                type record IicpResp {
                    IIC_Response msgInOut
                }
		        with { // FIXME Check encode name
		            encode (msgInOut) "LibItsFntp_asn1"
		        }
                
                /**
                 * @desc MGT1 IISC Request Primitive 
@@ -200,6 +203,9 @@ module LibItsCalm_Interface {
                type record IicpReq {
                    IIC_Request msgInOut
                }
		        with { // FIXME Check encode name
		            encode (msgInOut) "LibItsFntp_asn1"
		        }
                
            } // End of group mgt1Primitives
            
+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ module LibItsCam_Templates {
             * @desc Set the PT line description
             * @param p_ptLineDescription The PT line description to set
             */
            template (value) UtEvent m_setPtLineDescription(PTLineDescription p_ptLineDescription) := {
            template (value) UtEvent m_setPtLineDescription(in template (value) PTLineDescription p_ptLineDescription) := {
                utCamEvent := {
                    setPtLineDescription := p_ptLineDescription
                }
@@ -221,7 +221,7 @@ module LibItsCam_Templates {
             * @desc Checks the receive of a message at LDM
             * @param p_message The CAM message to check
             */
            template (value) UtEvent m_checkLdm(CamPdu p_message) := {
            template (value) UtEvent m_checkLdm(in template (value) CamPdu p_message) := {
                utCamEvent := {
                    checkLdm := p_message
                }