cleaned-removed commented-out legacy code
This commit is contained in:
Remi Hardy
@@ -3084,12 +3084,6 @@ class OaiCiTest():
|
||||
|
||||
|
||||
def CheckClassValidity(xml_class_list,action,id):
|
||||
# if action !='COTS_UE_Airplane' and action!='Build_PhySim' and action!='Run_PhySim' and action != 'Build_eNB' and action != 'WaitEndBuild_eNB' and action != 'Initialize_eNB' and action != 'Terminate_eNB' and
|
||||
# action != 'Initialize_UE' and action != 'Terminate_UE' and action != 'Attach_UE' and action != 'Detach_UE' and action != 'Build_OAI_UE' and action != 'Initialize_OAI_UE' and action != 'Terminate_OAI_UE' and
|
||||
# action != 'DataDisable_UE' and action != 'DataEnable_UE' and action != 'CheckStatusUE' and action != 'Ping' and action != 'Iperf' and action != 'Reboot_UE' and action != 'Initialize_FlexranCtrl' and
|
||||
# action != 'Terminate_FlexranCtrl' and action != 'Initialize_HSS' and action != 'Terminate_HSS' and action != 'Initialize_MME' and action != 'Terminate_MME' and action != 'Initialize_SPGW' and
|
||||
# action != 'Terminate_SPGW' and action != 'Initialize_CatM_module' and action != 'Terminate_CatM_module' and action != 'Attach_CatM_module' and action != 'Detach_CatM_module' and
|
||||
# action != 'Ping_CatM_module' and action != 'IdleSleep' and action != 'Perform_X2_Handover':
|
||||
if action not in xml_class_list:
|
||||
logging.debug('ERROR: test-case ' + id + ' has unlisted class ' + action + ' ##CHECK xml_class_list.yml')
|
||||
resp=False
|
||||
@@ -3339,187 +3333,6 @@ ldpc=cls_physim.PhySim() #create an instance for LDPC test using GPU or CPU b
|
||||
import args_parse
|
||||
py_param_file_present, py_params, mode = args_parse.ArgsParse(sys.argv,CiTestObj,RAN,HTML,EPC,ldpc,HELP)
|
||||
|
||||
#argvs = sys.argv
|
||||
#py_param_file_present = False
|
||||
#
|
||||
#while len(argvs) > 1:
|
||||
# myArgv = argvs.pop(1) # 0th is this file's name
|
||||
#
|
||||
# #--help
|
||||
# if re.match('^\-\-help$', myArgv, re.IGNORECASE):
|
||||
# HELP.GenericHelp(CONST.Version)
|
||||
# sys.exit(0)
|
||||
#
|
||||
# #--apply=<filename> as parameters file, to replace inline parameters
|
||||
# elif re.match('^\-\-Apply=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-Apply=(.+)$', myArgv, re.IGNORECASE)
|
||||
# py_params_file = matchReg.group(1)
|
||||
# with open(py_params_file,'r') as file:
|
||||
# # The FullLoader parameter handles the conversion from YAML
|
||||
# # scalar values to Python dictionary format
|
||||
# py_params = yaml.load(file,Loader=yaml.FullLoader)
|
||||
# py_param_file_present = True #to be removed once validated
|
||||
# #AssignParams(py_params) #to be uncommented once validated
|
||||
#
|
||||
# #consider inline parameters
|
||||
# elif re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
|
||||
# mode = matchReg.group(1)
|
||||
# elif re.match('^\-\-eNBRepository=(.+)$|^\-\-ranRepository(.+)$', myArgv, re.IGNORECASE):
|
||||
# if re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE)
|
||||
# else:
|
||||
# matchReg = re.match('^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.ranRepository = matchReg.group(1)
|
||||
# RAN.ranRepository=matchReg.group(1)
|
||||
# HTML.ranRepository=matchReg.group(1)
|
||||
# ldpc.ranRepository=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
|
||||
# if re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
|
||||
# else:
|
||||
# matchReg = re.match('^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
|
||||
# doMerge = matchReg.group(1)
|
||||
# ldpc.ranAllowMerge=matchReg.group(1)
|
||||
# if ((doMerge == 'true') or (doMerge == 'True')):
|
||||
# CiTestObj.ranAllowMerge = True
|
||||
# RAN.ranAllowMerge=True
|
||||
# HTML.ranAllowMerge=True
|
||||
# elif re.match('^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
|
||||
# if re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
|
||||
# else:
|
||||
# matchReg = re.match('^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.ranBranch = matchReg.group(1)
|
||||
# RAN.ranBranch=matchReg.group(1)
|
||||
# HTML.ranBranch=matchReg.group(1)
|
||||
# ldpc.ranBranch=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
|
||||
# if re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
|
||||
# else:
|
||||
# matchReg = re.match('^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.ranCommitID = matchReg.group(1)
|
||||
# RAN.ranCommitID=matchReg.group(1)
|
||||
# HTML.ranCommitID=matchReg.group(1)
|
||||
# ldpc.ranCommitID=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
|
||||
# if re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
|
||||
# else:
|
||||
# matchReg = re.match('^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.ranTargetBranch = matchReg.group(1)
|
||||
# RAN.ranTargetBranch=matchReg.group(1)
|
||||
# HTML.ranTargetBranch=matchReg.group(1)
|
||||
# ldpc.ranTargetBranch=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
|
||||
# if re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNBIPAddress=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNBIPAddress=matchReg.group(1)
|
||||
# ldpc.eNBIpAddr=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNB1IPAddress=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNB1IPAddress=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNB2IPAddress=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNB2IPAddress=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
|
||||
# if re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNBUserName=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNBUserName=matchReg.group(1)
|
||||
# ldpc.eNBUserName=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNB1UserName=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNB1UserName=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNB2UserName=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNB2UserName=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
|
||||
# if re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNBPassword=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNBPassword=matchReg.group(1)
|
||||
# ldpc.eNBPassWord=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNB1Password=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNB1Password=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNB2Password=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNB2Password=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
|
||||
# if re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNBSourceCodePath=matchReg.group(1)
|
||||
# ldpc.eNBSourceCodePath=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNB1SourceCodePath=matchReg.group(1)
|
||||
# elif re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE)
|
||||
# RAN.eNB2SourceCodePath=matchReg.group(1)
|
||||
# elif re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-EPCIPAddress=(.+)$', myArgv, re.IGNORECASE)
|
||||
# EPC.IPAddress=matchReg.group(1)
|
||||
# elif re.match('^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-EPCUserName=(.+)$', myArgv, re.IGNORECASE)
|
||||
# EPC.UserName=matchReg.group(1)
|
||||
# elif re.match('^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-EPCPassword=(.+)$', myArgv, re.IGNORECASE)
|
||||
# EPC.Password=matchReg.group(1)
|
||||
# elif re.match('^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-EPCSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
|
||||
# EPC.SourceCodePath=matchReg.group(1)
|
||||
# elif re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-EPCType=(.+)$', myArgv, re.IGNORECASE)
|
||||
# if re.match('OAI', matchReg.group(1), re.IGNORECASE) or re.match('ltebox', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-CUPS', matchReg.group(1), re.IGNORECASE) or re.match('OAI-Rel14-Docker', matchReg.group(1), re.IGNORECASE):
|
||||
# EPC.Type=matchReg.group(1)
|
||||
# else:
|
||||
# sys.exit('Invalid EPC Type: ' + matchReg.group(1) + ' -- (should be OAI or ltebox or OAI-Rel14-CUPS or OAI-Rel14-Docker)')
|
||||
# elif re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-EPCContainerPrefix=(.+)$', myArgv, re.IGNORECASE)
|
||||
# EPC.ContainerPrefix=matchReg.group(1)
|
||||
# elif re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-ADBIPAddress=(.+)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.ADBIPAddress = matchReg.group(1)
|
||||
# elif re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-ADBUserName=(.+)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.ADBUserName = matchReg.group(1)
|
||||
# elif re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-ADBType=(.+)$', myArgv, re.IGNORECASE)
|
||||
# if re.match('centralized', matchReg.group(1), re.IGNORECASE) or re.match('distributed', matchReg.group(1), re.IGNORECASE):
|
||||
# if re.match('distributed', matchReg.group(1), re.IGNORECASE):
|
||||
# CiTestObj.ADBCentralized = False
|
||||
# else:
|
||||
# CiTestObj.ADBCentralized = True
|
||||
# else:
|
||||
# sys.exit('Invalid ADB Type: ' + matchReg.group(1) + ' -- (should be centralized or distributed)')
|
||||
# elif re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-ADBPassword=(.+)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.ADBPassword = matchReg.group(1)
|
||||
# elif re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.testXMLfiles.append(matchReg.group(1))
|
||||
# HTML.testXMLfiles=matchReg.group(1)
|
||||
# HTML.nbTestXMLfiles=HTML.nbTestXMLfiles+1
|
||||
# elif re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-UEIPAddress=(.+)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.UEIPAddress = matchReg.group(1)
|
||||
# elif re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-UEUserName=(.+)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.UEUserName = matchReg.group(1)
|
||||
# elif re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-UEPassword=(.+)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.UEPassword = matchReg.group(1)
|
||||
# elif re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-UESourceCodePath=(.+)$', myArgv, re.IGNORECASE)
|
||||
# CiTestObj.UESourceCodePath = matchReg.group(1)
|
||||
# elif re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE):
|
||||
# matchReg = re.match('^\-\-finalStatus=(.+)$', myArgv, re.IGNORECASE)
|
||||
# finalStatus = matchReg.group(1)
|
||||
# if ((finalStatus == 'true') or (finalStatus == 'True')):
|
||||
# CiTestObj.finalStatus = True
|
||||
# else:
|
||||
# HELP.GenericHelp(CONST.Version)
|
||||
# sys.exit('Invalid Parameter: ' + myArgv)
|
||||
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user