Commit 40126845 authored by garciay's avatar garciay
Browse files

Test session with Commsignia in Budapest

parent d9f21476
Loading
Loading
Loading
Loading
+63 −14
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ module LibItsFntp_Functions {
        type 
            EUI64, IN_SAPaddress, LLserviceAddr, Link_ID, AccessParameters 
    }; 
    import from CALMmsap language "ASN.1:1997" { 
        type 
            FWTsetNot 
    }; 
    import from CITSapplReq language "ASN.1:1997" { 
        type ServiceRef 
    };
@@ -87,9 +91,8 @@ module LibItsFntp_Functions {
            }
            
            // Map
//            map(self:acPort, system:acPort);
            map(self:utPort, system:utPort);
            map(self:cfPort, system:cfPort);
            map(self:cfPort, system:cfPort); // FIXME Add check PICS_ITS_MGT_NOT
            map(self:fntpPort, system:fntpPort);
            
            vc_commandRef := 0;
@@ -128,7 +131,7 @@ module LibItsFntp_Functions {
            // Map
//            map(self:acPort, system:acPort);
            map(self:utPort, system:utPort);
            map(self:cfPort, system:cfPort);
            map(self:cfPort, system:cfPort); // FIXME Add check PICS_ITS_MGT_NOT
            map(self:fntpPort, system:fntpPort);
            
            // Connect
@@ -153,9 +156,8 @@ module LibItsFntp_Functions {
            deactivate;
            
            // Unmap
//            unmap(self:acPort, system:acPort);
            unmap(self:utPort, system:utPort);
            unmap(self:cfPort, system:cfPort);
            unmap(self:cfPort, system:cfPort); // FIXME Add check PICS_ITS_MGT_NOT
            unmap(self:fntpPort, system:fntpPort);
            
            // Disconnect
@@ -171,9 +173,8 @@ module LibItsFntp_Functions {
            deactivate;
            
            // Unmap
//            unmap(self:acPort, system:acPort);
            unmap(self:utPort, system:utPort);
            unmap(self:cfPort, system:cfPort);
            unmap(self:cfPort, system:cfPort); // FIXME Add check PICS_ITS_MGT_NOT
            unmap(self:fntpPort, system:fntpPort);
            
            // Disconnect
@@ -204,7 +205,11 @@ module LibItsFntp_Functions {
         */
        function f_initialState() runs on ItsCalm {
            
            f_utInitializeIut(m_utFntpInitialize);
            if (PICS_ITS_MGT_NOT == true) {
                f_utInitializeIut(m_utFntpInitialize_with_management);
            } else { 
                f_utInitializeIut(m_utFntpInitialize_without_management);
            } 
            f_cfInitialize(m_cfFntpInitialize);
            f_sleepIgnoreDef(PX_WAIT_FOR_IUT_READY); // Wait until the IUT is in a stable situation (beaconing...)
            cfPort.clear; // Because TestConfigIICP should trigger management port deletion message 
@@ -250,7 +255,7 @@ module LibItsFntp_Functions {
                log("*** f_initializeFntpForwardingTable: INFO: portNumber value is: " & int2str(vc_portNumber.portLong) & " ***");
            }
            if (PICS_ITS_MGT_NOT) {
                // And wait for a MN-SAP.MN-COMMAND/FWTupdate message sent by ITS management entity to update the forwarding table
                // And wait for a MN-SAP.MN-REQUEST/FWTupdate message sent to ITS management entity to update the forwarding table
                f_fntpAwaitFwtUpdate_reference(
                    vc_portNumber, 
                    vc_reference 
@@ -284,6 +289,50 @@ module LibItsFntp_Functions {
            ); 
        } // End of function f_fntpAwaitFwtUpdate_reference()
        
        /**
         * @desc Wait for notification from IUT to Management layer
         * @param   p_event     Receive template of the expected event
         * @param   p_result    Return the value of the received event if template matchs
         */
        function f_cfAwaitCreationPortNotificationToManagement( 
            in template CfEventInd p_cfEventInd, 
            in boolean p_discard, 
            out integer p_reference  
        ) runs on ItsCalm {
            var CfEventInd p_result;
            
            p_reference := 65535; // See noFNTPfwtEntries FIXME Create a constant
            
            log("*** f_cfAwaitCreationPortNotificationToManagement: INFO: Expected event: ", p_cfEventInd, " ***");
            tc_wait.start;
            alt {
                [] cfPort.receive(p_cfEventInd) -> value p_result {
                    tc_wait.stop;
                    p_reference := p_result.cfFntpEventInd.mnRequestRequest.request_param.FWTsetNot.fwt.SetNotFNTP.reference;
                    log("*** f_cfAwaitCreationPortNotificationToManagement: INFO: Notification event received, reference entry=", p_reference, " ***");
                }
                [] cfPort.receive(CfEventInd : { cfFntpEventInd := ? } ) -> value p_result { 
                    if (p_discard == false) { 
                        tc_wait.stop;
                        log("*** f_cfAwaitCreationPortNotificationToManagement: ERROR: Another event indicated at application layer ***", p_result);
                        f_selfOrClientSyncAndVerdict("error", e_timeout);
                    } else { 
                        log("*** f_cfAwaitCreationPortNotificationToManagement: INFO: Another event indicated at application layer, repeating check ***");
                        repeat;
                    } 
                }
                [] tc_wait.timeout {
                    if (p_discard == false) { 
                        log("*** f_cfAwaitCreationPortNotificationToManagement: ERROR: Timeout while waiting for event check result ***");
                        f_selfOrClientSyncAndVerdict("error", e_timeout);
                    } else { 
                        log("*** f_cfAwaitCreationPortNotificationToManagement: INFO: Event not indicated at application layer ***");
                    }
                }
            } // End of 'alt' statement
        
        } // End of function f_cfAwaitCreationPortNotificationToManagement
    
        function f_fntpAwaitFwtUpdate( 
            in template (present) PortNumber p_portNumber, 
            in template (value) Link_ID p_linkId,  
@@ -449,7 +498,7 @@ module LibItsFntp_Functions {
            );
            
            if (PICS_ITS_MGT_NOT) {
                // And wait for a MN-SAP.MN-COMMAND/FWTupdate message sent by ITS management entity to update the forwarding table
                // And wait for a MN-SAP.MN-REQUEST/FWTupdate message sent to ITS management entity to update the forwarding table
                f_fntpAwaitFwtDelete(
                    vc_reference 
                );
@@ -460,14 +509,14 @@ module LibItsFntp_Functions {
         * @desc Trigger a basic FNTPNPDU to create an entry in forwarding table for a known peer station 
         */
        function f_setupKnownPeerStation() runs on ItsCalm { 
            f_sendBasicFntpNpdu( // FIXME Use fntpPort instead of acPort
            f_sendBasicFntpNpdu( 
                f_getIutRemotePortNumberValue(), 
                vc_portNumber,  
                m_llServiceAddr(mw_linkId(f_getIutRemoteDestCiidUc(), f_getIutWlLocalCiid())), 
                m_llServiceAddr(mw_linkId(f_getIutWlLocalCiid(), f_getIutWlLocalCiid())) 
            );
            if (PICS_ITS_MGT_NOT) {
                // And wait for a MN-SAP.MN-COMMAND/FWTupdate message sent by ITS management entity to update the forwarding table
                // And wait for a MN-SAP.MN-REQUEST/FWTupdate message sent to ITS management entity to update the forwarding table
                f_fntpAwaitFwtUpdate( 
                    vc_portNumber, 
                    mw_linkId(f_getIutRemoteDestCiidUc(), f_getIutWlLocalCiid()), 
@@ -844,7 +893,7 @@ module LibItsFntp_Functions {
                log("*** f_oct2npdu: FAIL: 'decvalue' operation failed, not enougth bits ***");
                f_selfOrClientSyncAndVerdictTestBody(p_syncPoint, e_error); 
            }
            log("*** f_oct2npdu: INFO: Decoded message done ***");
//            log("*** f_oct2npdu: INFO: Decoded message done ***");
        } // End of function f_oct2npdu
        
    } // End of group internalFunctions
+13 −8
Original line number Diff line number Diff line
@@ -87,15 +87,17 @@ module LibItsFntp_Pixits {
         * @desc Identifies the VCI localCIID on ITS-S router (e.g. It coud be the G5 radio MAC address of the IUT)
         * @see ISO 21218 - Clause 6.2 Link Identifier 
         */
        modulepar EUI64 PX_WL_LOCAL_CIID :=     '0A0B0CFFFE0D0E0F'O; // Commsignia setting
//        modulepar EUI64 PX_WL_LOCAL_CIID :=     'A22D8CFFFF198063'O; // Peek setting
//        modulepar EUI64 PX_WL_LOCAL_CIID :=     '0A0B0CFFFE0D0E0F'O; Commsignia FNTP setting
        modulepar EUI64 PX_WL_LOCAL_CIID :=     'FFFFFFFFFEFFFFFF'O ; // Commsignia FSAP setting
//        modulepar EUI64 PX_WL_LOCAL_CIID :=     'D4CA6DFFFF55A72C'O ; Commsignia FNTP setting
//        modulepar EUI64 PX_WL_LOCAL_CIID :=     'A22D8CFFFF198063'O; Peek setting
        
        /**
         * @desc Identifies the VCI remoteCIID on ITS-S router (e.g. It coud be the G5 radio MAC address of the IUT)
         * @see ISO 21218 - Clause 6.2 Link Identifier 
         */
        modulepar EUI64 PX_WL_REMOTE_CIID :=     '0A0B0CFFFE0D0E0F'O; // Commsignia setting
//		modulepar EUI64 PX_WL_REMOTE_CIID :=    'D4CA6DFFFF55A72C'O; // Peek setting
//        modulepar EUI64 PX_WL_REMOTE_CIID :=     '0A0B0CFFFE0D0E0F'O; // Commsignia setting
		modulepar EUI64 PX_WL_REMOTE_CIID :=    'D4CA6DFFFF55A72C'O; // Peek setting
		
        /**
         * @desc Identifies the VCI for broadcast on ITS-S router 
@@ -111,7 +113,8 @@ module LibItsFntp_Pixits {
        /**
         * @desc Identifies the VCI for unicast on ITS-S router (peer station)
         */
        modulepar EUI64 PX_WL_REMOTE_CIID_UC := '030008FFFE010001'O;
//        modulepar EUI64 PX_WL_REMOTE_CIID_UC := '030008FFFE010001'O; // Commsignia setting
        modulepar EUI64 PX_WL_REMOTE_CIID_UC := '030008FFFF010001'O; // Peek setting
        
        /**
         * @desc Identifies an unknown CI on ITS-S router 
@@ -173,7 +176,8 @@ module LibItsFntp_Pixits {
        /**
         * @desc Identifies uniquely a specific CI in a specific ITS-SCU for broadcast
         */
        modulepar EUI64 PX_DEST_REMOTE_CIID_BC :=      'FFFFFFFFFEFFFFFF'O/*'FFFFFFFFFFFFFFFF'O*/;
        modulepar EUI64 PX_DEST_REMOTE_CIID_BC :=      'FFFFFFFFFEFFFFFF'O; // Standard value
//        modulepar EUI64 PX_DEST_REMOTE_CIID_BC :=      'FFFFFFFFFFFFFFFF'O; // For Peek
        
        /**
         * @desc Identifies uniquely a specific CI in a specific ITS-SCU for multicast
@@ -183,7 +187,8 @@ module LibItsFntp_Pixits {
        /**
         * @desc Identifies uniquely a specific VCI in a specific ITS-SCU for unicast (peer to peer)
         */
        modulepar EUI64 PX_DEST_REMOTE_CIID_UC :=      '030009FFFE010001'O;
        modulepar EUI64 PX_DEST_REMOTE_CIID_UC :=      '030009FFFE010001'O; // Commsignia
//        modulepar EUI64 PX_DEST_REMOTE_CIID_UC :=      'D4CA6DFFFF55A72C'O; // Peek 
        
        /**
         * @desc Identifies a second VCI for unicast (peer to peer) on ITS-SCU 
+27 −61
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ module LibItsFntp_Templates {
    import from CALMfntp language "ASN.1:1997" all; 
    import from LibItsCalm_Pixits { 
        modulepar 
            PX_LOC_ITS_FNTP_ACCESS_SETTINGS, 
            PX_LOC_ITS_FNTP_ACCESS_SETTINGS_MX_SAP_SET, PX_LOC_ITS_FNTP_ACCESS_SETTINGS_MX_SAP_UNSET, 
            PX_IUT_LOWER_LAYER_USED, PX_IUT_LOWER_LAYER_UNUSED, 
            PX_IUT_TEST_MODE_ON 
    }; 
@@ -756,60 +756,6 @@ module LibItsFntp_Templates {
                }  // End of field 'servPrimitive'
            } // End of template m_generateFntpNpduCip
            
            /**
             * @desc   Generate a SAM notification message through IN-SAP
             * @param p_insap_source_address   Source linkId
             * @param p_insap_dest_address     Destination linkId
             * @param p_sam             The SAM message in octetstring format
             * @see   ISO/CD 21218 - Clause 8.3.3
             * @see   ISO 29281 - Clause 7.9.3
             */
            template (value) INsapPrimitivesUp m_generateSamMessagePdu(
                in template (value) LLserviceAddr p_insapSourceAddress, 
                in template (value) LLserviceAddr p_insapDestAddress, 
                in template (value) INdata p_sam 
            ) := {
                servPrimitive := { 
                    IN_UNITDATA_indication := {  
                        source_addr := p_insapSourceAddress, 
                        dest_addr := p_insapDestAddress, 
                        data := p_sam, 
                        priority := PX_USER_PRIORITY, 
                        accessParams := { 
                            apRef := ?, 
                            aParameter := ?
                        } 
                    } // End of field 'inUnitdataInd'
                } // End of field 'servPrimitive'
            } // End of template m_generateSamMessagePdu
            
            /**
             * @desc   Generate a CTX reception message through IN-SAP
             * @param p_insap_source_address   Source linkId
             * @param p_insap_dest_address     Destination linkId
             * @param p_ctx             The SAM message in octetstring format
             * @see   ISO/CD 21218 - Clause 8.3.3
             * @see   ISO 29281 - Clause 7.9.4
             */
            template (value) INsapPrimitivesUp m_generateCtxMessagePdu(
                in template (value) LLserviceAddr p_insapSourceAddress, 
                in template (value) LLserviceAddr p_insapDestAddress, 
                in template (value) INdata p_ctx 
            ) := {
                servPrimitive := { 
                    IN_UNITDATA_indication := {  
                        source_addr := p_insapSourceAddress, 
                        dest_addr := p_insapDestAddress, 
                        data := p_ctx, 
                        priority := PX_USER_PRIORITY, 
                        accessParams := { 
                            apRef := 0, 
                            aParameter := ?
                        }
                    } // End of field 'inUnitdataInd'
                } // End of field 'servPrimitive'
            } // End of template m_generateCtxMessagePdu
            
        } // End of group taPrimitives 
		
        /**
@@ -832,22 +778,42 @@ module LibItsFntp_Templates {
            } // End of template mw_utFntpEventInd 
            
            /**
             * @desc Initializes the FNTP IUT
             * @desc Initializes the FNTP IUT including support notification to the Management entity
			 * See Test System Configuration Access to SUT
             */
            template (value) UtInitialize m_utFntpInitialize_with_management := { 
                utFntpInitialize := { 
                    mcmdRq := { 
                        mCmdRef := 255, 
                        mcmd := { 
                            TestConfigIICP := { 
                                location := PX_LOC_ITS_FNTP_ACCESS_SETTINGS_MX_SAP_UNSET, 
                                lowerLayers := PX_IUT_LOWER_LAYER_UNUSED, // PX_IUT_LOWER_LAYER_USED
                                testMode := PX_IUT_TEST_MODE_ON 
                            } 
                        } // End of field 'mcmd' 
                    } // End of field 'mcmdRq'
                } // End of field 'utFntpInitialize' 
            } // End of template m_utFntpInitialize_with_management 
            
            /**
             * @desc Initializes the FNTP IUT without support notification to the Management entity
			 * See Test System Configuration Access to SUT
             */
            template (value) UtInitialize m_utFntpInitialize := { 
            template (value) UtInitialize m_utFntpInitialize_without_management := { 
                utFntpInitialize := { 
                    mcmdRq := { 
                        mCmdRef := 255, 
                        mcmd := { 
                            TestConfigIICP := { 
                                location := PX_LOC_ITS_FNTP_ACCESS_SETTINGS, 
                                location := PX_LOC_ITS_FNTP_ACCESS_SETTINGS_MX_SAP_UNSET, 
                                lowerLayers := PX_IUT_LOWER_LAYER_UNUSED, // PX_IUT_LOWER_LAYER_USED
                                testMode := PX_IUT_TEST_MODE_ON 
                            } 
                        } // End of field 'mcmd' 
                    } // End of field 'mcmdRq'
                } // End of field 'utFntpInitialize' 
            } // End of template m_utFntpInitialize 
            } // End of template m_utFntpInitialize_without_management 
            
            group fntpNfPort {
                
+352 −55

File changed.

Preview size limit exceeded, changes collapsed.

+14 −9
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ module LibItsFsap_Pics {
         * @desc Is FSAP Service User role ?
         * @see  ETSI TS 102 797-1 v0.0.8 C.1/2
         */
        modulepar boolean PICS_FSAP_ROLE_SU := false;
        modulepar boolean PICS_FSAP_ROLE_SU := true;
        
        /**
         * @desc Is FSAP Service operation phase ?
@@ -30,7 +30,7 @@ module LibItsFsap_Pics {
         * @desc Is supported SIP with support of CTX message mode ?
         * @see  ETSI TS 102 797-1 v0.0.8 C.3/1
         */
        modulepar boolean PICS_SIP_W_CTX := false;
        modulepar boolean PICS_SIP_W_CTX := true;
        
        /**
         * @desc Is supported SIP without support of CTX message mode ?
@@ -65,7 +65,7 @@ module LibItsFsap_Pics {
        /**
         * @desc Duration of SAM retransmit timer [ms]
         */
        modulepar integer PICS_SAM_RETRANSMIT_TIMER := 3000;
        modulepar float PICS_SAM_RETRANSMIT_TIMER := 1000.0;
        
        /**
         * @desc Is IISC available?
@@ -79,6 +79,11 @@ module LibItsFsap_Pics {
         */
        modulepar boolean PICS_FSAP_FNTP := true;
        
        /**
         * @desc Is IUT support notification to the ITS Management layer
         */
        modulepar boolean PICS_ITS_MGT_NOT := false;
        
    } // End of group fsapPics
    
} // End of module LibItsFsap_Pics
 No newline at end of file
Loading