Upf,Pgw,etc: gate rename: filterGate -> dnPppg

avarga · avarga · commit 09af21e7083d · 2026-02-19T21:23:27.000+01:00
The "filterGate" is actually a PPP port (hence "pppg") that connects to
the Internet, or in general, to the Data Network ("dn") in 3GPP
terminology.
diff --git a/emulation/extclientserver/ExtClientServerExample.ned b/emulation/extclientserver/ExtClientServerExample.ned
@@ -65,6 +65,6 @@ network ExtClientServerExample
             @display("p=671,432;is=vl");
         }
     connections allowunconnected:
-        router.pppg++ <--> Eth10G <--> upf.filterGate;
+        router.pppg++ <--> Eth10G <--> upf.dnPppg;
         upf.pppg++ <--> Eth10G <--> gnb.ppp;
 }
diff --git a/emulation/extclientserver_bgTraffic/ExtClientServer_bgCells.ned b/emulation/extclientserver_bgTraffic/ExtClientServer_bgCells.ned
@@ -70,6 +70,6 @@ network ExtClientServer_bgCells
         }
 
     connections allowunconnected:
-        router.pppg++ <--> Eth10G <--> upf.filterGate;
+        router.pppg++ <--> Eth10G <--> upf.dnPppg;
         upf.pppg++ <--> Eth10G <--> gnb.ppp;
 }
diff --git a/emulation/extserver/ExtServerExample.ned b/emulation/extserver/ExtServerExample.ned
@@ -70,6 +70,6 @@ network ExtServerExample
             @display("p=671,432;is=vl");
         }
     connections allowunconnected:
-        router.pppg++ <--> Eth10G <--> upf.filterGate;
+        router.pppg++ <--> Eth10G <--> upf.dnPppg;
         upf.pppg++ <--> Eth10G <--> gnb.ppp;
 }
diff --git a/emulation/mec/extMecApp/ExtMecAppExample.ned b/emulation/mec/extMecApp/ExtMecAppExample.ned
@@ -84,7 +84,7 @@ network ExtMecAppExample
 
 	    //#	mec
         mecHost1.ppp++ <--> Eth10G <--> iUpf.pppg++;
-        upf.filterGate <--> Eth10G <--> ualcmp.ppp++;
+        upf.dnPppg <--> Eth10G <--> ualcmp.ppp++;
 
         ualcmp.toMecOrchestrator --> mecOrchestrator.fromUALCMP;
         ualcmp.fromMecOrchestrator <-- mecOrchestrator.toUALCMP;
diff --git a/emulation/mec/extUeApp/ExtUeAppExample.ned b/emulation/mec/extUeApp/ExtUeAppExample.ned
@@ -84,7 +84,7 @@ network ExtUeAppExample
 
 	    //#	mec
         mecHost1.ppp++ <--> Eth10G <--> iUpf.pppg++;
-        upf.filterGate <--> Eth10G <--> ualcmp.ppp++;
+        upf.dnPppg <--> Eth10G <--> ualcmp.ppp++;
 
         ualcmp.toMecOrchestrator --> mecOrchestrator.fromUALCMP;
         ualcmp.fromMecOrchestrator <-- mecOrchestrator.toUALCMP;
diff --git a/emulation/mec/extUeAppMecApp/ExtUeAppMecAppExample.ned b/emulation/mec/extUeAppMecApp/ExtUeAppMecAppExample.ned
@@ -84,7 +84,7 @@ network ExtUeAppMecAppExample
 
 	    //#	mec
         mecHost1.ppp++ <--> Eth10G <--> iUpf.pppg++;
-        upf.filterGate <--> Eth10G <--> ualcmp.ppp++;
+        upf.dnPppg <--> Eth10G <--> ualcmp.ppp++;
 
         ualcmp.toMecOrchestrator --> mecOrchestrator.fromUALCMP;
         ualcmp.fromMecOrchestrator <-- mecOrchestrator.toUALCMP;
diff --git a/simulations/lte/cars/Highway.ned b/simulations/lte/cars/Highway.ned
@@ -79,7 +79,7 @@ network Highway
 
     connections allowunconnected:
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> pgw.filterGate;
+        router.pppg++ <--> Eth10G <--> pgw.dnPppg;
         pgw.pppg++ <--> Eth10G <--> eNodeB1.ppp;
         pgw.pppg++ <--> Eth10G <--> eNodeB2.ppp;
 
diff --git a/simulations/lte/networks/MultiCell.ned b/simulations/lte/networks/MultiCell.ned
@@ -77,7 +77,7 @@ network MultiCell
         }
     connections:
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> pgw.filterGate;
+        router.pppg++ <--> Eth10G <--> pgw.dnPppg;
         pgw.pppg++ <--> Eth10G <--> eNodeB1.ppp;
         pgw.pppg++ <--> Eth10G <--> eNodeB2.ppp;
 
diff --git a/simulations/lte/networks/MultiCell_D2DMultihop.ned b/simulations/lte/networks/MultiCell_D2DMultihop.ned
@@ -121,6 +121,6 @@ network MultiCell_D2DMultihop
         router3.pppg++ <--> Eth10G <--> pgw.pppg++;
         router4.pppg++ <--> Eth10G <--> pgw.pppg++;
         router5.pppg++ <--> Eth10G <--> pgw.pppg++;
-        router.pppg++ <--> Eth10G <--> pgw.filterGate;
+        router.pppg++ <--> Eth10G <--> pgw.dnPppg;
         server.pppg++ <--> Eth10G <--> router.pppg++;
 }
diff --git a/simulations/lte/networks/MultiCell_X2Mesh.ned b/simulations/lte/networks/MultiCell_X2Mesh.ned
@@ -86,7 +86,7 @@ network MultiCell_X2Mesh
         }
     connections:
 
-        server.pppg++ <--> Eth10G <--> pgw.filterGate;
+        server.pppg++ <--> Eth10G <--> pgw.dnPppg;
         pgw.pppg++ <--> Eth10G <--> router1.pppg++;
         pgw.pppg++ <--> Eth10G <--> router2.pppg++;
         pgw.pppg++ <--> Eth10G <--> router3.pppg++;
diff --git a/simulations/lte/networks/SingleCell.ned b/simulations/lte/networks/SingleCell.ned
@@ -61,6 +61,6 @@ network SingleCell
         }
     connections:
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> pgw.filterGate;
+        router.pppg++ <--> Eth10G <--> pgw.dnPppg;
         pgw.pppg++ <--> Eth10G <--> eNB.ppp;
 }
diff --git a/simulations/lte/networks/SingleCell_D2D.ned b/simulations/lte/networks/SingleCell_D2D.ned
@@ -69,6 +69,6 @@ network SingleCell_D2D
         }
     connections:
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> pgw.filterGate;
+        router.pppg++ <--> Eth10G <--> pgw.dnPppg;
         pgw.pppg++ <--> Eth10G <--> eNB.ppp;
 }
diff --git a/simulations/lte/networks/SingleCell_D2DMulticast.ned b/simulations/lte/networks/SingleCell_D2DMulticast.ned
@@ -65,6 +65,6 @@ network SingleCell_D2DMulticast
         }
     connections:
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> pgw.filterGate;
+        router.pppg++ <--> Eth10G <--> pgw.dnPppg;
         pgw.pppg++ <--> Eth10G <--> eNB.ppp;
 }
diff --git a/simulations/nr/cars/Highway.ned b/simulations/nr/cars/Highway.ned
@@ -79,7 +79,7 @@ network Highway
 
     connections allowunconnected:
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> upf.filterGate;
+        router.pppg++ <--> Eth10G <--> upf.dnPppg;
         upf.pppg++ <--> Eth10G <--> gNodeB1.ppp;
         upf.pppg++ <--> Eth10G <--> gNodeB2.ppp;
 
diff --git a/simulations/nr/mec/multiMecHost/MultiMecHost.ned b/simulations/nr/mec/multiMecHost/MultiMecHost.ned
@@ -96,7 +96,7 @@ network MultiMecHost
         iUpf2.pppg++ <--> Eth10G <--> gnb2.ppp;
 
         //# MEC-related connections
-        ualcmp.ppp++ <--> Eth10G <--> upf.filterGate;
+        ualcmp.ppp++ <--> Eth10G <--> upf.dnPppg;
         ualcmp.toMecOrchestrator --> mecOrchestrator.fromUALCMP;
         ualcmp.fromMecOrchestrator <-- mecOrchestrator.toUALCMP;
         mecHost1.ppp++ <--> Eth10G <--> iUpf1.pppg++;
diff --git a/simulations/nr/mec/multiOperator/MultiOperator.ned b/simulations/nr/mec/multiOperator/MultiOperator.ned
@@ -138,12 +138,12 @@ network MultiOperator
         iUpf_B.pppg++ <--> Eth10G <--> gnb_B3.ppp;
 
         //# MEC-related connections
-        router.pppg++ <--> Eth10G <--> upf_A.filterGate;
+        router.pppg++ <--> Eth10G <--> upf_A.dnPppg;
         ualcmp_A.ppp++ <--> Eth10G <--> router.pppg++;
         ualcmp_A.toMecOrchestrator --> mecOrchestrator_A.fromUALCMP;
         ualcmp_A.fromMecOrchestrator <-- mecOrchestrator_A.toUALCMP;
 
-        router.pppg++ <--> Eth10G <--> upf_B.filterGate;
+        router.pppg++ <--> Eth10G <--> upf_B.dnPppg;
         ualcmp_B.ppp++ <--> Eth10G <--> router.pppg++ if enableMecOperatorB;
         ualcmp_B.toMecOrchestrator --> mecOrchestrator_B.fromUALCMP if enableMecOperatorB;
         ualcmp_B.fromMecOrchestrator <-- mecOrchestrator_B.toUALCMP if enableMecOperatorB;
diff --git a/simulations/nr/mec/requestResponseApp/MultiMecHost_delay.ned b/simulations/nr/mec/requestResponseApp/MultiMecHost_delay.ned
@@ -101,7 +101,7 @@ network MultiMecHost_delay
 
 
         //# MEC-related connections
-        ualcmp.ppp++ <--> Eth10G <--> upf.filterGate;
+        ualcmp.ppp++ <--> Eth10G <--> upf.dnPppg;
         ualcmp.toMecOrchestrator --> mecOrchestrator.fromUALCMP;
         ualcmp.fromMecOrchestrator <-- mecOrchestrator.toUALCMP;
         mecHost1.ppp++ <--> Eth10G <--> iUpf1.pppg++;
diff --git a/simulations/nr/mec/rnisTest/RnisTest.ned b/simulations/nr/mec/rnisTest/RnisTest.ned
@@ -79,7 +79,7 @@ network RnisTest
 
         upf.pppg++ <--> Eth10G <--> iUpf.pppg++;
         iUpf.pppg++ <--> Eth10G <--> gNodeB1.ppp;
-        ualcmp.ppp++ <--> Eth10G <--> upf.filterGate;
+        ualcmp.ppp++ <--> Eth10G <--> upf.dnPppg;
 
         ualcmp.toMecOrchestrator --> mecOrchestrator.fromUALCMP;
         ualcmp.fromMecOrchestrator <-- mecOrchestrator.toUALCMP;
diff --git a/simulations/nr/mec/singleMecHost/singleMecHost.ned b/simulations/nr/mec/singleMecHost/singleMecHost.ned
@@ -83,7 +83,7 @@ network SingleMecHost
 
         upf.pppg++ <--> Eth10G <--> iUpf.pppg++;
         iUpf.pppg++ <--> Eth10G <--> gNodeB1.ppp;
-        ualcmp.ppp++ <--> Eth10G <--> upf.filterGate;
+        ualcmp.ppp++ <--> Eth10G <--> upf.dnPppg;
 
         ualcmp.toMecOrchestrator --> mecOrchestrator.fromUALCMP;
         ualcmp.fromMecOrchestrator <-- mecOrchestrator.toUALCMP;
diff --git a/simulations/nr/networks/MultiCell_Standalone.ned b/simulations/nr/networks/MultiCell_Standalone.ned
@@ -78,7 +78,7 @@ network MultiCell_Standalone
 
         //# Data Network connections
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> upf.filterGate;
+        router.pppg++ <--> Eth10G <--> upf.dnPppg;
 
         //# 5G Core Network connections
         upf.pppg++ <--> Eth10G <--> iUpf.pppg++;
diff --git a/simulations/nr/networks/MultiCell_withSecondaryGnb.ned b/simulations/nr/networks/MultiCell_withSecondaryGnb.ned
@@ -82,7 +82,7 @@ network MultiCell_withSecondaryGnb
         }
     connections:
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> pgw.filterGate;
+        router.pppg++ <--> Eth10G <--> pgw.dnPppg;
         pgw.pppg++ <--> Eth10G <--> masterEnb1.ppp;
         pgw.pppg++ <--> Eth10G <--> masterEnb2.ppp;
 
diff --git a/simulations/nr/networks/SingleCell_Standalone.ned b/simulations/nr/networks/SingleCell_Standalone.ned
@@ -73,7 +73,7 @@ network SingleCell_Standalone
         }
     connections:
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> upf.filterGate;
+        router.pppg++ <--> Eth10G <--> upf.dnPppg;
         upf.pppg++ <--> Eth10G <--> iUpf.pppg++;
         iUpf.pppg++ <--> Eth10G <--> gnb.ppp;
 }
diff --git a/simulations/nr/networks/SingleCell_Standalone_D2D.ned b/simulations/nr/networks/SingleCell_Standalone_D2D.ned
@@ -78,7 +78,7 @@ network SingleCell_Standalone_D2D
         }
     connections:
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> upf.filterGate;
+        router.pppg++ <--> Eth10G <--> upf.dnPppg;
         upf.pppg++ <--> Eth10G <--> iUpf.pppg++;
         iUpf.pppg++ <--> Eth10G <--> gnb.ppp;
 }
diff --git a/simulations/nr/networks/SingleCell_withSecondaryGnb.ned b/simulations/nr/networks/SingleCell_withSecondaryGnb.ned
@@ -76,7 +76,7 @@ network SingleCell_withSecondaryGnb
         }
     connections:
         server.pppg++ <--> Eth10G <--> router.pppg++;
-        router.pppg++ <--> Eth10G <--> pgw.filterGate;
+        router.pppg++ <--> Eth10G <--> pgw.dnPppg;
         pgw.pppg++ <--> Eth10G <--> masterEnb.ppp;
 
         //# X2 connections
diff --git a/simulations/nr/videostreaming_dataset_generator/UrbanNetwork.ned b/simulations/nr/videostreaming_dataset_generator/UrbanNetwork.ned
@@ -125,7 +125,7 @@ network UrbanNetwork
 
         //# MEC connections
 
-        ualcmp.ppp++ <--> Eth10G <--> upf.filterGate;
+        ualcmp.ppp++ <--> Eth10G <--> upf.dnPppg;
         ualcmp.toMecOrchestrator --> mecOrchestrator.fromUALCMP;
         ualcmp.fromMecOrchestrator <-- mecOrchestrator.toUALCMP;
         mecHost.ppp++ <--> Eth10G <--> iUpf.pppg++;
diff --git a/src/simu5g/nodes/MecHost.ned b/src/simu5g/nodes/MecHost.ned
@@ -116,7 +116,7 @@ module MecHost
         //#
         //# internal connection between GtpEndpoint and VirtualisationInfrastrcuture
         //#
-        virtualisationInfrastructure.ppp++ <--> Eth10G <--> upf_mec.filterGate;
+        virtualisationInfrastructure.ppp++ <--> Eth10G <--> upf_mec.dnPppg;
 
         for i=0..numIndependentMecApp-1 {
             independentMecApp[i].socketIn <-- virtualisationInfrastructure.independentMecAppOut[i];
diff --git a/src/simu5g/nodes/PgwStandard.ned b/src/simu5g/nodes/PgwStandard.ned
@@ -39,7 +39,7 @@ module PgwStandard extends ApplicationLayerNodeBase
         multicastForwarding = default(false);
 
     gates:
-        inout filterGate @labels(PppFrame-conn);
+        inout dnPppg @labels(PppFrame-conn);
 
     submodules:
         pppIf: PppInterface {
@@ -66,6 +66,6 @@ module PgwStandard extends ApplicationLayerNodeBase
 
         trafficFlowFilter.gtpUserGateOut --> gtp_user.trafficFlowFilterGate;
 
-        pppIf.phys <--> filterGate;
+        pppIf.phys <--> dnPppg;
 }
 
diff --git a/src/simu5g/nodes/Upf.ned b/src/simu5g/nodes/Upf.ned
@@ -39,7 +39,7 @@ module Upf extends ApplicationLayerNodeBase
     gates:
         // this gate is used for the UPF connected to the external data network
         // it must be left unconnected for intermediate UPFs
-        inout filterGate @loose @labels(PppFrame-conn);
+        inout dnPppg @loose @labels(PppFrame-conn);
 
     submodules:
         pppIf: PppInterface {
@@ -67,5 +67,5 @@ module Upf extends ApplicationLayerNodeBase
 
         trafficFlowFilter.gtpUserGateOut --> gtp_user.trafficFlowFilterGate;
 
-        pppIf.phys <--> filterGate;
+        pppIf.phys <--> dnPppg;
 }

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,6 @@ network ExtClientServerExample`
`65`	`65`	`@display("p=671,432;is=vl");`
`66`	`66`	`}`
`67`	`67`	`connections allowunconnected:`
`68`		`- router.pppg++ <--> Eth10G <--> upf.filterGate;`
	`68`	`+ router.pppg++ <--> Eth10G <--> upf.dnPppg;`
`69`	`69`	`upf.pppg++ <--> Eth10G <--> gnb.ppp;`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,6 @@ network ExtClientServer_bgCells`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`connections allowunconnected:`
`73`		`- router.pppg++ <--> Eth10G <--> upf.filterGate;`
	`73`	`+ router.pppg++ <--> Eth10G <--> upf.dnPppg;`
`74`	`74`	`upf.pppg++ <--> Eth10G <--> gnb.ppp;`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,6 @@ network ExtServerExample`
`70`	`70`	`@display("p=671,432;is=vl");`
`71`	`71`	`}`
`72`	`72`	`connections allowunconnected:`
`73`		`- router.pppg++ <--> Eth10G <--> upf.filterGate;`
	`73`	`+ router.pppg++ <--> Eth10G <--> upf.dnPppg;`
`74`	`74`	`upf.pppg++ <--> Eth10G <--> gnb.ppp;`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ network MultiCell`
`77`	`77`	`}`
`78`	`78`	`connections:`
`79`	`79`	`server.pppg++ <--> Eth10G <--> router.pppg++;`
`80`		`- router.pppg++ <--> Eth10G <--> pgw.filterGate;`
	`80`	`+ router.pppg++ <--> Eth10G <--> pgw.dnPppg;`
`81`	`81`	`pgw.pppg++ <--> Eth10G <--> eNodeB1.ppp;`
`82`	`82`	`pgw.pppg++ <--> Eth10G <--> eNodeB2.ppp;`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,6 @@ network MultiCell_D2DMultihop`
`121`	`121`	`router3.pppg++ <--> Eth10G <--> pgw.pppg++;`
`122`	`122`	`router4.pppg++ <--> Eth10G <--> pgw.pppg++;`
`123`	`123`	`router5.pppg++ <--> Eth10G <--> pgw.pppg++;`
`124`		`- router.pppg++ <--> Eth10G <--> pgw.filterGate;`
	`124`	`+ router.pppg++ <--> Eth10G <--> pgw.dnPppg;`
`125`	`125`	`server.pppg++ <--> Eth10G <--> router.pppg++;`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ network MultiCell_X2Mesh`
`86`	`86`	`}`
`87`	`87`	`connections:`
`88`	`88`
`89`		`- server.pppg++ <--> Eth10G <--> pgw.filterGate;`
	`89`	`+ server.pppg++ <--> Eth10G <--> pgw.dnPppg;`
`90`	`90`	`pgw.pppg++ <--> Eth10G <--> router1.pppg++;`
`91`	`91`	`pgw.pppg++ <--> Eth10G <--> router2.pppg++;`
`92`	`92`	`pgw.pppg++ <--> Eth10G <--> router3.pppg++;`