From 1e35236519239ef2b4acbb78249502b7bd8ce9b8 Mon Sep 17 00:00:00 2001 From: Aaron Lee Date: Fri, 9 Dec 2011 17:53:15 -0600 Subject: fixed_ips by vif does not raise It makes more sense if this method returns an empty array instead of raising when it finds no ips. This lets the iteration over that array handle the 0 case, and we can use a conditional on the len(of the ips) if really needed. I'm not sure that log is needed to say "No fixed IPs deallocated" or if that is an artifact of needing something to put in the exception handler. Change-Id: Ib9f66affb5360fb11a3ab5f415a0e57602cec886 --- nova/db/api.py | 4 ++-- nova/db/sqlalchemy/api.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'nova/db') diff --git a/nova/db/api.py b/nova/db/api.py index bc413319e..0d9de80a0 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -416,9 +416,9 @@ def fixed_ip_get_by_network_host(context, network_id, host): return IMPL.fixed_ip_get_by_network_host(context, network_id, host) -def fixed_ip_get_by_virtual_interface(context, vif_id): +def fixed_ips_by_virtual_interface(context, vif_id): """Get fixed ips by virtual interface or raise if none exist.""" - return IMPL.fixed_ip_get_by_virtual_interface(context, vif_id) + return IMPL.fixed_ips_by_virtual_interface(context, vif_id) def fixed_ip_get_network(context, address): diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 2619c247f..9108ee825 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -876,15 +876,12 @@ def fixed_ip_get_by_network_host(context, network_id, host): @require_context -def fixed_ip_get_by_virtual_interface(context, vif_id): +def fixed_ips_by_virtual_interface(context, vif_id): result = model_query(context, models.FixedIp, read_deleted="no").\ options(joinedload('floating_ips')).\ filter_by(virtual_interface_id=vif_id).\ all() - if not result: - raise exception.FixedIpNotFoundForVirtualInterface(vif_id=vif_id) - return result -- cgit