From: Gary Kotton <gkotton@redhat.com>
Date: Wed, 26 Dec 2012 08:36:02 +0000 (+0000)
Subject: Correct exception output for subnet deletion when port is used
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=201a71aa2a1a77bd333e0601c3d356fb1cbdd4ff;p=openstack-build%2Fneutron-build.git

Correct exception output for subnet deletion when port is used

Fixes bug 1093754

Change-Id: I2deaced0cfc2524234ff79e39e6e7c2f757ff19f
---

diff --git a/quantum/db/db_base_plugin_v2.py b/quantum/db/db_base_plugin_v2.py
index 7538207e9..66b72e6e5 100644
--- a/quantum/db/db_base_plugin_v2.py
+++ b/quantum/db/db_base_plugin_v2.py
@@ -1164,7 +1164,7 @@ class QuantumDbPluginV2(quantum_plugin_base_v2.QuantumPluginBaseV2):
                                 a.ports.device_owner in AUTO_DELETE_PORT_OWNERS
                                 for a in allocated)
             if not only_auto_del:
-                raise q_exc.NetworkInUse(subnet_id=id)
+                raise q_exc.SubnetInUse(subnet_id=id)
 
             # remove network owned ports
             for allocation in allocated: