From: Gary Kotton <gkotton@redhat.com>
Date: Mon, 14 Jan 2013 10:01:20 +0000 (+0000)
Subject: Add exception validation for subnet used.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d5526d6cc5f0ad6c724a21468661d5d6d9654cd2;p=openstack-build%2Fneutron-build.git

Add exception validation for subnet used.

As a result of bug 1093754 there was no validation of the actual
exception returned.

Change-Id: Ia3104ca523d30ea40c354afa62ed5ce2b88d5b7e
---

diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py
index dfad15381..e3ecdd26f 100644
--- a/quantum/tests/unit/test_db_plugin.py
+++ b/quantum/tests/unit/test_db_plugin.py
@@ -2052,10 +2052,13 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase):
     def test_delete_subnet_port_exists_owned_by_other(self):
         with self.subnet() as subnet:
             with self.port(subnet=subnet) as port:
-                req = self.new_delete_request('subnets',
-                                              subnet['subnet']['id'])
+                id = subnet['subnet']['id']
+                req = self.new_delete_request('subnets', id)
                 res = req.get_response(self.api)
+                data = self.deserialize('json', res)
                 self.assertEqual(res.status_int, 409)
+                msg = str(q_exc.SubnetInUse(subnet_id=id))
+                self.assertEqual(data['QuantumError'], msg)
 
     def test_delete_network(self):
         gateway_ip = '10.0.0.1'