From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 21 Aug 2015 00:47:55 +0000 (+0000)
Subject: Merge "Graceful ovs-agent restart"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6616c9f745bd3e733763c449dfdfe5d90fa2ce46;p=openstack-build%2Fneutron-build.git

Merge "Graceful ovs-agent restart"
---

6616c9f745bd3e733763c449dfdfe5d90fa2ce46
diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
index 47cba3aa7,d92035059..07c02f362
--- a/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)