fix(nm): actually delete connection upon device disconnection [backpo…

…rt release-5.3.0] (#4672) fix(nm): actually delete connection upon device disconnection (#4670) * fix(nm): actually delete connection upon device disconnection * test: fix associated tests * fix: Associated->Applied (cherry picked from commit c0070dd) Co-authored-by: Mattia Dal Ben <[email protected]>
eclipse-kura · May 21, 2023 · 9cc78f6 · 9cc78f6
1 parent eb08408
commit 9cc78f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java
@@ -536,6 +536,8 @@ protected String getDeviceIdByDBusPath(String dbusPath) throws DBusException {
     }
 
     private void disable(Device device) throws DBusException {
+        Optional<Connection> appliedConnection = getAppliedConnection(device);
+
         NMDeviceState deviceState = getDeviceState(device);
         if (Boolean.TRUE.equals(NMDeviceState.isConnected(deviceState))) {
             DeviceStateLock dsLock = new DeviceStateLock(this.dbusConnection, device.getObjectPath(),
@@ -545,6 +547,10 @@ private void disable(Device device) throws DBusException {
         }
 
         // Housekeeping
+        if (appliedConnection.isPresent()) {
+            appliedConnection.get().Delete();
+        }
+
         List<Connection> availableConnections = getAvaliableConnections(device);
         for (Connection connection : availableConnections) {
             connection.Delete();

diff --git a/.../test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java b/.../test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java
@@ -1462,7 +1462,7 @@ public void thenConfigurationEnforcementIsActive(boolean expectedValue) {
     }
 
     private void thenConnectionIsDeleted(String path) {
-        verify(this.mockedConnections.get(path)).Delete();
+        verify(this.mockedConnections.get(path), atLeastOnce()).Delete();
     }
 
     private void thenConnectionIsNotDeleted(String path) {