maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IperfFromContainer: Undeploy automatically on failure, like for Ping

Browse Source
This commit is contained in:
Robert Schmidt
2022-11-25 07:49:55 +01:00
parent 277786bc71
commit d2a35f70c7
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_containerize.py
+13 -5
View File
@@ -1345,7 +1345,7 @@ class Containerize():
self.UndeployGenObject(HTML, RAN, UE) self.UndeployGenObject(HTML, RAN, UE)
self.exitStatus = 1 self.exitStatus = 1
def IperfFromContainer(self, HTML, RAN): def IperfFromContainer(self, HTML, RAN, UE):
self.exitStatus = 0 self.exitStatus = 0
ymlPath = self.yamlPath[0].split('/') ymlPath = self.yamlPath[0].split('/')
@@ -1382,7 +1382,7 @@ class Containerize():
message = 'Could not connect to iperf server!' message = 'Could not connect to iperf server!'
else: else:
message = 'Server Report and Connection refused Not Found!' message = 'Server Report and Connection refused Not Found!'
self.IperfExit(HTML, False, message) self.IperfExit(HTML, RAN, UE, False, message)
logging.error('\u001B[1;37;41m Iperf Test FAIL\u001B[0m') logging.error('\u001B[1;37;41m Iperf Test FAIL\u001B[0m')
return return
@@ -1449,17 +1449,17 @@ class Containerize():
if jitter is not None: if jitter is not None:
msg += 'Jitter : ' + jitter + '\n' msg += 'Jitter : ' + jitter + '\n'
logging.debug('\u001B[1;34m Jitter : ' + jitter + '\u001B[0m') logging.debug('\u001B[1;34m Jitter : ' + jitter + '\u001B[0m')
self.IperfExit(HTML, iperfStatus, msg) self.IperfExit(HTML, RAN, UE, iperfStatus, msg)
else: else:
iperfStatus = False iperfStatus = False
logging.error('problem?') logging.error('problem?')
self.IperfExit(HTML, iperfStatus, 'problem?') self.IperfExit(HTML, RAN, UE, iperfStatus, 'problem?')
if iperfStatus: if iperfStatus:
logging.info('\u001B[1m Iperf Test PASS\u001B[0m') logging.info('\u001B[1m Iperf Test PASS\u001B[0m')
else: else:
logging.error('\u001B[1;37;41m Iperf Test FAIL\u001B[0m') logging.error('\u001B[1;37;41m Iperf Test FAIL\u001B[0m')
def IperfExit(self, HTML, status, message): def IperfExit(self, HTML, RAN, UE, status, message):
html_queue = SimpleQueue() html_queue = SimpleQueue()
html_cell = '<pre style="background-color:white">UE\n' + message + '</pre>' html_cell = '<pre style="background-color:white">UE\n' + message + '</pre>'
html_queue.put(html_cell) html_queue.put(html_cell)
@@ -1468,6 +1468,14 @@ class Containerize():
else: else:
logging.error('\u001B[1m Iperf Test FAIL -- ' + message + ' \u001B[0m') logging.error('\u001B[1m Iperf Test FAIL -- ' + message + ' \u001B[0m')
HTML.CreateHtmlTestRowQueue(self.cliOptions, 'KO', 1, html_queue) HTML.CreateHtmlTestRowQueue(self.cliOptions, 'KO', 1, html_queue)
# Automatic undeployment
logging.warning('----------------------------------------')
logging.warning('\u001B[1m Starting Automatic undeployment \u001B[0m')
logging.warning('----------------------------------------')
HTML.testCase_id = 'AUTO-UNDEPLOY'
HTML.desc = 'Automatic Un-Deployment'
self.UndeployGenObject(HTML, RAN, UE)
self.exitStatus = 1
def CheckAndAddRoute(self, svrName, ipAddr, userName, password): def CheckAndAddRoute(self, svrName, ipAddr, userName, password):
ci-scripts/main.py
+1 -1
View File
@@ -1013,7 +1013,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
if CONTAINERS.exitStatus==1: if CONTAINERS.exitStatus==1:
RAN.prematureExit = True RAN.prematureExit = True
elif action == 'IperfFromContainer': elif action == 'IperfFromContainer':
CONTAINERS.IperfFromContainer(HTML, RAN) CONTAINERS.IperfFromContainer(HTML, RAN, CiTestObj)
if CONTAINERS.exitStatus==1: if CONTAINERS.exitStatus==1:
RAN.prematureExit = True RAN.prematureExit = True
elif action == 'StatsFromGenObject': elif action == 'StatsFromGenObject':