Config file: hardcoded instance to 0, changed SGi iface name prefix from SGW to PGW

ci-scripts/generateConfigFiles.py

@@ -61,7 +61,7 @@ class spgwuConfigGen():
 		spgwuFile.write('SPGWU_CONF[@SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP@]=\'' + self.s1u_name + '\'\n')
 		spgwuFile.write('SPGWU_CONF[@SGW_INTERFACE_NAME_FOR_SX@]=\'' + self.sxu_name + '\'\n')
 		# SGI is fixed on SGI
-		spgwuFile.write('SPGWU_CONF[@SGW_INTERFACE_NAME_FOR_SGI@]=\'eth0\'\n')
+		spgwuFile.write('SPGWU_CONF[@PGW_INTERFACE_NAME_FOR_SGI@]=\'eth0\'\n')
 		spgwuFile.write('SPGWU_CONF[@SPGWC0_IP_ADDRESS@]=\'' + self.spgwc0_ip_addr + '\'\n')
 		spgwuFile.write('\n')
 		spgwuFile.write('for K in "${!SPGWU_CONF[@]}"; do \n')
@@ -78,7 +78,7 @@ class spgwuConfigGen():
 		spgwuFile.write('PID_DIRECTORY=/var/run\n')
 		spgwuFile.write('SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=' + self.s1u_name + '\n')
 		spgwuFile.write('SGW_INTERFACE_NAME_FOR_SX=' + self.sxu_name + '\n')
-		spgwuFile.write('SGW_INTERFACE_NAME_FOR_SGI=eth0\n')
+		spgwuFile.write('PGW_INTERFACE_NAME_FOR_SGI=eth0\n')
 		spgwuFile.write('SPGWC0_IP_ADDRESS=' + self.spgwc0_ip_addr + '\n')
 		spgwuFile.close()
 

etc/spgw_u.conf

@@ -20,7 +20,7 @@
 ################################################################################
 SPGW-U =
 {
-    INSTANCE                       = @INSTANCE@;            # 0 is the default
+    INSTANCE                       = 0;            # 0 is the default
     PID_DIRECTORY                  = "@PID_DIRECTORY@";     # /var/run is the default
 
     #ITTI_TASKS :
@@ -82,7 +82,7 @@ SPGW-U =
         SGI :
         {
            # No config to set, the software will set the SGi interface to the interface used for the default route.
-            INTERFACE_NAME         = "@SGW_INTERFACE_NAME_FOR_SGI@"; # STRING, interface name or "default_gateway"
+            INTERFACE_NAME         = "@PGW_INTERFACE_NAME_FOR_SGI@"; # STRING, interface name or "default_gateway"
             IPV4_ADDRESS           = "read";                         # STRING, CIDR or "read" to let app read interface configured IP address
             #SCHED_PARAMS :
             #{
@@ -94,11 +94,7 @@ SPGW-U =
     };
 
     PDN_NETWORK_LIST  = (
-                      {NETWORK_IPV4 = "12.1.1.0/24"; NETWORK_IPV6 = "2001:1:2::0/64"; SNAT = "yes";},
-                      {NETWORK_IPV4 = "12.1.2.0/24"; SNAT = "no";},
-                      {NETWORK_IPV4 = "192.169.0.0/24"; SNAT = "no";},
-                      {NETWORK_IPV4 = "192.170.0.0/24"; SNAT = "no";},
-                      {NETWORK_IPV4 = "192.171.0.0/24"; SNAT = "no";}
+                      {NETWORK_IPV4 = "@NETWORK_UE_IP@"; SNAT = "no";}
                     );
 
     SPGW-C_LIST = (