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

wip : fr1 set up automation / fixing issues from recent changes

Browse Source
This commit is contained in:
Remi Hardy
2020-07-22 17:53:28 +02:00
parent 4b48e457ba
commit 220445f157
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/main.py
+5 -5
View File
@@ -3320,9 +3320,9 @@ EPC = epc.EPCManagement()
RAN = ran.RANManagement() RAN = ran.RANManagement()
HTML = html.HTMLManagement() HTML = html.HTMLManagement()
EPC.HtmlObj=HTML EPC.htmlObj=HTML
RAN.HtmlObj=HTML RAN.htmlObj=HTML
RAN.EpcObj=EPC RAN.epcObj=EPC
ldpc=cls_physim.PhySim() #create an instance for LDPC test using GPU or CPU build ldpc=cls_physim.PhySim() #create an instance for LDPC test using GPU or CPU build
@@ -3336,7 +3336,7 @@ ldpc=cls_physim.PhySim() #create an instance for LDPC test using GPU or CPU b
argvs = sys.argv argvs = sys.argv
argc = len(argvs) argc = len(argvs)
cwd = os.getcwd() cwd = os.getcwd()
py_param_file_present = False
while len(argvs) > 1: while len(argvs) > 1:
myArgv = argvs.pop(1) # 0th is this file's name myArgv = argvs.pop(1) # 0th is this file's name
@@ -3352,7 +3352,7 @@ while len(argvs) > 1:
with open(py_params_file,'r') as file: with open(py_params_file,'r') as file:
# The FullLoader parameter handles the conversion from YAML # The FullLoader parameter handles the conversion from YAML
# scalar values to Python dictionary format # scalar values to Python dictionary format
py_params = yaml.load(file,Loader=yaml.FullLoader) py_params = yaml.load(file,Loader=yaml.FullLoader)
py_param_file_present = True #to be removed once validated py_param_file_present = True #to be removed once validated
#AssignParams(py_params) #to be uncommented once validated #AssignParams(py_params) #to be uncommented once validated
ci-scripts/ran.py
+6 -5
View File
@@ -274,7 +274,7 @@ class RANManagement():
if self.Build_eNB_forced_workspace_cleanup: if self.Build_eNB_forced_workspace_cleanup:
mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15) mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15)
if self.htmlObj is not None: if self.htmlObj is not None:
self.testCase_id = self.htmlObj.GettestCase_id() self.testCase_id = self.htmlObj.testCase_id
else: else:
self.testCase_id = '000000' self.testCase_id = '000000'
# on RedHat/CentOS .git extension is mandatory # on RedHat/CentOS .git extension is mandatory
@@ -388,7 +388,7 @@ class RANManagement():
def checkBuildeNB(self, lIpAddr, lUserName, lPassWord, lSourcePath, testcaseId): def checkBuildeNB(self, lIpAddr, lUserName, lPassWord, lSourcePath, testcaseId):
if self.htmlObj is not None: if self.htmlObj is not None:
self.htmlObj.SettestCase_id(testcaseId) self.htmlObj.testCase_id=testcaseId
mySSH = SSH.SSHConnection() mySSH = SSH.SSHConnection()
mySSH.open(lIpAddr, lUserName, lPassWord) mySSH.open(lIpAddr, lUserName, lPassWord)
@@ -397,6 +397,7 @@ class RANManagement():
mySSH.command('ls ran_build/build', '\$', 3) mySSH.command('ls ran_build/build', '\$', 3)
#check if we have the build corresponding to the air interface keywords (nr-softmode, lte-softmodem, ocp-enb) #check if we have the build corresponding to the air interface keywords (nr-softmode, lte-softmodem, ocp-enb)
logging.info('CHECK Build with IP='+lIpAddr+' SourcePath='+lSourcePath)
result = re.search(self.air_interface, mySSH.getBefore()) result = re.search(self.air_interface, mySSH.getBefore())
if result is None: if result is None:
buildStatus = False #if not, build failed buildStatus = False #if not, build failed
@@ -471,7 +472,7 @@ class RANManagement():
sys.exit('Insufficient Parameter') sys.exit('Insufficient Parameter')
if self.htmlObj is not None: if self.htmlObj is not None:
self.testCase_id = self.htmlObj.GettestCase_id() self.testCase_id = self.htmlObj.testCase_id
else: else:
self.testCase_id = '000000' self.testCase_id = '000000'
mySSH = SSH.SSHConnection() mySSH = SSH.SSHConnection()
@@ -762,7 +763,7 @@ class RANManagement():
if (copyin_res == -1): if (copyin_res == -1):
logging.debug('\u001B[1;37;41m Could not copy ' + nodeB_prefix + 'NB logfile to analyze it! \u001B[0m') logging.debug('\u001B[1;37;41m Could not copy ' + nodeB_prefix + 'NB logfile to analyze it! \u001B[0m')
if self.htmlObj is not None: if self.htmlObj is not None:
self.htmlObj.SetHmleNBFailureMsg('Could not copy ' + nodeB_prefix + 'NB logfile to analyze it!') self.htmlObj.HmleNBFailureMsg='Could not copy ' + nodeB_prefix + 'NB logfile to analyze it!'
self.htmlObj.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE) self.htmlObj.CreateHtmlTestRow('N/A', 'KO', CONST.ENB_PROCESS_NOLOGFILE_TO_ANALYZE)
self.eNBmbmsEnables[int(self.eNB_instance)] = False self.eNBmbmsEnables[int(self.eNB_instance)] = False
return return
@@ -1065,5 +1066,5 @@ class RANManagement():
htmleNBFailureMsg += rlcMsg + '\n' htmleNBFailureMsg += rlcMsg + '\n'
global_status = CONST.ENB_PROCESS_REALTIME_ISSUE global_status = CONST.ENB_PROCESS_REALTIME_ISSUE
if self.htmlObj is not None: if self.htmlObj is not None:
self.htmlObj.SetHmleNBFailureMsg(htmleNBFailureMsg) self.htmlObj.HmleNBFailureMsg=htmleNBFailureMsg
return global_status return global_status
ci-scripts/xml_files/fr1_multi_node_build.xml
+1
View File
@@ -60,4 +60,5 @@
<eNB_serverId>1</eNB_serverId> <eNB_serverId>1</eNB_serverId>
</testCase> </testCase>
</testCaseList> </testCaseList>
ci-scripts/xml_files/fr1_toggle_cots_ue.xml
+2 -2
View File
@@ -21,8 +21,8 @@
--> -->
<testCaseList> <testCaseList>
<htmlTabRef>test-toggle-airplane-mode</htmlTabRef> <htmlTabRef>test-airplane-mode</htmlTabRef>
<htmlTabName>Airplane</htmlTabName> <htmlTabName>AirplaneToggle</htmlTabName>
<htmlTabIcon>tasks</htmlTabIcon> <htmlTabIcon>tasks</htmlTabIcon>
<TestCaseRequestedList> <TestCaseRequestedList>
010000 010000