openstack/fuel-main
Code Issues Proposed changes

model info typererror

Browse Source
This commit is contained in:
Nikolay Markov 2012-09-20 18:22:39 +04:00 committed by default
parent fb8a9081fb
commit ae366239d9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nailgun/api/models.py
View File

@ -127,13 +127,13 @@ class Node(Base, BasicValidator):
kilobytes = int(self.meta['memory']['total'][:-2]) kilobytes = int(self.meta['memory']['total'][:-2])
gigabytes = kilobytes / 1024.0 ** 2 gigabytes = kilobytes / 1024.0 ** 2
result['ram'] = gigabytes result['ram'] = gigabytes
except (KeyError, ValueError): except (KeyError, ValueError, TypeError):
result['ram'] = None result['ram'] = None
try: try:
result['cpu'] = self.meta['cpu']['real'] result['cpu'] = self.meta['cpu']['real']
result['cores'] = self.meta['cpu']['total'] result['cores'] = self.meta['cpu']['total']
except (KeyError, ValueError): except (KeyError, ValueError, TypeError):
result['cpu'] = None result['cpu'] = None
result['cores'] = None result['cores'] = None