x/vmware-nsx
Code Issues Proposed changes

Merge "Execute udevadm on other linux installs"

Browse Source
This commit is contained in:
Jenkins 2014-11-18 21:37:13 +00:00 committed by Gerrit Code Review
commit f9d3e91789
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ofagent/agent/ofa_neutron_agent.py
View File

@ -604,7 +604,7 @@ class OFANeutronAgent(n_rpc.RpcCallback,
# Give udev a chance to process its rules here, to avoid # Give udev a chance to process its rules here, to avoid
# race conditions between commands launched by udev rules # race conditions between commands launched by udev rules
# and the subsequent call to ip_wrapper.add_veth # and the subsequent call to ip_wrapper.add_veth
utils.execute(['/sbin/udevadm', 'settle', '--timeout=10']) utils.execute(['udevadm', 'settle', '--timeout=10'])
def _phys_br_create_veth(self, br, int_veth_name, def _phys_br_create_veth(self, br, int_veth_name,
phys_veth_name, physical_network, ip_wrapper): phys_veth_name, physical_network, ip_wrapper):

2
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
View File

@ -907,7 +907,7 @@ class OVSNeutronAgent(n_rpc.RpcCallback,
# Give udev a chance to process its rules here, to avoid # Give udev a chance to process its rules here, to avoid
# race conditions between commands launched by udev rules # race conditions between commands launched by udev rules
# and the subsequent call to ip_wrapper.add_veth # and the subsequent call to ip_wrapper.add_veth
utils.execute(['/sbin/udevadm', 'settle', '--timeout=10']) utils.execute(['udevadm', 'settle', '--timeout=10'])
int_veth, phys_veth = ip_wrapper.add_veth(int_if_name, int_veth, phys_veth = ip_wrapper.add_veth(int_if_name,
phys_if_name) phys_if_name)
int_ofport = self.int_br.add_port(int_veth) int_ofport = self.int_br.add_port(int_veth)

2
neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
View File

@ -482,7 +482,7 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase):
br_addport_fn.return_value = "11" br_addport_fn.return_value = "11"
self.agent.setup_physical_bridges({"physnet1": "br-eth"}) self.agent.setup_physical_bridges({"physnet1": "br-eth"})
expected_calls = [mock.call.link_delete(), expected_calls = [mock.call.link_delete(),
mock.call.utils_execute(['/sbin/udevadm', mock.call.utils_execute(['udevadm',
'settle', 'settle',
'--timeout=10']), '--timeout=10']),
mock.call.add_veth('int-br-eth', mock.call.add_veth('int-br-eth',

2
neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
View File

@ -979,7 +979,7 @@ class TestOvsNeutronAgent(base.BaseTestCase):
get_br_fn.return_value = ["br-eth"] get_br_fn.return_value = ["br-eth"]
self.agent.setup_physical_bridges({"physnet1": "br-eth"}) self.agent.setup_physical_bridges({"physnet1": "br-eth"})
expected_calls = [mock.call.link_delete(), expected_calls = [mock.call.link_delete(),
mock.call.utils_execute(['/sbin/udevadm', mock.call.utils_execute(['udevadm',
'settle', 'settle',
'--timeout=10']), '--timeout=10']),
mock.call.add_veth('int-br-eth', mock.call.add_veth('int-br-eth',

2
neutron/tests/unit/openvswitch/test_ovs_tunnel.py
View File

@ -670,7 +670,7 @@ class TunnelTestUseVethInterco(TunnelTest):
self.inta_expected = [mock.call.link.set_up()] self.inta_expected = [mock.call.link.set_up()]
self.intb_expected = [mock.call.link.set_up()] self.intb_expected = [mock.call.link.set_up()]
self.execute_expected = [mock.call(['/sbin/udevadm', 'settle', self.execute_expected = [mock.call(['udevadm', 'settle',
'--timeout=10'])] '--timeout=10'])]