From 9cc78f689753065791e432b0cd39ffca09459864 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 21 May 2023 16:36:22 +0200
Subject: [PATCH] fix(nm): actually delete connection upon device disconnection
 [backport 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 c0070ddbd0eb62d6a5cb1c2f5b39a4e0edaa9415)

Co-authored-by: Mattia Dal Ben <mattdibi@users.noreply.github.com>
---
 .../src/main/java/org/eclipse/kura/nm/NMDbusConnector.java  | 6 ++++++
 .../test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java  | 2 +-
 2 files changed, 7 insertions(+), 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
index 5b212ecaf77..89ec6027985 100644
--- 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/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java
index 31c22f9d1d3..c769984a966 100644
--- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java
+++ b/kura/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) {