Skip to content
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

NM activator/bring_up_interfaces: reload and bring up individual network conns #6073

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

NM activator/bring_up_interfaces: reload and bring up individual network conns #6073

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
4 changes: 2 additions & 2 deletions cloudinit/net/activators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,9 @@ def bring_up_interfaces(cls, device_names: Iterable[str]) -> bool:
state,
)
return _alter_interface(
["systemctl", "reload-or-try-restart", "NetworkManager.service"],
["systemctl", "try-reload-or-restart", "NetworkManager.service"],
"all",
)
) and all(cls.bring_up_interface(device) for device in device_names)


class NetplanActivator(NetworkActivator):
Expand Down
4 changes: 2 additions & 2 deletions tests/unittests/test_net_activators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ def test_available(self, activator, available_calls, available_mocks):
),
{},
),
((["systemctl", "reload-or-try-restart", "NetworkManager.service"],), {}),
]
((["systemctl", "try-reload-or-restart", "NetworkManager.service"],), {}),
] + NETWORK_MANAGER_BRING_UP_CALL_LIST

NETWORKD_BRING_UP_CALL_LIST: list = [
((["ip", "link", "set", "dev", "eth0", "up"],), {}),
Expand Down