From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 20 Mar 2015 19:53:34 +0000 (+0000)
Subject: Merge "Break coupling between ML2 and L3 during delete operation"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=921562841bb7d5ced641af217a0911fee3251c4c;p=openstack-build%2Fneutron-build.git

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

921562841bb7d5ced641af217a0911fee3251c4c
diff --cc neutron/plugins/ml2/plugin.py
index 5fca2bc4e,6eb1669c6..a90fecdf6
--- a/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: