Merge "Stop OVS agent before starting it again"

neutron/tests/functional/agent/test_l2_ovs_agent.py

@@ -246,6 +246,7 @@ class TestOVSAgent(base.OVSAgentTestFramework):
         patch_int_ofport_before = self.agent.patch_int_ofport
         patch_tun_ofport_before = self.agent.patch_tun_ofport
 
+        self.stop_agent(self.agent, self.agent_thread)
         self.setup_agent_and_ports(port_dicts=[], create_tunnels=True)
         self.assertEqual(patch_int_ofport_before, self.agent.patch_int_ofport)
         self.assertEqual(patch_tun_ofport_before, self.agent.patch_tun_ofport)
@@ -257,6 +258,7 @@ class TestOVSAgent(base.OVSAgentTestFramework):
         patch_int_ofport_before = self.agent.int_ofports['physnet']
         patch_phys_ofport_before = self.agent.phys_ofports['physnet']
 
+        self.stop_agent(self.agent, self.agent_thread)
         self.setup_agent_and_ports(port_dicts=[])
         self.assertEqual(patch_int_ofport_before,
                          self.agent.int_ofports['physnet'])