Use try block for field splitting

pull/10304/head
Dagobert Michelsen 10 years ago
parent 90e760ba84
commit c1dba60961

@ -2507,18 +2507,21 @@ class SunOSVirtual(Virtual):
# DOMAINROLE|impl=LDoms|control=false|io=false|service=false|root=false # DOMAINROLE|impl=LDoms|control=false|io=false|service=false|root=false
# The output may also be not formated and the returncode is set to 0 regardless of the error condition: # The output may also be not formated and the returncode is set to 0 regardless of the error condition:
# virtinfo can only be run from the global zone # virtinfo can only be run from the global zone
for line in out.split('\n'): try:
fields = line.split('|') for line in out.split('\n'):
if( fields[0] == 'DOMAINROLE' and fields[1] == 'impl=LDoms' ): fields = line.split('|')
self.facts['virtualization_type'] = 'ldom' if( fields[0] == 'DOMAINROLE' and fields[1] == 'impl=LDoms' ):
self.facts['virtualization_role'] = 'guest' self.facts['virtualization_type'] = 'ldom'
hostfeatures = [] self.facts['virtualization_role'] = 'guest'
for field in fields[2:]: hostfeatures = []
arg = field.split('=') for field in fields[2:]:
if( arg[1] == 'true' ): arg = field.split('=')
hostfeatures.append(arg[0]) if( arg[1] == 'true' ):
if( len(hostfeatures) > 0 ): hostfeatures.append(arg[0])
self.facts['virtualization_role'] = 'host (' + ','.join(hostfeatures) + ')' if( len(hostfeatures) > 0 ):
self.facts['virtualization_role'] = 'host (' + ','.join(hostfeatures) + ')'
except ValueError, e:
pass
def get_file_content(path, default=None, strip=True): def get_file_content(path, default=None, strip=True):
data = default data = default

Loading…
Cancel
Save