IdleSleep(): no need for class members

This commit is contained in:
Robert Schmidt
2024-09-28 12:45:07 +02:00
parent 71807db4ab
commit e969ddb897
2 changed files with 7 additions and 11 deletions
+5 -5
View File
@@ -239,6 +239,11 @@ def Custom_Command(HTML, node, command, command_fail):
HTML.CreateHtmlTestRowQueue(command, status, message)
return status == 'OK' or status == 'Warning'
def IdleSleep(HTML, idle_sleep_time):
time.sleep(idle_sleep_time)
HTML.CreateHtmlTestRow(f"{idle_sleep_time} sec", 'OK', CONST.ALL_PROCESSES_OK)
return True
#-----------------------------------------------------------
# OaiCiTest Class Definition
#-----------------------------------------------------------
@@ -263,7 +268,6 @@ class OaiCiTest():
self.iperf_profile = ''
self.iperf_options = ''
self.iperf_tcp_rate_target = ''
self.idle_sleep_time = 0
self.finalStatus = False
self.UEIPAddress = ''
self.UEUserName = ''
@@ -915,10 +919,6 @@ class OaiCiTest():
CONTAINERS.UndeployGenObject(HTML,RAN,self)
RAN.prematureExit=True
def IdleSleep(self,HTML):
time.sleep(self.idle_sleep_time)
HTML.CreateHtmlTestRow(str(self.idle_sleep_time) + ' sec', 'OK', CONST.ALL_PROCESSES_OK)
def LogCollectBuild(self,RAN):
# Some pipelines are using "none" IP / Credentials
# In that case, just forget about it
+2 -6
View File
@@ -298,12 +298,8 @@ def ExecuteActionWithParam(action):
CiTestObj.Iperf2_Unidir(HTML,RAN,EPC,CONTAINERS)
elif action == 'IdleSleep':
string_field = test.findtext('idle_sleep_time_in_sec')
if (string_field is None):
CiTestObj.idle_sleep_time = 5
else:
CiTestObj.idle_sleep_time = int(string_field)
CiTestObj.IdleSleep(HTML)
st = test.findtext('idle_sleep_time_in_sec') or "5"
cls_oaicitest.IdleSleep(HTML, int(st))
elif action == 'Build_PhySim':
ldpc.buildargs = test.findtext('physim_build_args')