Merge "Resync L3, DHCP and OVS/LB agents upon revival"

diff --cc neutron/agent/dhcp/agent.py
Simple merge

diff --cc neutron/agent/l3/agent.py
Simple merge

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

diff --cc neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
Simple merge

diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index 8212af6a2133b81e565c9ea27aa7dd345e2f6722,5e00c4839fdb26352c6ff9fe61abfc07528c0ab1..ea51b95af0d7dd215d061bd4b9afe1caa2ae8c30
--- 1/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
--- 2/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@@ -1668,8 -1657,11 +1671,12 @@@ class OVSNeutronAgent(sg_rpc.SecurityGr
          tunnel_sync = True
          ovs_restarted = False
          consecutive_resyncs = 0
 +        need_clean_stale_flow = True
          while self._check_and_handle_signal():
+             if self.fullsync:
+                 LOG.info(_LI("rpc_loop doing a full sync."))
+                 sync = True
+                 self.fullsync = False
              port_info = {}
              ancillary_port_info = {}
              start = time.time()

diff --cc neutron/tests/unit/agent/dhcp/test_agent.py
Simple merge

diff --cc neutron/tests/unit/agent/l3/test_agent.py
Simple merge

diff --cc neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py
Simple merge

diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
Simple merge