Commit e9860544 authored by Yann Garcia's avatar Yann Garcia
Browse files

Align PICS with lastest update of part-1 document

parent 03f0a1a4

ItsGeoNetworking_TestCases.ttcn

+8 −8
Original line number Diff line number Diff line
@@ -4932,7 +4932,7 @@ module ItsGeoNetworking_TestCases { 
                *          contention if received for the first time from an unknown sender when IUT is inside the

                *          destination area

             * <pre>

                * Pics Selection: PICS_GN_GBC_FWD AND NOT PICS_ITS_RELEASE_2 AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Pics Selection: PICS_GN_GBC_FWD AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Config Id: CF05

             * Initial conditions:

             *  with {
@@ -4973,7 +4973,7 @@ module ItsGeoNetworking_TestCases { 
                * @desc    Check that a received GBC packet is discarded if received more than MAX_COUNTER

                *          times when IUT is inside of the destination area

             * <pre>

                * Pics Selection: PICS_GN_GBC_FWD AND NOT PICS_ITS_RELEASE_2 AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Pics Selection: PICS_GN_GBC_FWD AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Config Id: CF06

             * Initial conditions:

             *  with {
@@ -5014,7 +5014,7 @@ module ItsGeoNetworking_TestCases { 
                * @desc    Check that a received GBC packet is discarded if received more than 1 times when IUT

                *          is inside of the destination area and inside the sectorial area of the GBC packet Sender

                * <pre>

                * Pics Selection: PICS_GN_GBC_FWD AND NOT PICS_ITS_RELEASE_2 AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Pics Selection: PICS_GN_GBC_FWD AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Config Id: CF05

                * Initial conditions:

                *  with {
@@ -5055,7 +5055,7 @@ module ItsGeoNetworking_TestCases { 
                * @desc    Check that a received GBC packet is triggering contention if received more than 1 times when the IUT

                *          is inside of the destination area and outside the sectorial area of the GBC packet Sender (Angle_FSR > Angle_TH)

             * <pre>

                * Pics Selection: PICS_GN_GBC_FWD AND NOT PICS_ITS_RELEASE_2 AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Pics Selection: PICS_GN_GBC_FWD AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Config Id: CF06

             * Initial conditions:

             *  with {
@@ -5099,7 +5099,7 @@ module ItsGeoNetworking_TestCases { 
                * @desc    Check that a received GBC packet is triggering contention if received more than 1 times when IUT

                *          is inside the destination area and outside the sectorial area of the GBC packet Sender (Dist_R > Dist_F)

             * <pre>

                * Pics Selection: PICS_GN_GBC_FWD AND NOT PICS_ITS_RELEASE_2 AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Pics Selection: PICS_GN_GBC_FWD AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Config Id: CF07

                * Initial conditions:

                *  with {
@@ -5143,7 +5143,7 @@ module ItsGeoNetworking_TestCases { 
                * @desc    Check that a received GBC packet with Unicast MAC destination is triggering line

                *          forwarding if received for the first time when IUT is inside the destination area

                * <pre>

                * Pics Selection: PICS_GN_GBC_FWD AND NOT PICS_ITS_RELEASE_2 AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Pics Selection: PICS_GN_GBC_FWD AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Config Id: CF05

             * Initial conditions:

             *  with {
@@ -5182,7 +5182,7 @@ module ItsGeoNetworking_TestCases { 
                * @desc    Check that a received GBC packet with Unicast MAC destination is triggering

                *           rebroadcast if received for the first time when IUT is inside the destination area.

             * <pre>

                * Pics Selection: PICS_GN_GBC_FWD AND NOT PICS_ITS_RELEASE_2 AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Pics Selection: PICS_GN_GBC_FWD AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Config Id: CF05

             * Initial conditions:

             *  with {
@@ -5221,7 +5221,7 @@ module ItsGeoNetworking_TestCases { 
                * @desc    Check that a received GBC packet with Broadcast destination is triggering contention if

                *          received for the first time from known sender when IUT is inside the destination area

             * <pre>

                * Pics Selection: PICS_GN_GBC_FWD AND NOT PICS_ITS_RELEASE_2 AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Pics Selection: PICS_GN_GBC_FWD AND PICS_GN_AREA_FORWARDING_ALGORITHM == 'ADVANCED'

                * Config Id: CF05

             * Initial conditions:

             *  with {

ItsGeoNetworking_TestControl.ttcn

+269 −271
Original line number Diff line number Diff line
@@ -378,7 +378,6 @@ module ItsGeoNetworking_TestControl { 


            if(PICS_GN_AREA_FORWARDING_ALGORITHM == e_advanced) {



				if(PICS_GN_GBC_FWD and not PICS_ITS_RELEASE_2) {

                execute(TC_GEONW_PON_GBC_AREA_ADV_BV_21());

                execute(TC_GEONW_PON_GBC_AREA_ADV_BV_23());

                execute(TC_GEONW_PON_GBC_AREA_ADV_BV_24());
@@ -389,7 +388,6 @@ module ItsGeoNetworking_TestControl { 
                execute(TC_GEONW_PON_GBC_AREA_ADV_BV_29());

            }

        }

        }



        /* PON/TSB */

        if(PICS_GN_TSB) {

README.md

+1 −1
Original line number Diff line number Diff line 
# GeoNetworking Abstract Test suite (TS 102 871-3)



GeoNetworking (GN) abstract test suite (ATS) as defined in [ETSI TS 102 871-3 v2.1.1](https://www.etsi.org/deliver/etsi_ts/102800_102899/10287103/01.05.01_60/ts_10287103v010501p.pdf)

GeoNetworking (GN) abstract test suite (ATS) as defined in [ETSI TS 102 871-3 v2.1.1](https://www.etsi.org/deliver/etsi_ts/102800_102899/10287103/02.01.01_60/ts_10287103v020101p.pdf)



This code is a part of the ETSI ITS test suite, available on https://forge.etsi.org/rep/ITS/TS.ITS

lib/LibItsGeoNetworking_Pics.ttcn

+0 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ module LibItsGeoNetworking_Pics { 
    

    group geoNwPics {

        

        /**

         * @desc Is IUT supports ITS rel.2 ?

         * @see  ETSI TS 102 871-1 Table 1

         */

        modulepar boolean PICS_ITS_RELEASE_2 := true;

        

        /**

         * @desc GeoNetworking address of the GeoAdhoc router

         * @see  ETSI TS 102 871-1 Table 1