From 5a24210b45b5120f33c0f796766a59af792af37a Mon Sep 17 00:00:00 2001
From: hardy <remi.hardy@openairinterface.org>
Date: Tue, 14 Sep 2021 22:29:33 +0200
Subject: [PATCH] check if container is running

---
 ci-scripts/epc.py           | 17 ++++++++++++-----
 ci-scripts/sshconnection.py | 12 ++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ci-scripts/epc.py b/ci-scripts/epc.py
index dead126fcd..24712cc427 100644
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -235,6 +235,11 @@ class EPCManagement():
 			mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
 			mySSH.command('cd /opt/oai-cn5g-fed/docker-compose', '\$', 5)
 			mySSH.command('./core-network.sh start nrf spgwu', '\$', 30)
+			#time.sleep(10)
+			#response = mySSH.command3('docker inspect --format=\'{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}\' oai-amf', 5)
+			#self.MmeIPAddress = str(response[0],'utf-8')
+			#self.MmeIPAddress.rstrip()
+			#logging.debug('AMF IP Address ' + self.MmeIPAddress)			
 		else:
 			logging.error('This option should not occur!')
 		mySSH.close()
@@ -251,10 +256,12 @@ class EPCManagement():
 		elif re.match('OAICN5G', self.Type, re.IGNORECASE):
 			mySSH = SSH.SSHConnection()
 			mySSH.open(self.IPAddress, self.UserName, self.Password)
-			mySSH.command2('docker inspect --format=\'{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}\' oai-amf', 5)
-			self.MmeIPAddress = str(mySSH.cmd2Results[0],'utf-8')
-			self.MmeIPAddress.rstrip()
-			logging.debug('AMF IP Address ' + self.MmeIPAddress)
+			response=mySSH.command3('docker container ls -f name=oai-amf', 10)
+			if len(response)>1:
+				response=mySSH.command3('docker inspect --format=\'{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}\' oai-amf', 10)
+				tmp = str(response[0],'utf-8')
+				self.MmeIPAddress = tmp.rstrip()
+				logging.debug('AMF IP Address ' + self.MmeIPAddress)
 			mySSH.close()
 
 	def CheckHSSProcess(self, status_queue):
@@ -459,7 +466,7 @@ class EPCManagement():
 			self.LogCollectOAICN5G()
 			logging.debug('Terminating OAI CN5G')
 			mySSH.command('cd /opt/oai-cn5g-fed/docker-compose', '\$', 5)
-			mySSH.command('./core-network.sh stop nrf spgwu', '\$', 5)
+			mySSH.command('./core-network.sh stop nrf spgwu', '\$', 30)
 		else:
 			logging.error('This should not happen!')
 		mySSH.close()
diff --git a/ci-scripts/sshconnection.py b/ci-scripts/sshconnection.py
index b4087c9695..b85c40a0be 100644
--- a/ci-scripts/sshconnection.py
+++ b/ci-scripts/sshconnection.py
@@ -163,6 +163,18 @@ class SSHConnection():
 		lSsh = subprocess.Popen(["ssh", "%s" % myHost, commandline],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
 		self.cmd2Results = str(lSsh.stdout.readlines())
 
+	def command3(self, commandline, timeout, silent=False):
+		if not silent:
+			logging.debug(commandline)
+		self.cmd2Results = ''
+		myHost = self.username + '@' + self.ipaddress
+		# CAUTION: THIS METHOD IMPLIES THAT THERE ARE VALID SSH KEYS
+		# BETWEEN THE PYTHON EXECUTOR NODE AND THE REMOTE HOST
+		# OTHERWISE IT WON'T WORK
+		lSsh = subprocess.Popen(["ssh", "%s" % myHost, commandline],shell=False,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+		return lSsh.stdout.readlines()
+
+		
 	def close(self):
 		self.ssh.timeout = 5
 		self.ssh.sendline('exit')