tmp commit

Signed-off-by: riccardomodanese <riccardo.modanese@eurotech.com>
eclipse-kapua · Mar 3, 2025 · 3a8ad38 · 3a8ad38
1 parent 48a6ae0
commit 3a8ad38
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/qa/common/src/main/java/org/eclipse/kapua/qa/common/SimulatedDeviceSteps.java b/qa/common/src/main/java/org/eclipse/kapua/qa/common/SimulatedDeviceSteps.java
@@ -128,7 +128,8 @@ public void setUsernamePasswordCredentials(String username, String password) {
     @When("I start the simulator")
     public void startSimulator() throws Exception {
         currentDevice.started();
-
+        logger.info("Starting simulator to broker {} - account {} - client id {} - obj id {}",
+                nodeUri, currentDevice.getAccountName(), currentDevice.getClientId(), currentDevice);
         final GatewayConfiguration configuration = new GatewayConfiguration(nodeUri, currentDevice.getAccountName(), currentDevice.getClientId());
 
         final Set<Application> apps = new HashSet<>();

diff --git a/...ps/src/main/java/org/eclipse/kapua/service/device/registry/steps/DeviceRegistrySteps.java b/...ps/src/main/java/org/eclipse/kapua/service/device/registry/steps/DeviceRegistrySteps.java
@@ -1991,15 +1991,19 @@ public void searchForConnectionFromDeviceWithClientIDStatusAndUser(String client
         User connectionUserId = userService.findByName(connectionUsername);
         Assert.assertNotNull("Coonection username not valid!", connectionUserId);
         while (executions++ < timeout) {
+            logger.info("searchForConnectionFromDeviceWithClientIDStatusAndUser ITERATION: ", executions);
             if (searchForConnectionFromDeviceWithClientIDStatusAndUser(clientId, account.getId(), status, connectionUserId.getId(), false)) {
                 return;
             }
             Thread.sleep(1000);
         }
+        logger.info("searchForConnectionFromDeviceWithClientIDStatusAndUser completed iterations: ", executions);
         searchForConnectionFromDeviceWithClientIDStatusAndUser(clientId, account.getId(), status, connectionUserId.getId(), true);
+        logger.info("searchForConnectionFromDeviceWithClientIDStatusAndUser completed search: ", executions);
     }
 
     private boolean searchForConnectionFromDeviceWithClientIDStatusAndUser(String clientId, KapuaId accountId, String connectionStatus, KapuaId connectionUserId, boolean timeoutOccurred) throws Exception {
+        boolean retValue = true;
         try {
             Device device = deviceRegistryService.findByClientId(accountId, clientId);
             if (timeoutOccurred) {
@@ -2016,9 +2020,9 @@ private boolean searchForConnectionFromDeviceWithClientIDStatusAndUser(String cl
                 }
             } else {
                 if (connectionUserId != null) {
-                    return deviceConnection != null && connectionStatus.equals(deviceConnection.getStatus().name()) && connectionUserId.equals(deviceConnection.getUserId());
+                    retValue = deviceConnection != null && connectionStatus.equals(deviceConnection.getStatus().name()) && connectionUserId.equals(deviceConnection.getUserId());
                 } else {
-                    return deviceConnection != null && connectionStatus.equals(deviceConnection.getStatus().name());
+                    retValue = deviceConnection != null && connectionStatus.equals(deviceConnection.getStatus().name());
                 }
             }
             stepData.put(DEVICE_CONNECTION, deviceConnection);
@@ -2027,10 +2031,12 @@ private boolean searchForConnectionFromDeviceWithClientIDStatusAndUser(String cl
             dcv.add(deviceConnection);
             tmpConnLst.addItems(dcv);
             stepData.put(DEVICE_CONNECTION_LIST, tmpConnLst);
-        } catch (KapuaException ex) {
-            verifyException(ex);
+        } catch (Throwable ex) {
+            logger.info("searchForConnectionFromDeviceWithClientIDStatusAndUser step exception");
+            verifyException((KapuaException)ex);
         }
-        return true;
+        logger.info("searchForConnectionFromDeviceWithClientIDStatusAndUser end");
+        return retValue;
     }
 
     @Then("The connection user is {string}")

diff --git a/simulator-kura/src/main/java/org/eclipse/kapua/kura/simulator/MqttAsyncTransport.java b/simulator-kura/src/main/java/org/eclipse/kapua/kura/simulator/MqttAsyncTransport.java
@@ -64,6 +64,7 @@ public void deliveryComplete(final IMqttDeliveryToken token) {
 
             @Override
             public void connectionLost(final Throwable cause) {
+                logger.warn("CONNECTION LOST!!!!", cause);
                 handleDisconnected();
             }
         });
@@ -164,14 +165,19 @@ public void whenDisconnected(final Runnable runnable) {
     protected void handleConnected() {
         //double check the connection
         //in case of stealing link very close to each other the old device can try to execute the onConnected while the connection is dropped
+        logger.info("Calling handleConnected {}", this);
         if (client.isConnected()) {
             final Runnable runnable = this.onConnected;
+            logger.info("Calling handleConnected {} CONNECTED {}", this, runnable);
             if (runnable != null) {
                 runnable.run();
             }
+            logger.info("Calling handleConnected {} STARTED RUNNABLE", this);
         }
         else {
+            logger.info("Calling handleConnected {} NOT CONNECTED", this);
             logger.warn("Device not still connected. Skip onConnected code execution");
+            logger.warn("===>", new Exception());
         }
     }
 

diff --git a/simulator-kura/src/main/java/org/eclipse/kapua/kura/simulator/Simulator.java b/simulator-kura/src/main/java/org/eclipse/kapua/kura/simulator/Simulator.java
@@ -63,17 +63,20 @@ public void close() {
     }
 
     protected void connected() {
-        logger.info("Connected ... sending birth certificate ...");
+        logger.info("Connected... calling modules... {}", this);
         for (final Module module : modules) {
             try {
+                logger.info("Connected... calling module {} ... {}", module, this);
                 module.connected(transport);
+                logger.info("Connected... calling module {} DONE... {}", module, this);
             } catch (final Exception e) {
                 logger.warn("Failed to call module: {}", module, e);
             }
         }
     }
 
     protected void disconnected() {
+        logger.info("Disconnected ... {}", this);
         for (final Module module : modules) {
             try {
                 module.disconnected(transport);