From f53706c14dc52cd74c29f1dca9315d5d2aa89a17 Mon Sep 17 00:00:00 2001 From: Alan Quillin Date: Tue, 27 Oct 2015 18:18:05 -0400 Subject: [PATCH] Fixed http status code when floating ip id is invalid. --- quark/exceptions.py | 2 +- quark/plugin_modules/floating_ips.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/quark/exceptions.py b/quark/exceptions.py index af24acd..0823777 100644 --- a/quark/exceptions.py +++ b/quark/exceptions.py @@ -145,7 +145,7 @@ class NoBackendConnectionsDefined(exceptions.NeutronException): "definition. %(msg)") -class FloatingIpNotFound(exceptions.NeutronException): +class FloatingIpNotFound(exceptions.NotFound): message = _("Floating IP %(id)s not found.") diff --git a/quark/plugin_modules/floating_ips.py b/quark/plugin_modules/floating_ips.py index c872c9e..ff757ce 100644 --- a/quark/plugin_modules/floating_ips.py +++ b/quark/plugin_modules/floating_ips.py @@ -163,10 +163,11 @@ def update_floatingip(context, id, content): port = None fixed_ip = None current_port = None - flip = None with context.session.begin(): flip = db_api.floating_ip_find(context, id=id, scope=db_api.ONE) + if not flip: + raise qex.FloatingIpNotFound(id=id) current_ports = flip.ports