Merge "Break coupling between ML2 and L3 during delete operation"

diff --cc neutron/common/exceptions.py
Simple merge

diff --cc neutron/plugins/ml2/plugin.py
index 5fca2bc4ed3732a7023f5deef0d7b1b460b774df,6eb1669c6619733a7a599cf724d649388c8efa57..a90fecdf6bb9ec6ad2ecf81b5fa42bdfdde820c3
--- 1/neutron/plugins/ml2/plugin.py
--- 2/neutron/plugins/ml2/plugin.py
+++ b/neutron/plugins/ml2/plugin.py
@@@ -1257,12 -1202,11 +1281,12 @@@ class Ml2Plugin(db_base_plugin_v2.Neutr
              # delete the port.  Ideally we'd notify the caller of the
              # fact that an error occurred.
              LOG.error(_LE("mechanism_manager.delete_port_postcommit failed for"
-                           " port %s"), id)
-         self.notifier.port_delete(context, id)
+                           " port %s"), port['id'])
+         self.notifier.port_delete(context, port['id'])
          self.notify_security_groups_member_updated(context, port)
  
 -    def get_bound_port_context(self, plugin_context, port_id, host=None):
 +    def get_bound_port_context(self, plugin_context, port_id, host=None,
 +                               cached_networks=None):
          session = plugin_context.session
          with session.begin(subtransactions=True):
              try:

diff --cc neutron/tests/unit/db/test_l3_dvr_db.py
Simple merge

diff --cc neutron/tests/unit/ml2/test_ml2_plugin.py
Simple merge