Merge "Remove port from ovsdb after its deletion"

diff --cc neutron/plugins/ml2/plugin.py
Simple merge

diff --cc neutron/plugins/ml2/rpc.py
Simple merge

diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
index a500187ba18b4a2819489d8071d353d39e249f40,b3199421be29f7ac22fae1785baa2f9a5ce81ce4..33847f534ac87ce72de8a6a75e1a37bec920d8f2
--- 1/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
--- 2/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
@@@ -292,9 -294,9 +292,10 @@@ class OVSNeutronAgent(sg_rpc.SecurityGr
          self.endpoints = [self]
          # Define the listening consumers for the agent
          consumers = [[topics.PORT, topics.UPDATE],
+                      [topics.PORT, topics.DELETE],
                       [topics.NETWORK, topics.DELETE],
                       [constants.TUNNEL, topics.UPDATE],
 +                     [constants.TUNNEL, topics.DELETE],
                       [topics.SECURITY_GROUP, topics.UPDATE],
                       [topics.DVR, topics.UPDATE]]
          if self.l2_pop:

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

diff --cc neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
Simple merge