Added check on connection status

Signed-off-by: pierantoniomerlino <pierantonio.merlino@eurotech.com>

Author: pierantoniomerlino

kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/ModemTaskScheduler.java

@@ -65,7 +65,7 @@ public ModemTaskScheduler(String deviceId, Device device, NetworkProperties prop
     }
 
     public void scheduleConnection() {
-        if (isModemConnected()) {
+        if (isModemConnectedAndConnectionActivated()) {
             logger.info("Connection for modem {} successful", this.deviceId);
             return;
         }
@@ -84,7 +84,7 @@ private void tryConnection(int attemptNumber) {
             if (this.nmDbusConnector.isPresent()) {
                 this.nmDbusConnector.get().apply(deviceId);
             }
-            if (isModemConnected()) {
+            if (isModemConnectedAndConnectionActivated()) {
                 logger.info("Connection for modem {} successful", this.deviceId);
                 if (this.connectionHandler != null) {
                     this.connectionHandler.cancel(true);
@@ -112,14 +112,14 @@ private void scheduleConnectInternal(int attemptNumber) {
     }
 
     public void scheduleReset() {
-        if (isResetScheduled.get() || this.resetDelayMinutes <= 0 || isModemConnected()) {
+        if (isResetScheduled.get() || this.resetDelayMinutes <= 0 || isModemConnectedAndConnectionActivated()) {
             return;
         }
         logger.info("Schedule reset for modem {} with path {}", this.deviceId, this.device.getObjectPath());
         this.isResetScheduled.set(true);
         this.resetHandler = this.scheduler.schedule(() -> {
             try {
-                if (!isModemConnected()) {
+                if (!isModemConnectedAndConnectionActivated()) {
                     if (this.connectionHandler != null) {
                         this.connectionHandler.cancel(true);
                     }
@@ -170,17 +170,19 @@ protected boolean isResetScheduled() {
         return this.isResetScheduled.get();
     }
 
-    private boolean isModemConnected() {
+    private boolean isModemConnectedAndConnectionActivated() {
         boolean isConnected = false;
+        boolean isActivated = false;
         try {
             if (this.nmDbusConnector.isPresent()) {
                 isConnected = this.nmDbusConnector.get().isModemConnected(this.device);
+                isActivated = this.nmDbusConnector.get().isConnectionActivated(this.device);
             }
         } catch (DBusException e) {
             logger.warn("Could not get modem connection status for modem {} with path {} because: ", this.deviceId,
                     this.device.getObjectPath(), e);
         }
-        return isConnected;
+        return isConnected && isActivated;
     }
 
     protected void setNMDBusConnector(NMDbusConnector nmDbusConnector) {

kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java

@@ -734,13 +734,7 @@ private List<String> getNMModemsPaths() {
     }
 
     private Optional<String> getNMModemPath(Device device) throws DBusException {
-        Optional<String> mmDbusPath = Optional.empty();
-
-        if (networkManager.getDeviceType(device.getObjectPath()).equals(NMDeviceType.NM_DEVICE_TYPE_MODEM)) {
-            mmDbusPath = this.networkManager.getModemManagerDbusPath(device.getObjectPath());
-        }
-
-        return mmDbusPath;
+        return this.networkManager.getModemManagerDbusPath(device.getObjectPath());
     }
 
     public boolean isModemConnected(Device modemDevice) throws DBusException {
@@ -758,6 +752,11 @@ public boolean isModemConnected(Device modemDevice) throws DBusException {
         return MMModemState.MM_MODEM_STATE_CONNECTED.equals(modemState);
     }
 
+    public boolean isConnectionActivated(Device device) throws DBusException {
+        NMDeviceState deviceState = this.networkManager.getDeviceState(device);
+        return NMDeviceState.NM_DEVICE_STATE_ACTIVATED.equals(deviceState);
+    }
+
     public Optional<Modem> getModem(Device device) throws DBusException {
         Optional<Modem> modem = Optional.empty();
         Optional<String> mmDbusPath = getNMModemPath(device);

kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/ModemTaskSchedulerTest.java

@@ -163,6 +163,8 @@ public void shouldResetIfResetIsScheduled() throws DBusException {
     private void givenNMDbusConnectorMock(boolean isConnectedFirstCall, boolean isConnectedSecondCall)
             throws DBusException {
         this.nmDbusConnector = mock(NMDbusConnector.class);
+        when(this.nmDbusConnector.isConnectionActivated(any())).thenReturn(isConnectedFirstCall)
+                .thenReturn(isConnectedSecondCall);
         when(this.nmDbusConnector.isModemConnected(any())).thenReturn(isConnectedFirstCall)
                 .thenReturn(isConnectedSecondCall);
         this.modem = mock(Modem.class);