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

fixed how to retrieve the cots ue file location

Browse Source
This commit is contained in:
hardy
2020-09-09 15:14:18 +02:00
parent 1c77b36ae9
commit 4ec420271f
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_cots_ue.py
+22 -2
View File
@@ -46,6 +46,7 @@ class CotsUe:
self.__cots_cde_dict_file = 'cots_ue_ctl.yaml' self.__cots_cde_dict_file = 'cots_ue_ctl.yaml'
self.__SetAirplaneRetry = 3 self.__SetAirplaneRetry = 3
#-----------------$ #-----------------$
#PUBLIC Methods$ #PUBLIC Methods$
#-----------------$ #-----------------$
@@ -61,7 +62,16 @@ class CotsUe:
#returns true if it exists, false otherwise #returns true if it exists, false otherwise
def Check_Exists(self,target_id): def Check_Exists(self,target_id):
#load cots commands dictionary #load cots commands dictionary
with open(self.__cots_cde_dict_file,'r') as file: if (os.path.isfile(self.__cots_cde_dict_file)):
yaml_file=self.__cots_cde_dict_file
elif (os.path.isfile('ci-scripts/'+self.__cots_cde_dict_file)):
yaml_file='ci-scripts/'+self.__cots_cde_dict_file
else:
logging.error("COTS UE dictionary yaml file cannot be found")
sys.exit("COTS UE dictionary yaml file cannot be found")
#load cots commands dictionary
with open(yaml_file,'r') as file:
cots_ue_ctl = yaml.load(file,Loader=yaml.FullLoader) cots_ue_ctl = yaml.load(file,Loader=yaml.FullLoader)
#check if ue id is in the dictionary #check if ue id is in the dictionary
if target_id in cots_ue_ctl: if target_id in cots_ue_ctl:
@@ -70,8 +80,18 @@ class CotsUe:
return False return False
def Set_Airplane(self, target_id, target_state_str): def Set_Airplane(self, target_id, target_state_str):
#loading cots commands dictionary
if (os.path.isfile(self.__cots_cde_dict_file)):
yaml_file=self.__cots_cde_dict_file
elif (os.path.isfile('ci-scripts/'+self.__cots_cde_dict_file)):
yaml_file='ci-scripts/'+self.__cots_cde_dict_file
else:
logging.error("COTS UE dictionary yaml file cannot be found")
sys.exit("COTS UE dictionary yaml file cannot be found")
#load cots commands dictionary #load cots commands dictionary
with open(self.__cots_cde_dict_file,'r') as file: with open(yaml_file,'r') as file:
cots_ue_ctl = yaml.load(file,Loader=yaml.FullLoader) cots_ue_ctl = yaml.load(file,Loader=yaml.FullLoader)
#check if ue id is in the dictionary #check if ue id is in the dictionary
if target_id in cots_ue_ctl: if target_id in cots_ue_ctl: