openstack
/
os-vif
Code Issues Proposed changes

Merge "fix read the representor phys_port_name"

This commit is contained in:
Jenkins 2017-07-13 01:22:45 +00:00 committed by Gerrit Code Review
parent 54c4b6faaa d5b539433b
commit 4a8e07f6c5
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vif_plug_ovs/linux_net.py
View File

@ -269,7 +269,7 @@ def get_representor_port(pf_ifname, vf_num):
continue
try:
with open(device_sw_id_file, 'r') as fd:
with open(device_port_name_file, 'r') as fd:
representor_num = fd.readline().rstrip()
except (OSError, IOError):
continue

17
vif_plug_ovs/tests/unit/test_linux_net.py
View File

@ -303,7 +303,24 @@ class LinuxNetTest(testtools.TestCase):
readline_mock = mock_open.return_value.readline
readline_mock.side_effect = (
['pf_sw_id', 'pf_sw_id', '1', 'pf_sw_id', '2'])
open_calls = (
[mock.call('/sys/class/net/pf_ifname/phys_switch_id', 'r'),
mock.call().readline(),
mock.call().__exit__(None, None, None),
mock.call('/sys/class/net/rep_vf_1/phys_switch_id', 'r'),
mock.call().readline(),
mock.call().__exit__(None, None, None),
mock.call('/sys/class/net/rep_vf_1/phys_port_name', 'r'),
mock.call().readline(),
mock.call().__exit__(None, None, None),
mock.call('/sys/class/net/rep_vf_2/phys_switch_id', 'r'),
mock.call().readline(),
mock.call().__exit__(None, None, None),
mock.call('/sys/class/net/rep_vf_2/phys_port_name', 'r'),
mock.call().readline(),
mock.call().__exit__(None, None, None)])
ifname = linux_net.get_representor_port('pf_ifname', '2')
mock_open.assert_has_calls(open_calls)
self.assertEqual('rep_vf_2', ifname)
@mock.patch('six.moves.builtins.open')