CI: fix sanity check deployment scripts

Signed-off-by: Raphael Defosseux <raphael.defosseux@openairinterface.org>

ci-scripts/generateConfigFiles.py

@@ -32,6 +32,7 @@ class spgwuConfigGen():
 		self.spgwc0_ip_addr = ''
 		self.fromDockerFile = False
 		self.envForEntrypoint = False
+		self.network_ue_ip = '12.1.1.0/24'
 
 	def GenerateSpgwuConfigurer(self):
 		spgwuFile = open('./spgwu-cfg.sh', 'w')
@@ -80,6 +81,7 @@ class spgwuConfigGen():
 		spgwuFile.write('SGW_INTERFACE_NAME_FOR_SX=' + self.sxu_name + '\n')
 		spgwuFile.write('PGW_INTERFACE_NAME_FOR_SGI=eth0\n')
 		spgwuFile.write('SPGWC0_IP_ADDRESS=' + self.spgwc0_ip_addr + '\n')
+		spgwuFile.write('NETWORK_UE_IP=' + self.network_ue_ip + '\n')
 		spgwuFile.close()
 
 #-----------------------------------------------------------

ci-scripts/sanityCheckDeploy.py

@@ -96,6 +96,9 @@ class deploySanityCheckTest():
             subprocess_run_w_echo('python3 ci-scripts/generateSpgwcConfigFiles.py --kind=SPGW-C --s11c=eth0 --sxc=eth1 --from_docker_file')
             subprocess_run_w_echo('docker cp ./spgwc-cfg.sh ci-oai-spgwc:/openair-spgwc')
             subprocess_run_w_echo('docker exec -it ci-oai-spgwc /bin/bash -c "cd /openair-spgwc && chmod 777 spgwc-cfg.sh && ./spgwc-cfg.sh" >> archives/spgwc_config.log')
+            # If we deploy a SPGW-U w/ entrypoint, SPGW-C SHALL be started
+            # This will be removed later on.
+            subprocess_run_w_echo('docker exec -d ci-oai-spgwc /bin/bash -c "nohup ./bin/oai_spgwc -o -c ./etc/spgw_c.conf > spgwc_check_run.log 2>&1"')
 
     def deploySPGWU(self):
         res = ''
@@ -144,7 +147,8 @@ class deploySanityCheckTest():
         if entrypoint is not None:
             print('there is an entrypoint -- no need')
         else:
-            subprocess_run_w_echo('docker exec -d ci-oai-spgwc /bin/bash -c "nohup ./bin/oai_spgwc -o -c ./etc/spgw_c.conf > spgwc_check_run.log 2>&1"')
+            print('Already started')
+            #subprocess_run_w_echo('docker exec -d ci-oai-spgwc /bin/bash -c "nohup ./bin/oai_spgwc -o -c ./etc/spgw_c.conf > spgwc_check_run.log 2>&1"')
 
     def startSPGWU(self):
         res = ''