Commit 60c1a5a6 authored by berge's avatar berge
Browse files

Review/Reorg of GN Forwarding TCs

parent ba47275e

ttcn/AtsGeoNetworking/ItsGeoNetworking_TestCases.ttcn

+2831 −2458

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn

+202 −152
Original line number Diff line number Diff line
@@ -264,84 +264,135 @@ module ItsGeoNetworking_TestControl { 
        }

        

        /* PON/GUC */        

		if(PICS_GN_GUC) {

			

        if(PICS_GN_GUC_SRC) {

            if ((PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_unspecified)) {

                execute(TC_GEONW_PON_GUC_BV_01());

			if(PICS_GN_GUC_FWD) {

        		execute(TC_GEONW_PON_GUC_ALL_BV_03());

        		execute(TC_GEONW_PON_GUC_ALL_BO_04());

				execute(TC_GEONW_PON_GUC_ALL_BV_06());

			}

			

            if (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_cbf) {

                execute(TC_GEONW_PON_GUC_BV_11());

			if(PICS_GN_GUC_DST) {

        		execute(TC_GEONW_PON_GUC_ALL_BV_05());

        		execute(TC_GEONW_PON_GUC_ALL_BO_08());

			}



            if((PICS_GN_NON_AREA_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_NON_AREA_FORWARDING_ALGORITHM == e_unspecified)) {

    	

				if(PICS_GN_GUC_SRC) {

                    execute(TC_GEONW_PON_GUC_GRD_BV_01());                    

				}

				

				if(PICS_GN_GUC_FWD) {

            if ((PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_unspecified)) {

	            execute(TC_GEONW_PON_GUC_BV_02());

                    execute(TC_GEONW_PON_GUC_GRD_BV_02());

                    execute(TC_GEONW_PON_GUC_GRD_BO_07());

				}

            }

    

            execute(TC_GEONW_PON_GUC_BV_03());

            execute(TC_GEONW_PON_GUC_BO_04());

            if(PICS_GN_NON_AREA_FORWARDING_ALGORITHM == e_cbf) {

            	

            if (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_cbf) {

                execute(TC_GEONW_PON_GUC_BV_06());

                execute(TC_GEONW_PON_GUC_BV_07());

                execute(TC_GEONW_PON_GUC_BV_08());

                execute(TC_GEONW_PON_GUC_BV_10());

				if(PICS_GN_GUC_SRC) {	

            		execute(TC_GEONW_PON_GUC_CBF_BV_01());

				}

            	

            if ((PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_unspecified)) {

                execute(TC_GEONW_PON_GUC_BO_12());

				if(PICS_GN_GUC_FWD) {	

            		execute(TC_GEONW_PON_GUC_CBF_BV_02());

            		execute(TC_GEONW_PON_GUC_CBF_BV_07());

            		execute(TC_GEONW_PON_GUC_CBF_BV_20());

            		execute(TC_GEONW_PON_GUC_CBF_BV_21());

            		execute(TC_GEONW_PON_GUC_CBF_BV_22());

				}

            }

    		

        if(PICS_GN_GUC_DST) {

	        execute(TC_GEONW_PON_GUC_BV_05());

       

            if ((PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_unspecified)) {

	            execute(TC_GEONW_PON_GUC_BO_13());

            }

        }

        

        /* PON/GBC */             

		if(PICS_GN_GBC) {

			

			if(PICS_GN_GBC_FWD) {

				execute(TC_GEONW_PON_GBC_NONAREA_ALL_BV_03());

    			execute(TC_GEONW_PON_GBC_NONAREA_ALL_BV_04());

    			execute(TC_GEONW_PON_GBC_NONAREA_ALL_BV_06());

    			execute(TC_GEONW_PON_GBC_NONAREA_ALL_BO_09());

    			execute(TC_GEONW_PON_GBC_NONAREA_ALL_BO_10());

			}

    

            if((PICS_GN_NON_AREA_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_NON_AREA_FORWARDING_ALGORITHM == e_unspecified)) {

    

				if(PICS_GN_GBC_SRC) {

            execute(TC_GEONW_PON_GBC_BV_01());

            if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_advanced)) {

            	execute(TC_GEONW_PON_GBC_BV_02());

                    execute(TC_GEONW_PON_GBC_NONAREA_GRD_BV_01());

				}

            if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {

                execute(TC_GEONW_PON_GBC_BV_03());

				

				if(PICS_GN_GBC_FWD) {

        			execute(TC_GEONW_PON_GBC_NONAREA_GRD_BV_02());

        			execute(TC_GEONW_PON_GBC_NONAREA_GRD_BO_07());

				}

            if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_cbf) {

                execute(TC_GEONW_PON_GBC_BV_12());

            }

                

			if(PICS_GN_NON_AREA_FORWARDING_ALGORITHM == e_cbf) {

				

				if(PICS_GN_GBC_SRC) {

					execute(TC_GEONW_PON_GBC_NONAREA_CBF_BV_01());

				}

				

				if(PICS_GN_GBC_FWD) {

            if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {

            	execute(TC_GEONW_PON_GBC_BO_04());

					execute(TC_GEONW_PON_GBC_NONAREA_CBF_BV_02());

    			    execute(TC_GEONW_PON_GBC_NONAREA_CBF_BV_07());

        			execute(TC_GEONW_PON_GBC_NONAREA_CBF_BV_20());

        			execute(TC_GEONW_PON_GBC_NONAREA_CBF_BV_21());

        			execute(TC_GEONW_PON_GBC_NONAREA_CBF_BV_22());

    			}

            execute(TC_GEONW_PON_GBC_BV_05());

            if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {

                execute(TC_GEONW_PON_GBC_BO_06());

			}

            execute(TC_GEONW_PON_GBC_BV_07());

            execute(TC_GEONW_PON_GBC_BV_08());

            execute(TC_GEONW_PON_GBC_BV_11());

            execute(TC_GEONW_PON_GBC_BO_19());

            execute(TC_GEONW_PON_GBC_BV_20());

            execute(TC_GEONW_PON_GBC_BV_21());

            

			if(PICS_GN_GBC_SRC) {    

			    execute(TC_GEONW_PON_GBC_AREA_ALL_BV_01());

			}

			

			if(PICS_GN_GBC_FWD) {

    			execute(TC_GEONW_PON_GBC_AREA_ALL_BV_03());

    			execute(TC_GEONW_PON_GBC_AREA_ALL_BV_04());

			}

			

			if(PICS_GN_GBC_DST) {

            execute(TC_GEONW_PON_GBC_BV_09());

            if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {

            	execute(TC_GEONW_PON_GBC_BO_10());

    			execute(TC_GEONW_PON_GBC_AREA_ALL_BV_05());

    			execute(TC_GEONW_PON_GBC_AREA_ALL_BO_08());

			}

    

			if((PICS_GN_AREA_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_AREA_FORWARDING_ALGORITHM == e_unspecified)) {

    

				if(PICS_GN_GBC_FWD) {

    			    execute(TC_GEONW_PON_GBC_AREA_SMP_BV_02());

    			    execute(TC_GEONW_PON_GBC_AREA_SMP_BO_07());

				}

			}

			

			if(PICS_GN_AREA_FORWARDING_ALGORITHM == e_cbf) {

				

				if(PICS_GN_GBC_FWD) {

        			execute(TC_GEONW_PON_GBC_AREA_CBF_BV_02());

        			execute(TC_GEONW_PON_GBC_AREA_CBF_BV_07());

        			execute(TC_GEONW_PON_GBC_AREA_CBF_BV_21());

        			execute(TC_GEONW_PON_GBC_AREA_CBF_BV_22());

				}

    		}

			

			if(PICS_GN_AREA_FORWARDING_ALGORITHM == e_advanced) {

				

				if(PICS_GN_GBC_FWD) {

        			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());

        			execute(TC_GEONW_PON_GBC_AREA_ADV_BV_25());

        			execute(TC_GEONW_PON_GBC_AREA_ADV_BV_26());

        			execute(TC_GEONW_PON_GBC_AREA_ADV_BV_27());

        			execute(TC_GEONW_PON_GBC_AREA_ADV_BV_28());

        			execute(TC_GEONW_PON_GBC_AREA_ADV_BV_29());

				}

			}

		}

        

        /* PON/TSB */

		if(PICS_GN_TSB) {

			

			if(PICS_GN_TSB_SRC) {

			    execute(TC_GEONW_PON_TSB_BV_01());
@@ -349,81 +400,80 @@ module ItsGeoNetworking_TestControl { 
			

			if(PICS_GN_TSB_FWD) {

    			execute(TC_GEONW_PON_TSB_BV_02());

            execute(TC_GEONW_PON_TSB_BO_03());

            execute(TC_GEONW_PON_TSB_BV_04());

            execute(TC_GEONW_PON_TSB_BO_05());

    			execute(TC_GEONW_PON_TSB_BV_03());

    			execute(TC_GEONW_PON_TSB_BO_04());

    			execute(TC_GEONW_PON_TSB_BO_07());    			

			}

			

			if(PICS_GN_TSB_DST) {

            execute(TC_GEONW_PON_TSB_BV_06());

            execute(TC_GEONW_PON_TSB_BO_07());

			    execute(TC_GEONW_PON_TSB_BV_05());

				execute(TC_GEONW_PON_TSB_BO_08());

			}

		}



        

        /* PON/SHB */

		if(PICS_GN_SHB) {

    

    		if(PICS_GN_SHB_SRC) {

			    execute(TC_GEONW_PON_SHB_BV_01());

			}

	

			if(PICS_GN_SHB_DST) {

            execute(TC_GEONW_PON_SHB_BV_02());

			    execute(TC_GEONW_PON_SHB_BV_05());

			}

		}

		        

        

        /* PON/GAC */

		if(PICS_GN_GAC) {

			

        if(PICS_GN_GAC_SRC) {        

            execute(TC_GEONW_PON_GAC_BV_01());

            if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {

            	execute(TC_GEONW_PON_GAC_BV_02());

            }

            if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_cbf) {

                execute(TC_GEONW_PON_GAC_BV_13());

			if(PICS_GN_GAC_FWD) {

    			execute(TC_GEONW_PON_GAC_NONAREA_ALL_BV_03());

    			execute(TC_GEONW_PON_GAC_NONAREA_ALL_BO_04());

    			execute(TC_GEONW_PON_GAC_NONAREA_ALL_BV_06());

    			execute(TC_GEONW_PON_GAC_NONAREA_ALL_BO_09());

    			execute(TC_GEONW_PON_GAC_NONAREA_ALL_BV_10());

			}

    

			if((PICS_GN_NON_AREA_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_NON_AREA_FORWARDING_ALGORITHM == e_unspecified)) {

				

				if(PICS_GN_GAC_SRC) {

			        execute(TC_GEONW_PON_GAC_NONAREA_GRD_BV_01());

				}

				

				if(PICS_GN_GAC_FWD) {

            execute(TC_GEONW_PON_GAC_BV_03());

            execute(TC_GEONW_PON_GAC_BV_04());

            execute(TC_GEONW_PON_GAC_BO_05());

            execute(TC_GEONW_PON_GAC_BV_06());

            execute(TC_GEONW_PON_GAC_BO_07());

            execute(TC_GEONW_PON_GAC_BO_11());

        			execute(TC_GEONW_PON_GAC_NONAREA_GRD_BV_02());

        			execute(TC_GEONW_PON_GAC_NONAREA_GRD_BO_07());

				}



        if(PICS_GN_GAC_DST) {        

            execute(TC_GEONW_PON_GAC_BV_08());

            execute(TC_GEONW_PON_GAC_BO_09());

            execute(TC_GEONW_PON_GAC_BV_10());

			}

			

		/* PON/BCA */

			if(PICS_GN_NON_AREA_FORWARDING_ALGORITHM == e_cbf) {

				

        if(PICS_GN_GBC_FWD) {        

            if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_cbf) {

                execute(TC_GEONW_PON_BCA_BV_01());

                execute(TC_GEONW_PON_BCA_BV_02());

                execute(TC_GEONW_PON_BCA_BV_03());

                execute(TC_GEONW_PON_BCA_BO_04());

                execute(TC_GEONW_PON_BCA_BV_05());

                execute(TC_GEONW_PON_BCA_BV_06());

				execute(TC_GEONW_PON_BCA_BV_07());

                execute(TC_GEONW_PON_BCA_BV_08());

				if(PICS_GN_GAC_SRC) {

        			execute(TC_GEONW_PON_GAC_NONAREA_CBF_BV_01());

				}

				

				if(PICS_GN_GAC_FWD) {

        			execute(TC_GEONW_PON_GAC_NONAREA_CBF_BV_02());

        			execute(TC_GEONW_PON_GAC_NONAREA_CBF_BV_07());

        			execute(TC_GEONW_PON_GAC_NONAREA_CBF_BV_20());

        			execute(TC_GEONW_PON_GAC_NONAREA_CBF_BV_21());

        			execute(TC_GEONW_PON_GAC_NONAREA_CBF_BV_22());

				}

			}

			         

        /* PON/BAA */

			if(PICS_GN_GAC_SRC) {   

    			execute(TC_GEONW_PON_GAC_AREA_ALL_BV_01());

			}

			

        if(PICS_GN_GBC_FWD) {

            if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_advanced) {

                execute(TC_GEONW_PON_BAA_BV_01());

                execute(TC_GEONW_PON_BAA_BV_02());

                execute(TC_GEONW_PON_BAA_BV_03());

                execute(TC_GEONW_PON_BAA_BV_04());

                execute(TC_GEONW_PON_BAA_BV_05());

                execute(TC_GEONW_PON_BAA_BV_06());

                execute(TC_GEONW_PON_BAA_BV_07());

                execute(TC_GEONW_PON_BAA_BO_08());

                execute(TC_GEONW_PON_BAA_BV_09());

                execute(TC_GEONW_PON_BAA_BV_10());

                execute(TC_GEONW_PON_BAA_BV_11());

			if(PICS_GN_GAC_FWD) {

    			execute(TC_GEONW_PON_GAC_AREA_ALL_BV_02());

			}

			

			if(PICS_GN_GAC_DST) {

    			execute(TC_GEONW_PON_GAC_AREA_ALL_BV_05());

    			execute(TC_GEONW_PON_GAC_AREA_ALL_BO_08());

			}

		}

ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn

+9793 −8448

File changed.

Preview size limit exceeded, changes collapsed.