openstack
/
neutron
Code Issues Proposed changes

Only create one IPWrapper class instance in _arping() 

We are calling arping many times in the same namespace, no
need to create multiple IPWrapper class instances.

Trivialfix

Change-Id: Id360324d4d31181ebf39f7796346635da043f350
This commit is contained in:
Brian Haley 2017-10-16 18:20:37 -04:00
parent 80085abcd6
commit 7fa05a75c2
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/linux/ip_lib.py
View File

@ -1051,6 +1051,7 @@ def _arping(ns_name, iface_name, address, count, log_exception):
# not expected. In some cases (no response) and with some
# platforms (>=Ubuntu 14.04), arping exit code can be 1.
extra_ok_codes = [1]
ip_wrapper = IPWrapper(namespace=ns_name)
for i in range(count):
if not first:
# hopefully enough for kernel to get out of locktime loop
@ -1075,7 +1076,6 @@ def _arping(ns_name, iface_name, address, count, log_exception):
# removed while running
'-w', 1.5, address]
try:
ip_wrapper = IPWrapper(namespace=ns_name)
ip_wrapper.netns.execute(arping_cmd,
extra_ok_codes=extra_ok_codes)
except Exception as exc:

5
neutron/tests/unit/agent/linux/test_ip_lib.py
View File

@ -1699,15 +1699,10 @@ class TestArpPing(TestIPCmdBase):
mIPWrapper.assert_has_calls([
mock.call(namespace=mock.sentinel.ns_name),
mock.call().netns.execute(mock.ANY, extra_ok_codes=[1]),
mock.call(namespace=mock.sentinel.ns_name),
mock.call().netns.execute(mock.ANY, extra_ok_codes=[1]),
mock.call(namespace=mock.sentinel.ns_name),
mock.call().netns.execute(mock.ANY, extra_ok_codes=[1, 2]),
mock.call(namespace=mock.sentinel.ns_name),
mock.call().netns.execute(mock.ANY, extra_ok_codes=[1, 2]),
mock.call(namespace=mock.sentinel.ns_name),
mock.call().netns.execute(mock.ANY, extra_ok_codes=[1, 2]),
mock.call(namespace=mock.sentinel.ns_name),
mock.call().netns.execute(mock.ANY, extra_ok_codes=[1, 2])])
ip_wrapper = mIPWrapper(namespace=mock.sentinel.ns_name)