lwm2m tests aad logs with NoSec, PSK, X509-trust. RPK, X509_NoTrust - ignore

application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.transport.lwm2m;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.eclipse.californium.core.network.config.NetworkConfig;
 import org.eclipse.leshan.client.object.Security;
@@ -66,6 +67,7 @@ import java.util.concurrent.ScheduledExecutorService;
 
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+@Slf4j
 @DaoSqlTest
 public abstract class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest {
 
@@ -199,6 +201,7 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest
         createNewClient(security, coapConfig, false);
         String msg = wsClient.waitForUpdate();
 
+        log.info("msg5555: [{}]", msg);
         EntityDataUpdate update = mapper.readValue(msg, EntityDataUpdate.class);
         Assert.assertEquals(1, update.getCmdId());
         List<EntityData> eData = update.getUpdate();

application/src/test/java/org/thingsboard/server/transport/lwm2m/security/AbstractSecurityLwM2MIntegrationTest.java

@@ -68,6 +68,7 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
     // Client
     protected LwM2MTestClient client;
     protected static final String CLIENT_ENDPOINT_NO_SEC = "deviceNoSec";
+    protected static final String CLIENT_ENDPOINT_PSK = "devicePSK";
     protected static final String CLIENT_ENDPOINT_RPK = "deviceRPK";
     protected static final String CLIENT_ENDPOINT_NO_TRUST = "deviceAEndpoint";
     protected static final String CLIENT_ENDPOINT_TRUST = "LwX50900000000";

application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/PskLwm2mIntegrationTest.java

@@ -34,13 +34,13 @@ public class PskLwm2mIntegrationTest extends AbstractSecurityLwM2MIntegrationTes
     @Test
     public void testConnectWithPSKAndObserveTelemetry() throws Exception {
         PSKClientCredential clientCredentials = new PSKClientCredential();
-        clientCredentials.setEndpoint(CLIENT_ENDPOINT_NO_TRUST);
+        clientCredentials.setEndpoint(CLIENT_ENDPOINT_PSK);
         clientCredentials.setKey(pskKey);
         clientCredentials.setIdentity(pskIdentity);
         Security security = psk(SECURE_URI,
                 SHORT_SERVER_ID,
                 pskIdentity.getBytes(StandardCharsets.UTF_8),
                 Hex.decodeHex(pskKey.toCharArray()));
-        super.basicTestConnectionObserveTelemetry(security, clientCredentials, SECURE_COAP_CONFIG, CLIENT_ENDPOINT_NO_TRUST);
+        super.basicTestConnectionObserveTelemetry(security, clientCredentials, SECURE_COAP_CONFIG, CLIENT_ENDPOINT_PSK);
     }
 }

application/src/test/resources/application-test.properties

@@ -4,7 +4,7 @@ transport.lwm2m.server.security.credentials.keystore.store_file=lwm2m/credential
 #transport.lwm2m.server.security.credentials.keystore.store_password=server
 #transport.lwm2m.server.security.credentials.keystore.key_alias=server
 #transport.lwm2m.server.security.credentials.keystore.key_password=server
-#transport.lwm2m.bootstrap.enabled=false
+transport.lwm2m.bootstrap.enabled=false
 transport.lwm2m.bootstrap.security.credentials.enabled=true
 transport.lwm2m.bootstrap.security.credentials.type=KEYSTORE
 transport.lwm2m.bootstrap.security.credentials.keystore.store_file=lwm2m/credentials/lwm2mserver.jks

application/src/test/resources/logback.xml

@@ -10,6 +10,7 @@
 <!--    <logger name="org.thingsboard.server.service.subscription" level="TRACE"/>-->
     <logger name="org.thingsboard.server.controller.TbTestWebSocketClient" level="INFO"/>
     <logger name="org.thingsboard.server" level="WARN"/>
+    <logger name="org.thingsboard.server.transport.lwm2m" level="INFO"/>
     <logger name="org.springframework" level="WARN"/>
     <logger name="org.springframework.boot.test" level="WARN"/>
     <logger name="org.apache.cassandra" level="WARN"/>