made subnet as variable

scripts/entrypoint.sh

@@ -47,9 +47,11 @@ SGI_IPV4=$(ifconfig $INTERFACE_CORE | grep "inet " | awk '{print $2}')
 ACCESS_IPV4=$(ifconfig $INTERFACE_ACCESS | grep "inet " | awk '{print $2}')
 CORE_IPV4=$(ifconfig $INTERFACE_CP | grep "inet " | awk '{print $2}')
 
-N3_IPV4_ADDRESS_LOCAL=${N3_IPV4_ADDRESS_LOCAL:-$(ifconfig $INTERFACE_ACCESS | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202"}
-N4_IPV4_ADDRESS_LOCAL=${N4_IPV4_ADDRESS_LOCAL:-$(ifconfig $INTERFACE_CP | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202"}
-N6_IPV4_ADDRESS_LOCAL=${N6_IPV4_ADDRESS_LOCAL:-$(ifconfig $INTERFACE_CORE | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202"}
+N3_IPV4_ADDRESS_LOCAL=${N3_IPV4_ADDRESS_LOCAL:-$(ifconfig $INTERFACE_ACCESS | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202/24"}
+GTP_ENDPOINT_ACCESS=${N3_IPV4_ADDRESS_LOCAL%/*}
+N4_IPV4_ADDRESS_LOCAL=${N4_IPV4_ADDRESS_LOCAL:-$(ifconfig $INTERFACE_CP | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202/24"}
+PFCP_ENDPOINT=${N4_IPV4_ADDRESS_LOCAL%/*}
+N6_IPV4_ADDRESS_LOCAL=${N6_IPV4_ADDRESS_LOCAL:-$(ifconfig $INTERFACE_CORE | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202/24"}
 
 N3_IPV4_ADDRESS_REMOTE=${N3_IPV4_ADDRESS_REMOTE:-$(ifconfig $INTERFACE_ACCESS | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".1"}
 N4_IPV4_ADDRESS_REMOTE=${N4_IPV4_ADDRESS_REMOTE:-$(ifconfig $INTERFACE_CP | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".1"}

scripts/upf_conf/init.conf

@@ -4,26 +4,26 @@ ip table add 2
 create host-interface name n6
 set interface mtu 1500 host-n6
 set interface ip table host-n6 1
-set interface ip address host-n6 @N6_IPV4_ADDRESS_LOCAL@/24
+set interface ip address host-n6 @N6_IPV4_ADDRESS_LOCAL@
 set interface state host-n6 up
 
 create host-interface name n4
 set interface mtu 1500 host-n4
 set interface ip table host-n4 0
-set interface ip address host-n4 @N4_IPV4_ADDRESS_LOCAL@/24
+set interface ip address host-n4 @N4_IPV4_ADDRESS_LOCAL@
 set interface state host-n4 up
 
 create host-interface name n3
 set interface mtu 1500 host-n3
 set interface ip table host-n3 2
-set interface ip address host-n3 @N3_IPV4_ADDRESS_LOCAL@/24
+set interface ip address host-n3 @N3_IPV4_ADDRESS_LOCAL@
 set interface state host-n3 up
 
 ip route add 0.0.0.0/0 table 2 via @N3_IPV4_ADDRESS_REMOTE@ host-n3
 ip route add 0.0.0.0/0 table 0 via @N4_IPV4_ADDRESS_REMOTE@ host-n4
 ip route add 0.0.0.0/0 table 1 via @N6_IPV4_ADDRESS_REMOTE@ host-n6
 
-upf pfcp endpoint ip @N4_IPV4_ADDRESS_LOCAL@ vrf 0
+upf pfcp endpoint ip @PFCP_ENDPOINT@ vrf 0
 upf node-id fqdn gw@GW_ID@.vppupf.node.5gcn.mnc@MNC03@.mcc@MCC@.@REALM@
 
 upf nwi name @NWI_N3@ vrf 2
@@ -31,4 +31,4 @@ upf nwi name @NWI_N6@ vrf 1
 
 upf specification release 16
 
-upf gtpu endpoint ip @N3_IPV4_ADDRESS_LOCAL@ nwi @NWI_N3@ teid 0x000004d2/2
+upf gtpu endpoint ip @GTP_ENDPOINT_ACCESS@ nwi @NWI_N3@ teid 0x000004d2/2