Skip to content

Commit

Permalink
Improvement of version compare implementation
Browse files Browse the repository at this point in the history 
See : yvguim#4
- change version compare implementation by using standard Python class (StrictVersion + LooseVersion + String compare)
- use OR logical operator if multiple software is matching condition
  • Loading branch information
@dam09fr
dam09fr committed May 10, 2016
1 parent 0c5d6f8 commit 3f0d552
Showing 1 changed file with 25 additions and 99 deletions.
124 changes: 25 additions & 99 deletions inventory/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,21 @@
from datetime import datetime
from django.utils.timezone import utc
from xml.sax.saxutils import escape
from distutils.version import LooseVersion, StrictVersion
import sys

def compare_versions(version1, version2):
try:
return cmp(StrictVersion(version1), StrictVersion(version2))
# in case of abnormal version number, fall back to LooseVersion
except ValueError:
pass
try:
return cmp(LooseVersion(version1), LooseVersion(version2))
# certain LooseVersion comparions raise due to unorderable types, fallback to string comparison
except TypeError:
return cmp([str(v) for v in LooseVersion(version1).version], [str(v) for v in LooseVersion(version2).version])

def is_deploy_authorized(m,handling):
"""Function that define if deploy is authorized or not"""
# Loading configuration datas
Expand Down Expand Up @@ -181,58 +194,15 @@ def check_conditions(m,pack):
nametab = condition.softwarename.split('*')
if software.objects.filter(host_id=m.id, name__startswith=nametab[0],name__endswith=nametab[1]).exists():
softtab = software.objects.filter(host_id=m.id, name__startswith=nametab[0],name__endswith=nametab[1])
condversiontab = condition.softwareversion.split('.')
install = False
for s in softtab:
vclean = re.sub('[^.0-9]','',s.version)
vtab = vclean.split('.')
if len(condversiontab) > len(vtab):
looplimit = len(vtab)
else:
looplimit = len(condversiontab)
for i in range(0, looplimit):
try:
if int(condversiontab[i]) > int(vtab[i]):
install = True
break
if int(condversiontab[i]) < int(vtab[i]):
break
except ValueError:
if condversiontab[i] > vtab[i]:
install = True
break
if condversiontab[i] < vtab[i]:
break

if install == False:
status('<Packagestatus><Mid>'+str(m.id)+'</Mid><Pid>'+str(pack.id)+'</Pid><Status>Warning condition: '+escape(condition.name)+'</Status></Packagestatus>')
if compare_versions(softtab, condition.softwareversion) < 0:
install = False
else:
if software.objects.filter(host_id=m.id, name=condition.softwarename).exists():
softtab = software.objects.filter(host_id=m.id, name=condition.softwarename)
condversiontab = condition.softwareversion.split('.')
install = False
for s in softtab:
vclean = re.sub('[^.0-9]','',s.version)
vtab = vclean.split('.')
if len(condversiontab) > len(vtab):
looplimit = len(vtab)
else:
looplimit = len(condversiontab)
for i in range(0, looplimit):
try:
if int(condversiontab[i]) > int(vtab[i]):
install = True
break
if int(condversiontab[i]) < int(vtab[i]):
break
except ValueError:
if condversiontab[i] > vtab[i]:
install = True
break
if condversiontab[i] < vtab[i]:
break
if install == False:
status('<Packagestatus><Mid>'+str(m.id)+'</Mid><Pid>'+str(pack.id)+'</Pid><Status>Warning condition: '+escape(condition.name)+'</Status></Packagestatus>')
if compare_versions(softtab, condition.softwareversion) < 0:
install = False
if install == False:
status('<Packagestatus><Mid>'+str(m.id)+'</Mid><Pid>'+str(pack.id)+'</Pid><Status>Warning condition: '+escape(condition.name)+'</Status></Packagestatus>')

# Software installed and version higher than
if install == True:
Expand All @@ -241,63 +211,19 @@ def check_conditions(m,pack):
nametab = condition.softwarename.split('*')
if software.objects.filter(host_id=m.id, name__startswith=nametab[0],name__endswith=nametab[1]).exists():
softtab = software.objects.filter(host_id=m.id, name__startswith=nametab[0],name__endswith=nametab[1])
condversiontab = condition.softwareversion.split('.')
install = False
for s in softtab:
vclean = re.sub('[^.0-9]','',s.version)
vtab = vclean.split('.')
if len(condversiontab) > len(vtab):
looplimit = len(vtab)
else:
looplimit = len(condversiontab)
for i in range(0, looplimit):
try:
if int(condversiontab[i]) < int(vtab[i]):
install = True
break
if int(condversiontab[i]) > int(vtab[i]):
break
except ValueError:
if condversiontab[i] < vtab[i]:
install = True
break
if condversiontab[i] > vtab[i]:
break
if install == False:
status('<Packagestatus><Mid>'+str(m.id)+'</Mid><Pid>'+str(pack.id)+'</Pid><Status>Warning condition: '+escape(condition.name)+'</Status></Packagestatus>')
if compare_versions(softtab, condition.softwareversion) > 0:
install = False
else:
install = False
status('<Packagestatus><Mid>'+str(m.id)+'</Mid><Pid>'+str(pack.id)+'</Pid><Status>Warning condition: '+escape(condition.name)+'</Status></Packagestatus>')
else:
if software.objects.filter(host_id=m.id, name=condition.softwarename).exists():
softtab = software.objects.filter(host_id=m.id, name=condition.softwarename)
condversiontab = condition.softwareversion.split('.')
install = False
for s in softtab:
vclean = re.sub('[^.0-9]','',s.version)
vtab = vclean.split('.')
if len(condversiontab) > len(vtab):
looplimit = len(vtab)
else:
looplimit = len(condversiontab)
for i in range(0, looplimit):
try:
if int(condversiontab[i]) < int(vtab[i]):
install = True
break
if int(condversiontab[i]) > int(vtab[i]):
break
except ValueError:
if condversiontab[i] < vtab[i]:
install = True
break
if condversiontab[i] > vtab[i]:
break
if install == False:
status('<Packagestatus><Mid>'+str(m.id)+'</Mid><Pid>'+str(pack.id)+'</Pid><Status>Warning condition: '+escape(condition.name)+'</Status></Packagestatus>')
if compare_versions(softtab, condition.softwareversion) > 0:
install = False
else:
install = False
status('<Packagestatus><Mid>'+str(m.id)+'</Mid><Pid>'+str(pack.id)+'</Pid><Status>Warning condition: '+escape(condition.name)+'</Status></Packagestatus>')
if install == False:
status('<Packagestatus><Mid>'+str(m.id)+'</Mid><Pid>'+str(pack.id)+'</Pid><Status>Warning condition: '+escape(condition.name)+'</Status></Packagestatus>')

return install

Expand Down

0 comments on commit 3f0d552

Please sign in to comment.