xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 01:56:39 +00:00
Code Issues Releases Wiki Activity

rewrite validatehelper with python to process complex scenario

Browse Source
This commit is contained in:
immarvin 2018-03-28 03:39:46 -04:00
parent b634fc8795
commit 9fe1bac09a
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
xCAT-test/autotest/testcase/xcat-inventory/validatehelper
View File

@ -50,6 +50,7 @@ def Util_setdictval(mydict,keystr,value):
else:
mydict[key]=value
def GetAttrInFile(fpath,objtype,objname,attrpath):
f=open(fpath,'r')
try:
@ -63,10 +64,23 @@ def GetAttrInFile(fpath,objtype,objname,attrpath):
f.close()
myattrpath=objtype+"."+objname+"."+attrpath
myvalue=Util_getdictval(objdict,myattrpath)
if isinstance(myvalue,list):
myvalue=myvalue[0]
return myvalue
def compattr(exptattr,rawattr):
if isinstance(exptattr,list) and isinstance(rawattr,str):
rawattr=eval(rawattr)
if isinstance(rawattr,str):
if rawattr in exptattr:
return 0
else:
return 1
else:
return cmp(exptattr,rawattr)
else:
return cmp(exptattr,rawattr)
def runCommand(cmd, env=None):
""" Run one command only, when you don't want to bother setting up
the Popen stuff.
@ -106,10 +120,15 @@ def UpdateAttrInFile(fpath,fformat,objtype,objname,attrpath,value):
Util_rmnullindict(objdict)
else:
origobjdict=Util_getdictval(objdict,myattrpath)
if isinstance(origobjdict,list) and not isinstance(value,list):
newvalue=[value]
origattrtype=type(origobjdict)
if origattrtype != str and type(value) == str:
print(value)
newvalue=eval(value)
else:
newvalue=value
if isinstance(origobjdict,list) and isinstance(value,str):
newvalue=[value]
else:
newvalue=value
Util_setdictval(objdict,myattrpath,newvalue)
f=open(fpath,'w')
if fformat == "yaml":
@ -191,7 +210,7 @@ else:
if myattrvalue is not None:
rcyaml=1
else:
if myattrvalue != attrvalue:
if compattr(myattrvalue,attrvalue) != 0 :
rcyaml=1
if rcyaml == 0:
@ -229,7 +248,7 @@ else:
if myattrvalue is not None:
rcjson=1
else:
if myattrvalue != attrvalue:
if compattr(myattrvalue,attrvalue) != 0 :
rcjson=1
if rcjson ==0: