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

Jump to bottom

NM/device: Handle activation failures for connections #201

Merged
merged 1 commit into from Dec 19, 2018
Merged

NM/device: Handle activation failures for connections #201

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 27 additions & 8 deletions libnmstate/nm/device.py
View file
Open in desktop
Expand Up @@ -127,7 +127,7 @@ def _safe_activate_async(dev, connection_id):
if connection_id:
connection = client.get_connection_by_id(connection_id)
specific_object = None
user_data = mainloop, dev, cancellable
user_data = mainloop, dev, connection_id, cancellable
client.activate_connection_async(
connection,
dev,
Expand All @@ -139,24 +139,30 @@ def _safe_activate_async(dev, connection_id):


def _active_connection_callback(src_object, result, user_data):
mainloop, nmdev, cancellable = user_data
mainloop, nmdev, connection_id, cancellable = user_data
mainloop.drop_cancellable(cancellable)

try:
nm_act_con = src_object.activate_connection_finish(result)
except Exception as e:
activation_type, activation_object = _get_activation_metadata(
nmdev, connection_id)

if mainloop.is_action_canceled(e):
logging.debug(
'Connection activation canceled on %s: error=%s',
nmdev.get_iface(), e)
'Connection activation canceled on %s %s: error=%s',
activation_type, activation_object, e)
else:
mainloop.quit(
'Connection activation failed on {}: error={}'.format(
nmdev.get_iface(), e))
'Connection activation failed on {} {}: error={}'.format(
activation_type, activation_object, e))
return

if nm_act_con is None:
mainloop.quit('Connection activation failed on %s: error=unknown' %
nmdev.get_iface())
activation_type, activation_object = _get_activation_metadata(
nmdev, connection_id)
mainloop.quit('Connection activation failed on %s %s: error=unknown' %
activation_type, activation_object)
tyll marked this conversation as resolved.
Show resolved Hide resolved
else:
devname = nm_act_con.props.connection.get_interface_name()
logging.debug('Connection activation initiated: dev=%s, con-state=%s',
Expand All @@ -173,6 +179,19 @@ def _active_connection_callback(src_object, result, user_data):
ac.devname, ac.reason))


def _get_activation_metadata(nmdev, connection_id):
if nmdev:
activation_type = 'device'
activation_object = nmdev.get_iface()
elif connection_id:
activation_type = 'connection_id'
activation_object = connection_id
else:
activation_type = activation_object = 'unknown'

return activation_type, activation_object


def _waitfor_active_connection_async(ac, mainloop):
ac.handlers.add(
ac.nm_active_connection.connect(
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/nm/device_test.py
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ def test_activate(client_mock, mainloop_mock):
None,
cancellable,
nm.device._active_connection_callback,
(mainloop_mock, dev, cancellable),
(mainloop_mock, dev, None, cancellable),
)


Expand Down