tsarevvv/nmstate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm.checkpoint: check if the connection is activated

Browse Source 
Before initiate the interface rollback wait action, nmstate is checking
if the connection is already activated.

Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
This commit is contained in:
Fernando Fernandez Mancera 2020-05-26 22:59:37 +02:00 committed by Gris Ge
parent 85468c22fe
commit 586d1620c4
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libnmstate/nm/checkpoint.py
View File

@ -240,11 +240,12 @@ class CheckPoint:
and nm_dev.get_state_reason()
== common.NM.DeviceStateReason.NEW_ACTIVATION
) or nm_dev.get_state() == common.NM.DeviceState.IP_CONFIG:
action = f"Waiting for rolling back {iface}"
self._ctx.register_async(action)
profile = connection.ConnectionProfile(self._ctx)
profile.import_by_device(nm_dev)
profile.wait_dev_activation(action)
if not profile.is_activated():
action = f"Waiting for rolling back {iface}"
self._ctx.register_async(action)
profile.wait_dev_activation(action)
if ret[path] != 0:
logging.error(f"Interface {iface} rollback failed")
else:

8
libnmstate/nm/connection.py
View File

@ -217,7 +217,7 @@ class ConnectionProfile:
self._nm_ac = nm_act_con
self._nm_dev = self._ctx.get_nm_dev(devname)
if self._is_activated():
if self.is_activated():
self._ctx.finish_async(action)
elif self._is_activating():
self._wait_ac_activation(action)
@ -307,7 +307,7 @@ class ConnectionProfile:
self._remove_ac_handlers()
self._nm_ac = cur_nm_ac
self._wait_ac_activation(action)
if self._is_activated():
if self.is_activated():
logging.debug(
"Connection activation succeeded: dev=%s, con-state=%s, "
"dev-state=%s, state-flags=%s",
@ -331,7 +331,7 @@ class ConnectionProfile:
self._remove_ac_handlers()
self._remove_dev_handlers()
def _is_activated(self):
def is_activated(self):
if not self._nm_ac or not self._nm_dev:
return False
@ -374,7 +374,7 @@ class ConnectionProfile:
return (
self._nm_ac.get_state() == NM.ActiveConnectionState.ACTIVATING
and not self._is_activated()
and not self.is_activated()
)
def _remove_dev_handlers(self):