Merge "Delete subnet fails if assoc port has IPs from another subnet"

diff --cc neutron/db/db_base_plugin_v2.py
Simple merge

diff --cc neutron/tests/unit/test_db_plugin.py
index cb7bb311a885fd7bcd98cb9ee2e112937fadf80d,11680269eb7f986f0dac3c6a6f1758118145dfe4..4369280200716b63148fd15f0090da52f16ae705
--- 1/neutron/tests/unit/test_db_plugin.py
--- 2/neutron/tests/unit/test_db_plugin.py
+++ b/neutron/tests/unit/test_db_plugin.py
@@@ -2489,9 -2427,25 +2489,25 @@@ class TestSubnetsV2(NeutronDbPluginV2Te
                  res = req.get_response(self.api)
                  data = self.deserialize(self.fmt, res)
                  self.assertEqual(res.status_int, webob.exc.HTTPConflict.code)
 -                msg = str(q_exc.SubnetInUse(subnet_id=id))
 +                msg = str(n_exc.SubnetInUse(subnet_id=id))
                  self.assertEqual(data['NeutronError']['message'], msg)
  
+     def test_delete_subnet_with_other_subnet_on_network_still_in_use(self):
+         with self.network() as network:
+             with contextlib.nested(
+                 self.subnet(network=network),
+                 self.subnet(network=network, cidr='10.0.1.0/24',
+                             do_delete=False)) as (subnet1, subnet2):
+                 subnet1_id = subnet1['subnet']['id']
+                 subnet2_id = subnet2['subnet']['id']
+                 with self.port(
+                     subnet=subnet1,
+                     fixed_ips=[{'subnet_id': subnet1_id}]):
+                     req = self.new_delete_request('subnets', subnet2_id)
+                     res = req.get_response(self.api)
+                     self.assertEqual(res.status_int,
+                                      webob.exc.HTTPNoContent.code)
+ 
      def test_delete_network(self):
          gateway_ip = '10.0.0.1'
          cidr = '10.0.0.0/24'