Skip to content

O
OpenXG UE
Commit 0530a1b5 authored by hardy's avatar hardy
Browse files
Options

fixing ping analysis (extra stats) for module UE

parent a980ffc9
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
ci-scripts/cls_oaicitest.py
View file @ 0530a1b5
...@@ -1579,6 +1579,7 @@ class OaiCiTest(): ...@@ -1579,6 +1579,7 @@ class OaiCiTest():
SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password) SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
#cat is executed on EPC #cat is executed on EPC
SSH.command('cat ' + EPC.SourceCodePath + '/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '\$', 5) SSH.command('cat ' + EPC.SourceCodePath + '/scripts/ping_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
ping_log_file='ping_' + self.testCase_id + '_' + device_id + '.log'
else: #launch from Module else: #launch from Module
SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword) SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
#target address is different depending on EPC type #target address is different depending on EPC type
...@@ -1596,6 +1597,7 @@ class OaiCiTest(): ...@@ -1596,6 +1597,7 @@ class OaiCiTest():
#cat is executed locally #cat is executed locally
SSH.command('cat ping_' + self.testCase_id + '_' + self.ue_id + '.log', '\$', 5) SSH.command('cat ping_' + self.testCase_id + '_' + self.ue_id + '.log', '\$', 5)
ping_log_file='ping_' + self.testCase_id + '_' + self.ue_id + '.log'
ping_status=0 ping_status=0
# TIMEOUT CASE # TIMEOUT CASE
...@@ -1643,7 +1645,7 @@ class OaiCiTest(): ...@@ -1643,7 +1645,7 @@ class OaiCiTest():
logging.debug('\u001B[1;34m ' + max_msg + '\u001B[0m') logging.debug('\u001B[1;34m ' + max_msg + '\u001B[0m')
#adding extra ping stats from local file #adding extra ping stats from local file
ping_log_file='ping_' + self.testCase_id + '_' + device_id + '.log' #ping_log_file variable is defined above in this function, depending on device/ue
logging.debug('Analyzing Ping log file : ' + os.getcwd() + '/' + ping_log_file) logging.debug('Analyzing Ping log file : ' + os.getcwd() + '/' + ping_log_file)
ping_stat=GetPingTimeAnalysis(ping_log_file) ping_stat=GetPingTimeAnalysis(ping_log_file)
ping_stat_msg='' ping_stat_msg=''
...@@ -2088,12 +2090,12 @@ class OaiCiTest(): ...@@ -2088,12 +2090,12 @@ class OaiCiTest():
packetloss += '%' packetloss += '%'
#checking packet loss compliance #checking packet loss compliance
if float(pl) > float(self.iperf_packetloss_threshold): if float(pl) > float(self.iperf_packetloss_threshold):
pal_too_high_msg = 'Packet Loss too high : actual = '+packetloss+', target = '+self.iperf_packetloss_threshold+'%' pal_too_high_msg = 'Packet Loss too high : tested = '+packetloss+', target = '+self.iperf_packetloss_threshold+'%'
else: else:
pal_too_high_msg='Packet Loss value is within acceptance range' pal_too_high_msg='Packet Loss value is within acceptance range'
#checking bitrate perf compliance #checking bitrate perf compliance
if float(br_loss) < float(self.iperf_bitrate_threshold): if float(br_loss) < float(self.iperf_bitrate_threshold):
bit_too_low_msg = 'Bitrate too low : actual = '+bitperf+', target = '+self.iperf_bitrate_threshold+'%' bit_too_low_msg = 'Bitrate too low : tested = '+bitperf+', target = '+self.iperf_bitrate_threshold+'%'
else: else:
bit_too_low_msg='Bitrate perf value is within acceptance range' bit_too_low_msg='Bitrate perf value is within acceptance range'
lock.acquire() lock.acquire()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment