Commit 2ed2002f authored by berge's avatar berge
Browse files

Fixed f_setNrNeighbourLocTablleXXX functions (Added adapter primitive)

parent de805961
Loading
Loading
Loading
Loading
+15 −6
Original line number Diff line number Diff line
@@ -973,6 +973,12 @@ module LibItsGeoNetworking_Functions {
            return v_result.getLongPosVector;
        }
        
        function f_acStartBeaconingMultipleNeighbour(in integer p_numberOfNeighbour) runs on ItsNt return FncRetCode {
            
            return f_acTriggerEvent(m_startBeaconingMultipleNeighbour(m_beaconHeader(f_getPosition(vc_componentName)).beaconHeader, p_numberOfNeighbour));
            
        }
        
    } // end adapterControl
    
    group commonFunctions {
@@ -1302,9 +1308,10 @@ module LibItsGeoNetworking_Functions {
         */        
        function f_setNrNeighbourLocTableDefault() {
            var integer v_nrNeighbour := f_random (0, PX_MIN_NR_NEIGHBOUR);
            //TODO set the number of Neighbour in the IUT Location Table to v_nrNeighbour
            
        } // end f_setNrNeighbourLT
            f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);
            
        } // end f_setNrNeighbourLocTableDefault
        
        /**
         * @desc Set the number of neighbour in the Location Table.
@@ -1312,9 +1319,10 @@ module LibItsGeoNetworking_Functions {
         */        
        function f_setNrNeighbourLocTableMedium() {
            var integer v_nrNeighbour := f_random (PX_MIN_NR_NEIGHBOUR, PX_MAX_NR_NEIGHBOUR);
            //TODO set the number of Neighbour in the IUT Location Table to v_nrNeighbour
            
        } // end f_setNrNeighbourLT
            f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);
            
        } // end f_setNrNeighbourLocTableMedium
        
        /**
         * @desc Set the number of neighbour in the Location Table.
@@ -1322,9 +1330,10 @@ module LibItsGeoNetworking_Functions {
         */        
        function f_setNrNeighbourLocTableMaximum() {
            var integer v_nrNeighbour := f_random (PX_MAX_NR_NEIGHBOUR, (2*PX_MIN_NR_NEIGHBOUR));
            //TODO set the number of Neighbour in the IUT Location Table to v_nrNeighbour
            
        } // end f_setNrNeighbourLT
            f_acStartBeaconingMultipleNeighbour(v_nrNeighbour);
            
        } // end f_setNrNeighbourLocTableMaximum
        
    } // end iutFunctions
    
+23 −0
Original line number Diff line number Diff line
@@ -262,6 +262,29 @@ module LibItsGeoNetworking_Templates {
                }
            }

            /**
             * @desc Testsystem will start beaconing for the given neighbor
             * @param p_beaconHeader The neighbor information
             */
            template (value) AcGNEvent m_startBeaconingMultipleNeighbour(
                template (value) BeaconHeader p_beaconHeader,
                integer p_numberOfNeighbour
            ) := {
                startBeaconingMultipleNeighbour := {
                    beaconHeader := p_beaconHeader,
                    numberOfNeighbour := p_numberOfNeighbour
                }
            }
            
            /**
             * @desc Testsystem will stop beaconing for the given neighbor
             * @param p_compName The neighbor
             */
            template AcGNEvent m_stopBeaconingMultipleNeighbour := {
                stopBeaconingMultipleNeighbour:= {
                }
            }            
        
            /**
             * @desc Testsystem will reply the LongPosVector including the requested GN address 
             *       found in received beacon information to the TTCN-3
+10 −0
Original line number Diff line number Diff line
@@ -888,6 +888,8 @@ module LibItsGeoNetworking_TypesAndValues {
            AcStopBeaconing stopBeaconing,
            AcStartPassBeaconing startPassBeaconing,
            AcStopPassBeaconing stopPassBeaconing,
            AcStartBeaconingMultipleNeighbour startBeaconingMultipleNeighbour,
            AcStopBeaconingMultipleNeighbour stopBeaconingMultipleNeighbour,
            TaGetLongPosVector getLongPosVector
        }
        
@@ -909,6 +911,14 @@ module LibItsGeoNetworking_TypesAndValues {
        type record AcStopPassBeaconing {
        }
        
        type record AcStartBeaconingMultipleNeighbour {
            BeaconHeader beaconHeader,
            integer numberOfNeighbour
        }
        
        type record AcStopBeaconingMultipleNeighbour {
        }
        
        type record TaGetLongPosVector {
            GN_Address gnAddress
        }