Merge "Stop OVS agent before starting it again" into stable/queens
This commit is contained in:
commit
b145e884ab
|
@ -243,6 +243,7 @@ class TestOVSAgent(base.OVSAgentTestFramework):
|
||||||
patch_int_ofport_before = self.agent.patch_int_ofport
|
patch_int_ofport_before = self.agent.patch_int_ofport
|
||||||
patch_tun_ofport_before = self.agent.patch_tun_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.setup_agent_and_ports(port_dicts=[], create_tunnels=True)
|
||||||
self.assertEqual(patch_int_ofport_before, self.agent.patch_int_ofport)
|
self.assertEqual(patch_int_ofport_before, self.agent.patch_int_ofport)
|
||||||
self.assertEqual(patch_tun_ofport_before, self.agent.patch_tun_ofport)
|
self.assertEqual(patch_tun_ofport_before, self.agent.patch_tun_ofport)
|
||||||
|
@ -254,6 +255,7 @@ class TestOVSAgent(base.OVSAgentTestFramework):
|
||||||
patch_int_ofport_before = self.agent.int_ofports['physnet']
|
patch_int_ofport_before = self.agent.int_ofports['physnet']
|
||||||
patch_phys_ofport_before = self.agent.phys_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.setup_agent_and_ports(port_dicts=[])
|
||||||
self.assertEqual(patch_int_ofport_before,
|
self.assertEqual(patch_int_ofport_before,
|
||||||
self.agent.int_ofports['physnet'])
|
self.agent.int_ofports['physnet'])
|
||||||
|
|
Loading…
Reference in New Issue