Commit f4f61a85 authored by garciay's avatar garciay
Browse files

Align code with ETSI TS 102 985-2 v0.0.9 

Add comments
Renaming
parent a8b43864

ttcn/CALM/FNTP/LibItsFntp_Functions.ttcn3

+213 −214

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/CALM/FNTP/LibItsFntp_Pixits.ttcn3

+78 −71
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ module LibItsFntp_Pixits { 
    /**

     * @desc Service reference value used bu NF-FNTP-PORT.request SAP primitive

     */

    group defaultSettings {

    group generalSettings { 

        

        /**

         * @desc Defines a number uniquely identifying the endpoint at this host in an implementation specific way
@@ -70,63 +70,81 @@ module LibItsFntp_Pixits { 
        /**

         * @desc The ITS-SCU-ID of the host ITS-SCU

         */

        modulepar ITS_scuId PX_HOST_SCU_ID := 0;

        modulepar ITS_scuId PX_HOST_SCU_ID := 8;

        

        /**

         * @desc The ITS-SCU-ID of an unknown host ITS-SCU

         */

        modulepar ITS_scuId PX_UNKNOWN_HOST_SCU_ID := 255;

        modulepar ITS_scuId PX_UNKNOWN_HOST_SCU_ID := 65534;

        

    } // End of group defaultSettings

    } // End of group generalSettings

    

    /**

     * @desc 64 bits MAC addresses for local CIs/VCIs for ITS_S host

     * @desc 64 bits MAC addresses for local CIs/VCIs for ITS_S router (e.g.G5 CI/VCI)

     */

    group localMACCommunication {

    group routerWlanVcisMac {

        

        /**

         * @desc Identifies the CI on ITS-S host 

         * @desc Identifies the CI on ITS-S router 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         */

        modulepar EUI64 PX_SRC_LOCAL_CIID := '0000000000000000'O; 

        modulepar EUI64 PX_WL_LOCAL_CIID := '0000000000000000'O; 

        

        /**

         * @desc Identifies an unknown CI on ITS-S host 

         * @desc Identifies the VCI for broadcast on ITS-S router 

         */

        modulepar EUI64 PX_SRC_LOCAL_CIID_UNKNOWN := 'DEADBEEFDEADBABE'O;

        modulepar EUI64 PX_WL_REMOTE_CIID_BC := '0000000000000000'O;

        

        /**

         * @desc Identifies a different VCI on ITS-S host/router only 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         * @desc Identifies the VCI for multicast on ITS-S router 

         */

        modulepar EUI64 PX_SRC_DIFFERENT_LOCAL_CIID := '0000000000000001'O; 

        modulepar EUI64 PX_WL_REMOTE_CIID_MC := '0000000000000000'O;

        

        /**

         * @desc Identifies the VCI for broadcast on ITS-S host 

         * @desc Identifies the VCI for unicast on ITS-S router (peer station)

         */

        modulepar EUI64 PX_SRC_REMOTE_CIID_BC := '0000000000000000'O;

        modulepar EUI64 PX_WL_REMOTE_CIID_UC := '0000000000000000'O;

        

        /**

         * @desc Identifies the VCI for multicast on ITS-S host 

         * @desc Identifies an unknown CI on ITS-S router 

         */

        modulepar EUI64 PX_SRC_REMOTE_CIID_MC := '0000000000000000'O;

        modulepar EUI64 PX_WL_LOCAL_CIID_UNKNOWN := 'DEADBEEFDEADBABE'O;

        

    } // End of group routerWlanVcisMac

    

    /**

         * @desc Unicast (peer to peer)

     * @desc 64 bits MAC addresses for lan CIs/VCIs to connect to the ITS station-internal network 

     */

        modulepar EUI64 PX_SRC_REMOTE_CIID_UC := '0000000000000000'O;

    group routerLanVcisMac {

        

        /**

         * @desc Identifies a second VCI for unicast (peer to peer) on ITS-S host 

         * @desc Identifies the CI on ITS-S host 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         */

        modulepar EUI64 PX_LAN_LOCAL_CIID := '0000000000000000'O; 

        

        /**

         * @desc Identifies the VCI for broadcast on ITS-S host 

         */

        modulepar EUI64 PX_SRC_SECOND_REMOTE_CIID_UC := '0000000000000000'O;

        modulepar EUI64 PX_LAN_REMOTE_CIID_BC := '0000000000000000'O;

        

    } // End of group localMACCommunication

        /**

         * @desc Identifies the VCI for unicast on ITS-S host 

         */

        modulepar EUI64 PX_LAN_REMOTE_CIID_UC := '0000000000000000'O;

        

        /**

     * @desc 64 bits MAC addresses for remote/peer ITS-S station

         * @desc Identifies a different VCI on ITS-S router 

         * @see ISO 21218 - Clause 6.2 Link Identifier 

         */

    group remoteMACCommunication {

        modulepar EUI64 PX_LAN_DIFFERENT_LOCAL_CIID := '0000000000000001'O; 

        

    } // End of routerLanVcisMac

    

    /**

     * @desc 64 bits MAC addresses for the peer ITS-S station

     */

    group peerItsStationVcisMac {

        

        /**

         * @desc Identifies uniquely a specific CI in a specific "ITS-S Communication Unit"
@@ -149,14 +167,12 @@ module LibItsFntp_Pixits { 
         */

        modulepar EUI64 PX_DEST_REMOTE_CIID_UC := '0000000000000000'O;

        

    } // End of remoteMACCommunication

    

        /**

     * @desc 64 bits MAC addresses for router CIs

         * @desc Identifies a second VCI for unicast (peer to peer) on ITS-S host 

         */

    group routerMACCommunication {

        modulepar EUI64 PX_SECOND_REMOTE_CIID_BC := '0000000000000000'O;

        

    } // End of routerMACCommunication

    } // End of peerItsStationVcisMac

    

    /**

     * @desc Contains the Link Identifier parameters for broadcast, Multicast and unicast modes
@@ -168,65 +184,56 @@ module LibItsFntp_Pixits { 
     */

    group linkIDs {

        

        /**

         * @desc Identify the VCI to be used to transmit the packet, i.e. the peer station, for Broadcast

         */

        modulepar Link_ID PX_LINK_ID_BC := {

            remoteCIID := PX_SRC_REMOTE_CIID_BC,

            localCIID := PX_SRC_LOCAL_CIID

        }

        group cf01 { 

            

            /**

         * @desc Identify a second VCI to be used to transmit the packet, i.e. the peer station, for Broadcast

             * @desc Identify the VCI to be used to transmit the packet outside (e.g. G5), i.e. the peer station, for Broadcast

             */

        modulepar Link_ID PX_LINK_ID_BC_WITH_SECOND_SCU_ID := {

            remoteCIID := PX_SRC_REMOTE_CIID_BC,

            localCIID := PX_SRC_DIFFERENT_LOCAL_CIID

            modulepar Link_ID PX_WL_LINK_ID_BC := {

                remoteCIID := PX_WL_REMOTE_CIID_BC,

                localCIID := PX_WL_LOCAL_CIID

            }

            

        } // End of group cf01

        

        group cf02 { 

            

            /**

         * @desc Identify the VCI to be used to transmit the packet, i.e. the peer station, for Multicast

             * @desc Identify the VCI to be used to transmit the packet to the LAN, for Broadcast

             */

        modulepar Link_ID PX_LINK_ID_MC := {

            remoteCIID := PX_SRC_REMOTE_CIID_MC,

            localCIID := PX_SRC_LOCAL_CIID

            modulepar Link_ID PX_LAN_LINK_ID_BC := {

                remoteCIID := PX_LAN_REMOTE_CIID_BC,

                localCIID := PX_LAN_LOCAL_CIID

            }

            

        } // End of group cf02 

        

        /**

         * @desc Identify an unknown VCI to be used to transmit the packet, i.e. the peer station, for Broadcast

         */

        modulepar Link_ID PX_LINK_ID_UNKWNON_BC := {

            remoteCIID := PX_SRC_REMOTE_CIID_BC,

            localCIID := PX_SRC_LOCAL_CIID_UNKNOWN

            remoteCIID := PX_WL_REMOTE_CIID_BC,

            localCIID := PX_WL_LOCAL_CIID_UNKNOWN

        }

        

        /**

         * @desc Identify an unknown VCI to be used to transmit the packet, i.e. the peer station, for Unicast

         */

        modulepar Link_ID PX_LINK_ID_UNKWNON_UC := {

            remoteCIID := PX_SRC_REMOTE_CIID_UC,

            localCIID := PX_SRC_LOCAL_CIID_UNKNOWN

        modulepar Link_ID PX_WL_LINK_ID_UNKWNON_UC := {

            remoteCIID := PX_WL_REMOTE_CIID_BC,

            localCIID := PX_WL_LOCAL_CIID_UNKNOWN

        }

        

        /**

         * @desc Identify the VCI to be used to transmit the packet, i.e. the peer station, for Unicast

         */

        modulepar Link_ID PX_LINK_ID_UC := {

            remoteCIID := PX_SRC_REMOTE_CIID_UC,

            localCIID := PX_SRC_LOCAL_CIID

        modulepar Link_ID PX_WL_LINK_ID_UC := {

            remoteCIID := PX_WL_REMOTE_CIID_UC,

            localCIID := PX_WL_LOCAL_CIID

        }

        

    } // End of group linkIDs

    

    group stationIDs {

        

        /**

         * @desc Unknwon remote station ID

         */

        modulepar StationID PX_STATION_ID_UNKNOWN := '00AA00AA'O;

        

    } // End of group stationIDs

    

    /**

     * @desc    Source and destination Ports

     * @see     ISO/WD 29281-2 Clause 6.2.2.2

ttcn/CALM/FNTP/LibItsFntp_Templates.ttcn3

+64 −64

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/CALM/FNTP/LibItsFntp_TypesAndValues.ttcn3

+9 −9
Original line number Diff line number Diff line
@@ -112,13 +112,13 @@ module LibItsFntp_TypesAndValues { 
        /**

         * @desc    TA primitives for FNTP

         * @member acGenerateFntpNPDU       To generate a station-internal FNTP NDPU

         * @member acGenerateSamMessagePDU  To generate a SAM message

         * @member acGenerateSamMessagePdu  To generate a SAM message

         * @member acGenerateCtxMessagePDU  To generate a CTX message

         */

        type union AcFntpPrimitive { 

            AcGenerateFntpNPDU acGenerateFntpNPDU,

            AcGenerateSamMessagePDU acGenerateSamMessagePDU,

            AcGenerateCtxMessagePDU acGenerateCtxMessagePDU

            AcGenerateFntpNpdu acGenerateFntpNpdu,

            acGenerateSamMessagePdu acGenerateSamMessagePdu,

            AcGenerateCtxMessagePdu acGenerateCtxMessagePdu

        }

        

        /**
@@ -132,7 +132,7 @@ module LibItsFntp_TypesAndValues { 
         * @desc    Primitive for TA to generate a station-internal FNTP NDPU

         * @member  fntpNPDU Number of hops. This parameter shall be set to zero for single hop

         */

        type record AcGenerateFntpNPDU {

        type record AcGenerateFntpNpdu {

            INsapPrimitivesUp fntpNPDU

        }
@@ -140,16 +140,16 @@ module LibItsFntp_TypesAndValues { 
         * @desc    Generate a SAM message

         * @member  samPDU  The SAM pdu

         */

        type record AcGenerateSamMessagePDU {

            INsapPrimitivesUp samPDU

        type record acGenerateSamMessagePdu {

            INsapPrimitivesUp samPdu

        }

        

        /**

         * @desc    Generate a CTX message

         * @member  ctxPDU  The CTX pdu

         */

        type record AcGenerateCtxMessagePDU {

            INsapPrimitivesUp ctxPDU

        type record AcGenerateCtxMessagePdu {

            INsapPrimitivesUp ctxPdu

        }

        

    } // End of group acPrimitives

ttcn/CALM/FSAP/LibItsFsap_Functions.ttcn3

+11 −11
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ module LibItsFsap_Functions { 
            // Map

            map(self:acPort, system:acPort);

            map(self:utPort, system:utPort);

            map(self:mgtMFSapPort, system:mgtMFSapPort);

            map(self:mgtMfSapPort, system:mgtMfSapPort);

            

            // Connect

            f_connect4SelfOrClientSync();
@@ -100,7 +100,7 @@ module LibItsFsap_Functions { 
            // Map

            map(self:acPort, system:acPort);

            map(self:utPort, system:utPort);

            map(self:mgtMNSapPort, system:mgtMNSapPort);

            map(self:mgtMfSapPort, system:mgtMfSapPort);

            map(self:iicpPort, system:iicpPort);

            

            // Connect
@@ -127,7 +127,7 @@ module LibItsFsap_Functions { 
            // Unmap

            unmap(self:acPort, system:acPort);

            unmap(self:utPort, system:utPort);

            unmap(self:mgtMFSapPort, system:mgtMFSapPort);

            unmap(self:mgtMfSapPort, system:mgtMfSapPort);

            

            // Disconnect

            f_disconnect4SelfOrClientSync();
@@ -144,7 +144,7 @@ module LibItsFsap_Functions { 
            // Unmap

            unmap(self:acPort, system:acPort);

            unmap(self:utPort, system:utPort);

            unmap(self:mgtMFSapPort, system:mgtMFSapPort);

            unmap(self:mgtMfSapPort, system:mgtMfSapPort);

            unmap(self:iicpPort, system:iicpPort);

            

            // Disconnect
@@ -162,7 +162,7 @@ module LibItsFsap_Functions { 
            // Initialize variables

            

            // Set defaults

            activate(a_mgtMFSapPortDefault()); // Default for MGT module / MF-SAP port

            activate(a_mgtMfSapPortDefault()); // Default for MGT module / MF-SAP port

            activate(a_fsapDefault()); 

            if (p_componentName == "cf02Up") {

                activate(a_iicpDefault());
@@ -215,7 +215,7 @@ module LibItsFsap_Functions { 
        /**

         * @desc    Get the local identifier of the VCI for broadcast on ITS-S host

         * @return  The local identifier of the VCI for broadcast on ITS-S host

         * @see     PX_SRC_REMOTE_CIID_BC

         * @see     PX_WL_REMOTE_CIID_BC

         * @verdict Unchanged

         */

        function f_getIutSrcRemoteCIID() return EUI64 {
@@ -225,11 +225,11 @@ module LibItsFsap_Functions { 
        /**

         * @desc    Get the identifier of a VCI on ITS-S host/router only 

         * @return  The identifier of a different VCI on ITS-S host/router only 

         * @see     PX_SRC_LOCAL_CIID

         * @see     PX_WL_LOCAL_CIID

         * @verdict Unchanged

         */

        function f_getIutSrcLocalCIID() return EUI64 {

            return PX_SRC_LOCAL_CIID;

            return PX_WL_LOCAL_CIID;

        }

        

        /**
@@ -237,7 +237,7 @@ module LibItsFsap_Functions { 
         * @return  SAM retransmit timer 

         * @see     PICS_SAM_RETRANSMIT_TIMER

         */

        function f_getIutSAMRetransmitTimer() return float {

        function f_getIutSamRetransmitTimer() return float {

            return int2float(PICS_SAM_RETRANSMIT_TIMER) / 1000.0; 

        }
@@ -246,7 +246,7 @@ module LibItsFsap_Functions { 
         * @return  Maximum SAM jitter

         * @see     PICS_SAM_RETRANSMIT_TIMER

         */

        function f_getIutSAMMaxJitter() return float {

        function f_getIutSamMaxJitter() return float {

            return int2float(PICS_SAM_RETRANSMIT_TIMER) / 1000.0; 

        }
@@ -300,7 +300,7 @@ module LibItsFsap_Functions { 
         * @return  The scheduling information

         * @see     PX_GSCHED_ACCESS_TECH_NONIP

         */

        function f_getIutGCscheduleWithAccessTechAndNonIP() return GCschedule {

        function f_getIutGcScheduleWithAccessTechAndNonIP() return GCschedule {

            return { PX_GSCHED_ACCESS_TECH_NONIP };

        }