summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
12690ed)
Change-Id: I092245407d4acdb75b373e40905d9fc2e2b44b20
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
__author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes"
__date__ = "$26-aug-2014 11:09:29$"
__author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes"
__date__ = "$26-aug-2014 11:09:29$"
-__version__ = "0.5.76-r586"
-version_date = "Ago 2018"
+__version__ = "0.5.77-r587"
+version_date = "Sep 2018"
database_version = 32 # expected database schema version
database_version = 32 # expected database schema version
js_v(client_data, used_schema)
return client_data, used_schema
js_v(client_data, used_schema)
return client_data, used_schema
- except (ValueError, yaml.YAMLError) as exc:
+ except (TypeError, ValueError, yaml.YAMLError) as exc:
error_text += str(exc)
logger.error(error_text)
bottle.abort(HTTP_Bad_Request, error_text)
error_text += str(exc)
logger.error(error_text)
bottle.abort(HTTP_Bad_Request, error_text)
for index in range(0,len(devices_original)) :
device=devices_original[index]
if "image" not in device and "image name" not in device:
for index in range(0,len(devices_original)) :
device=devices_original[index]
if "image" not in device and "image name" not in device:
- if 'size' in device:
- disk_list.append({'size': device.get('size', default_volume_size), 'name': device.get('name')})
+ # if 'size' in device:
+ disk_list.append({'size': device.get('size', default_volume_size), 'name': device.get('name')})
continue
image_dict={}
image_dict['name']=device.get('image name',flavor_dict['name']+str(dev_nb)+"-img")
continue
image_dict={}
image_dict['name']=device.get('image name',flavor_dict['name']+str(dev_nb)+"-img")