Skip to content

fix: fix regex to get vfs details properly #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: fix regex to get vfs details properly #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mfd_network_adapter/network_interface/feature/virtualization/linux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def _get_vfs_details(self) -> List[VFDetail]:

command = f"ip link show dev {self._interface().name}"
pattern = (
r"vf\s*(?P<vf_id>\d+)\s*link/ether\s*(?P<mac_address>[0-9a-fA-F]{2}(?::[0-9a-fA-F]{2}){5})\s*.*?,"
r"vf\s*(?P<vf_id>\d+)\s*(link/ether|MAC)\s*(?P<mac_address>[0-9a-fA-F]{2}(?::[0-9a-fA-F]{2}){5})\s*.*?,"
r"\s*spoof checking\s*(?P<spoofchk>\w+),\s*link-state\s*(?P<link_state>\w+),\s*trust\s*("
r"?P<trust>\w+)"
)
Expand Down
49 changes: 48 additions & 1 deletion ...pter/test_network_interface/test_feature/test_virtualization/test_virtualization_linux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def test_set_mac_for_vf_error(self, interface, mocker):
with pytest.raises(VirtualizationFeatureException):
interface.virtualization.set_mac_for_vf(vf_id=vf_id, mac=mac)

def test__get_vfs_details_pass(self, interface, mocker):
def test__get_vfs_details_link_ether_pass(self, interface, mocker):
interface._interface_info.name = "eth1"
interface.virtualization._raise_error_if_not_supported_type = mocker.Mock()
expected_command = f"ip link show dev {interface._interface_info.name}"
Expand Down Expand Up @@ -267,6 +267,53 @@ def test__get_vfs_details_pass(self, interface, mocker):
command=expected_command, custom_exception=VirtualizationFeatureException
)

def test__get_vfs_details_mac_pass(self, interface, mocker):
interface._interface_info.name = "eth1"
interface.virtualization._raise_error_if_not_supported_type = mocker.Mock()
expected_command = f"ip link show dev {interface._interface_info.name}"
output = dedent(
"""
3: eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
link/ether 00:00:00:00:00:00 brd 00:00:00:00:00:00
vf 0 MAC 00:00:00:00:00:00, spoof checking on, link-state auto, trust off, query_rss off
vf 1 MAC 00:00:00:00:00:00, spoof checking on, link-state enable, trust off, query_rss off
vf 9 MAC 00:00:00:00:00:00, spoof checking on, link-state auto, trust off, query_rss off`
"""
)

interface._connection.execute_command.return_value = ConnectionCompletedProcess(
args="", stdout=output, return_code=0
)

expected_details = [
VFDetail(
id=0,
mac_address=MACAddress("00:00:00:00:00:00"),
spoofchk=State.ENABLED,
link_state=LinkState.AUTO,
trust=State.DISABLED,
),
VFDetail(
id=1,
mac_address=MACAddress("00:00:00:00:00:00"),
spoofchk=State.ENABLED,
link_state=LinkState.ENABLE,
trust=State.DISABLED,
),
VFDetail(
id=9,
mac_address=MACAddress("00:00:00:00:00:00"),
spoofchk=State.ENABLED,
link_state=LinkState.AUTO,
trust=State.DISABLED,
),
]

assert interface.virtualization._get_vfs_details() == expected_details
interface._connection.execute_command.assert_called_with(
command=expected_command, custom_exception=VirtualizationFeatureException
)

def test__get_vfs_details_error(self, interface, mocker):
interface.virtualization._raise_error_if_not_supported_type = mocker.Mock()
interface._connection.execute_command.side_effect = VirtualizationFeatureException(1, "", "", "")
Expand Down