Revision 8b7c2fc3 snf-cyclades-app/synnefo/api/util.py
| b/snf-cyclades-app/synnefo/api/util.py | ||
|---|---|---|
| 196 | 196 |
return Flavor.objects.get(id=flavor_id) |
| 197 | 197 |
else: |
| 198 | 198 |
return Flavor.objects.get(id=flavor_id, deleted=include_deleted) |
| 199 |
except (ValueError, Flavor.DoesNotExist): |
|
| 199 |
except (ValueError, TypeError): |
|
| 200 |
raise faults.BadRequest("Invalid flavor ID '%s'" % flavor_id)
|
|
| 201 |
except Flavor.DoesNotExist: |
|
| 200 | 202 |
raise faults.ItemNotFound('Flavor not found.')
|
| 201 | 203 |
|
| 202 | 204 |
|
| ... | ... | |
| 228 | 230 |
if non_deleted and network.deleted: |
| 229 | 231 |
raise faults.BadRequest("Network has been deleted.")
|
| 230 | 232 |
return network |
| 231 |
except (ValueError, Network.DoesNotExist): |
|
| 233 |
except (ValueError, TypeError): |
|
| 234 |
raise faults.BadRequest("Invalid network ID '%s'" % network_id)
|
|
| 235 |
except Network.DoesNotExist: |
|
| 232 | 236 |
raise faults.ItemNotFound('Network %s not found.' % network_id)
|
| 233 | 237 |
|
| 234 | 238 |
|
| ... | ... | |
| 243 | 247 |
# if (port.device_owner != "vm") and for_update: |
| 244 | 248 |
# raise faults.BadRequest('Cannot update non vm port')
|
| 245 | 249 |
return objects.get(id=port_id) |
| 246 |
except (ValueError, NetworkInterface.DoesNotExist): |
|
| 250 |
except (ValueError, TypeError): |
|
| 251 |
raise faults.BadRequest("Invalid port ID '%s'" % port_id)
|
|
| 252 |
except NetworkInterface.DoesNotExist: |
|
| 247 | 253 |
raise faults.ItemNotFound("Port '%s' not found." % port_id)
|
| 248 | 254 |
|
| 249 | 255 |
|
Also available in: Unified diff