Commit ef0f5c66 authored by Bipin Adhikari's avatar Bipin Adhikari

Fixed minor error handling issues in from my last commit

parent ea798204
......@@ -284,7 +284,7 @@ class OaiCiTest():
self.air_interface=''
self.ue_ids = []
self.nodes = []
self.svr_node = None
self.svr_node = ''
self.svr_id = None
self.cmd_prefix = '' # prefix before {lte,nr}-uesoftmodem
......
......@@ -217,8 +217,8 @@ def GetParametersFromXML(action):
elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
CiTestObj.ue_ids = test.findtext('id').split(' ')
CiTestObj.nodes = test.findtext('nodes').split(' ')
print('-----------------------------------set citestobj.nodes as ',test.findtext('nodes').split(' '), len(test.findtext('nodes').split(' ')))
if test.findtext('nodes'):
CiTestObj.nodes = test.findtext('nodes').split(' ')
elif action == 'Build_OAI_UE':
CiTestObj.Build_OAI_UE_args = test.findtext('Build_OAI_UE_args')
......@@ -265,17 +265,18 @@ def GetParametersFromXML(action):
CiTestObj.ping_args = test.findtext('ping_args')
CiTestObj.ping_packetloss_threshold = test.findtext('ping_packetloss_threshold')
CiTestObj.ue_ids = test.findtext('id').split(' ')
CiTestObj.nodes = test.findtext('nodes').split(' ')
print('-----------------------------------set citestonj.nodes as ',test.findtext('nodes').split(' '), len(test.findtext('nodes').split(' ')))
if test.findtext('nodes'):
CiTestObj.nodes = test.findtext('nodes').split(' ')
ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or ''
elif action == 'Iperf':
CiTestObj.iperf_args = test.findtext('iperf_args')
CiTestObj.ue_ids = test.findtext('id').split(' ')
CiTestObj.svr_id = test.findtext('svr_id') or None
CiTestObj.nodes = test.findtext('nodes').split(' ')
CiTestObj.svr_node = test.findtext('svr_node') or None
print('-----------------------------------set citestonj.nodes as ',test.findtext('nodes').split(' '), len(test.findtext('nodes').split(' ')))
if test.findtext('nodes'):
CiTestObj.nodes = test.findtext('nodes').split(' ')
if test.findtext('svr_node'):
CiTestObj.svr_node = test.findtext('svr_node')
CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')
CiTestObj.iperf_bitrate_threshold = test.findtext('iperf_bitrate_threshold') or '90'
CiTestObj.iperf_profile = test.findtext('iperf_profile') or 'balanced'
......
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