Skip to content

Fix error Deleting network interface #731

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

Merged
merged 3 commits into from
Dec 16, 2024
Merged

Fix error Deleting network interface #731

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00d8bd2
Fix error Deleting network interface
olethanh Dec 16, 2024
67101e1
Remove unused delete_ip_address()
olethanh Dec 16, 2024
2540724
List all ip on interface and delete them
olethanh Dec 16, 2024
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
16 changes: 0 additions & 16 deletions src/aleph/vm/network/interfaces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,6 @@ def add_ip_address(ipr: IPRoute, device_name: str, ip: IPv4Interface | IPv6Inter
logger.error(f"Unknown exception while adding address {ip} to interface {device_name}: {e}")


def delete_ip_address(ipr: IPRoute, device_name: str, ip: IPv4Interface | IPv6Interface):
"""Delete an IP address to the given interface."""
interface_index: list[int] = ipr.link_lookup(ifname=device_name)
if not interface_index:
msg = f"Interface {device_name} does not exist, can't delete address {ip} to it."
raise MissingInterfaceError(msg)
try:
ipr.addr("del", index=interface_index[0], address=str(ip.ip), mask=ip.network.prefixlen)
except NetlinkError as e:
logger.exception(f"Unknown exception while deleting address {ip} to interface {device_name}: {e}")
except OSError as e:
logger.exception(f"Unknown exception while deleting address {ip} to interface {device_name}: {e}")


def set_link_up(ipr: IPRoute, device_name: str):
"""Set the given interface up."""
interface_index: list[int] = ipr.link_lookup(ifname=device_name)
Expand Down Expand Up @@ -170,6 +156,4 @@ async def delete(self) -> None:
if self.ndp_proxy:
await self.ndp_proxy.delete_range(self.device_name)
with IPRoute() as ipr:
delete_ip_address(ipr, self.device_name, self.host_ip)
delete_ip_address(ipr, self.device_name, self.host_ipv6)
delete_tap_interface(ipr, self.device_name)
Loading