Merge "Graceful ovs-agent restart"

diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
Simple merge

diff --cc neutron/tests/common/net_helpers.py
Simple merge

diff --cc neutron/tests/functional/agent/l2/base.py
Simple merge

diff --cc neutron/tests/unit/agent/common/test_ovs_lib.py
Simple merge

diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
index 47cba3aa75d18c5cb38fb8380ea3388b9d79dec8,d92035059e4d0941e292bae13045608747ee2539..07c02f36251a08de2ffca8092d0777e3da255d0a
--- 1/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
--- 2/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
@@@ -405,8 -405,11 +405,11 @@@ class TestOvsNeutronAgent(object)
                                                  'devices_down': details,
                                                  'failed_devices_up': [],
                                                  'failed_devices_down': []}),\
+                 mock.patch.object(self.agent.int_br,
+                     'get_port_tag_dict',
+                     return_value={}),\
                  mock.patch.object(self.agent, func_name) as func:
 -            skip_devs, need_bound_devices = (
 +            skip_devs, need_bound_devices, insecure_ports = (
                  self.agent.treat_devices_added_or_updated([{}], False))
              # The function should not raise
              self.assertFalse(skip_devs)
@@@ -501,9 -506,11 +507,11 @@@
                  mock.patch.object(self.agent.int_br,
                                    'get_vifs_by_ids',
                                    return_value={'xxx': mock.MagicMock()}),\
+                 mock.patch.object(self.agent.int_br, 'get_port_tag_dict',
+                                   return_value={}),\
                  mock.patch.object(self.agent,
                                    'treat_vif_port') as treat_vif_port:
 -            skip_devs, need_bound_devices = (
 +            skip_devs, need_bound_devices, insecure_ports = (
                  self.agent.treat_devices_added_or_updated([{}], False))
              # The function should return False for resync
              self.assertFalse(skip_devs)