except IOError as e:
raise vimconn.vimconnException("Error reading file '{}': {}".format(flavor_data[1:], e))
elif isinstance(flavor_data, dict):
- self.flavor_data = flavor_data
+ self.flavor_info = flavor_data
self.logger = logging.getLogger('openmano.vim.aws')
if log_level:
try:
flavor = None
for key, values in self.flavor_info.iteritems():
- if (values["memory"], values["cores"], values["disk"]) == (
- flavor_dict["ram"], flavor_dict["cpus"], flavor_dict["disk"]):
+ if (values["ram"], values["cpus"], values["disk"]) == (
+ flavor_dict["ram"], flavor_dict["vcpus"], flavor_dict["disk"]):
flavor = (key, values)
break
- elif (values["memory"], values["cores"], values["disk"]) >= (
- flavor_dict["ram"], flavor_dict["cpus"], flavor_dict["disk"]):
+ elif (values["ram"], values["cpus"], values["disk"]) >= (
+ flavor_dict["ram"], flavor_dict["vcpus"], flavor_dict["disk"]):
if not flavor:
flavor = (key, values)
else:
- if (flavor[1]["memory"], flavor[1]["cores"], flavor[1]["disk"]) >= (
- values["memory"], values["cores"], values["disk"]):
+ if (flavor[1]["ram"], flavor[1]["cpus"], flavor[1]["disk"]) >= (
+ values["ram"], values["cpus"], values["disk"]):
flavor = (key, values)
if flavor:
return flavor[0]