63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
|
diff --git a/library/network_connections.py b/library/network_connections.py
|
||
|
|
index 39e81e8..6fa5e2f 100644
|
||
|
|
--- a/library/network_connections.py
|
||
|
|
+++ b/library/network_connections.py
|
||
|
|
@@ -1369,6 +1369,13 @@ class NMUtil:
|
||
|
|
finally:
|
||
|
|
ac.handler_disconnect(ac_id)
|
||
|
|
|
||
|
|
+ def reapply(self, device, connection=None):
|
||
|
|
+ version_id = 0
|
||
|
|
+ flags = 0
|
||
|
|
+ return Util.call_async_method(
|
||
|
|
+ device, "reapply", [connection, version_id, flags]
|
||
|
|
+ )
|
||
|
|
+
|
||
|
|
|
||
|
|
###############################################################################
|
||
|
|
|
||
|
|
@@ -2088,6 +2095,9 @@ class Cmd_nm(Cmd):
|
||
|
|
)
|
||
|
|
self.connections_data_set_changed(idx)
|
||
|
|
if self.check_mode == CheckMode.REAL_RUN:
|
||
|
|
+ if self._try_reapply(idx, con):
|
||
|
|
+ return
|
||
|
|
+
|
||
|
|
try:
|
||
|
|
ac = self.nmutil.connection_activate(con)
|
||
|
|
except MyError as e:
|
||
|
|
@@ -2102,6 +2112,33 @@ class Cmd_nm(Cmd):
|
||
|
|
except MyError as e:
|
||
|
|
self.log_error(idx, "up connection failed while waiting: %s" % (e))
|
||
|
|
|
||
|
|
+ def _try_reapply(self, idx, con):
|
||
|
|
+ """ Try to reapply a connection
|
||
|
|
+
|
||
|
|
+ If there is exactly one active connection with the same UUID activated
|
||
|
|
+ on exactly one device, ask the device to reapply the connection.
|
||
|
|
+
|
||
|
|
+ :returns: `True`, when the connection was reapplied, `False` otherwise
|
||
|
|
+ :rtype: bool
|
||
|
|
+ """
|
||
|
|
+ NM = Util.NM()
|
||
|
|
+
|
||
|
|
+ acons = list(self.nmutil.active_connection_list(connections=[con]))
|
||
|
|
+ if len(acons) != 1:
|
||
|
|
+ return False
|
||
|
|
+
|
||
|
|
+ active_connection = acons[0]
|
||
|
|
+ if active_connection.get_state() == NM.ActiveConnectionState.ACTIVATED:
|
||
|
|
+ devices = active_connection.get_devices()
|
||
|
|
+ if len(devices) == 1:
|
||
|
|
+ try:
|
||
|
|
+ self.nmutil.reapply(devices[0])
|
||
|
|
+ self.log_info(idx, "connection reapplied")
|
||
|
|
+ return True
|
||
|
|
+ except MyError as error:
|
||
|
|
+ self.log_info(idx, "connection reapply failed: %s" % (error))
|
||
|
|
+ return False
|
||
|
|
+
|
||
|
|
def run_action_down(self, idx):
|
||
|
|
connection = self.connections[idx]
|
||
|
|
|