Merge pull request #11341 from imbeacon/improvement/provisioning-gateway-device

Added ability to provision gateway devices using device provisioning feature

application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java

@@ -417,7 +417,8 @@ public class DefaultTransportApiService implements TransportApiService {
                                     requestMsg.getCredentialsDataProto().getValidateDeviceX509CertRequestMsg().getHash()),
                             new ProvisionDeviceProfileCredentials(
                                     requestMsg.getProvisionDeviceCredentialsMsg().getProvisionDeviceKey(),
-                                    requestMsg.getProvisionDeviceCredentialsMsg().getProvisionDeviceSecret())));
+                                    requestMsg.getProvisionDeviceCredentialsMsg().getProvisionDeviceSecret()),
+                            requestMsg.getGateway()));
         } catch (ProvisionFailedException e) {
             return getTransportApiResponseMsg(new DeviceCredentials(), TransportProtos.ResponseStatus.valueOf(e.getMessage()));
         }
@@ -665,7 +666,7 @@ public class DefaultTransportApiService implements TransportApiService {
     private ProvisionRequest createProvisionRequest(String certificateValue) {
         return new ProvisionRequest(null, DeviceCredentialsType.X509_CERTIFICATE,
                 new ProvisionDeviceCredentialsData(null, null, null, null, certificateValue),
-                null);
+                null, null);
     }
 
 }

application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java

@@ -236,7 +236,7 @@ public class DeviceProvisionServiceTest {
     private ProvisionRequest createProvisionRequest(String certificateValue) {
         return new ProvisionRequest(null, DeviceCredentialsType.X509_CERTIFICATE,
                 new ProvisionDeviceCredentialsData(null, null, null, null, certificateValue),
-                null);
+                null, null);
     }
 
     public static String certTrimNewLinesForChainInDeviceProfile(String input) {

application/src/test/java/org/thingsboard/server/transport/coap/provision/CoapProvisionJsonDeviceTest.java

@@ -23,6 +23,7 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.CoapDeviceType;
+import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.TransportPayloadType;
@@ -67,6 +68,11 @@ public class CoapProvisionJsonDeviceTest extends AbstractCoapIntegrationTest {
         processTestProvisioningCreateNewDeviceWithoutCredentials();
     }
 
+    @Test
+    public void testProvisioningCreateNewGatewayDevice() throws Exception {
+        processTestProvisioningCreateNewGatewayDevice();
+    }
+
     @Test
     public void testProvisioningCreateNewDeviceWithAccessToken() throws Exception {
         processTestProvisioningCreateNewDeviceWithAccessToken();
@@ -123,6 +129,37 @@ public class CoapProvisionJsonDeviceTest extends AbstractCoapIntegrationTest {
     }
 
 
+    private void processTestProvisioningCreateNewGatewayDevice() throws Exception {
+        CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
+                .deviceName("Test Provision device3")
+                .coapDeviceType(CoapDeviceType.DEFAULT)
+                .transportPayloadType(TransportPayloadType.JSON)
+                .provisionType(DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES)
+                .provisionKey("testProvisionKey")
+                .provisionSecret("testProvisionSecret")
+                .build();
+        processBeforeTest(configProperties);
+        JsonNode response = JacksonUtil.fromBytes(createCoapClientAndPublish(true));
+        Assert.assertTrue(response.hasNonNull("credentialsType"));
+        Assert.assertTrue(response.hasNonNull("status"));
+
+        Device createdDevice = deviceService.findDeviceByTenantIdAndName(tenantId, "Test Provision device");
+
+        Assert.assertNotNull(createdDevice);
+
+        JsonNode additionalInfo = createdDevice.getAdditionalInfo();
+        Assert.assertNotNull(additionalInfo);
+        Assert.assertTrue(additionalInfo.has(DataConstants.GATEWAY_PARAMETER)
+                && additionalInfo.get(DataConstants.GATEWAY_PARAMETER).isBoolean());
+        Assert.assertTrue(additionalInfo.get(DataConstants.GATEWAY_PARAMETER).asBoolean());
+
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, createdDevice.getId());
+
+        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.get("credentialsType").asText());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("status").asText());
+    }
+
+
     private void processTestProvisioningCreateNewDeviceWithAccessToken() throws Exception {
         CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
                 .deviceName("Test Provision device3")
@@ -222,16 +259,30 @@ public class CoapProvisionJsonDeviceTest extends AbstractCoapIntegrationTest {
     }
 
     private byte[] createCoapClientAndPublish() throws Exception {
-        return createCoapClientAndPublish("");
+        return createCoapClientAndPublish(false);
+    }
+
+    private byte[] createCoapClientAndPublish(boolean isGateway) throws Exception {
+        return createCoapClientAndPublish("", isGateway);
     }
 
     private byte[] createCoapClientAndPublish(String deviceCredentials) throws Exception {
-        String provisionRequestMsg = createTestProvisionMessage(deviceCredentials);
+        return createCoapClientAndPublish(deviceCredentials, false);
+    }
+
+    private byte[] createCoapClientAndPublish(String deviceCredentials, boolean isGateway) throws Exception {
+        String provisionRequestMsg = createTestProvisionMessage(deviceCredentials, isGateway);
         client = new CoapTestClient(accessToken, FeatureType.PROVISION);
         return client.postMethod(provisionRequestMsg.getBytes()).getPayload();
     }
 
-    private String createTestProvisionMessage(String deviceCredentials) {
-        return "{\"deviceName\":\"Test Provision device\",\"provisionDeviceKey\":\"testProvisionKey\", \"provisionDeviceSecret\":\"testProvisionSecret\"" + deviceCredentials + "}";
+    protected String createTestProvisionMessage(String deviceCredentials, boolean isGateway) {
+        String request = "{\"deviceName\":\"Test Provision device\",\"provisionDeviceKey\":\"testProvisionKey\", \"provisionDeviceSecret\":\"testProvisionSecret\""
+                + deviceCredentials;
+        if (isGateway) {
+            request += ",\"gateway\":true";
+        }
+        request += "}";
+        return request;
     }
 }

application/src/test/java/org/thingsboard/server/transport/coap/provision/CoapProvisionProtoDeviceTest.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.transport.coap.provision;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.core.CoapResponse;
 import org.junit.After;
@@ -22,6 +23,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.CoapDeviceType;
+import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.TransportPayloadType;
@@ -74,6 +76,11 @@ public class CoapProvisionProtoDeviceTest extends AbstractCoapIntegrationTest {
         processTestProvisioningCreateNewDeviceWithoutCredentials();
     }
 
+    @Test
+    public void testProvisioningCreateNewGatewayDevice() throws Exception {
+        processTestProvisioningCreateNewGatewayDevice();
+    }
+
     @Test
     public void testProvisioningCreateNewDeviceWithAccessToken() throws Exception {
         processTestProvisioningCreateNewDeviceWithAccessToken();
@@ -124,6 +131,35 @@ public class CoapProvisionProtoDeviceTest extends AbstractCoapIntegrationTest {
         Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getStatus().name());
     }
 
+    private void processTestProvisioningCreateNewGatewayDevice() throws Exception {
+        CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
+                .deviceName("Test Provision device3")
+                .coapDeviceType(CoapDeviceType.DEFAULT)
+                .transportPayloadType(TransportPayloadType.PROTOBUF)
+                .provisionType(DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES)
+                .provisionKey("testProvisionKey")
+                .provisionSecret("testProvisionSecret")
+                .build();
+        processBeforeTest(configProperties);
+        byte[] testsProvisionMessage = createTestsProvisionMessage(null, null, true);
+        ProvisionDeviceResponseMsg response = ProvisionDeviceResponseMsg.parseFrom(createCoapClientAndPublish(testsProvisionMessage));
+
+        Device createdDevice = deviceService.findDeviceByTenantIdAndName(tenantId, "Test Provision device");
+
+        Assert.assertNotNull(createdDevice);
+
+        JsonNode additionalInfo = createdDevice.getAdditionalInfo();
+        Assert.assertNotNull(additionalInfo);
+        Assert.assertTrue(additionalInfo.has(DataConstants.GATEWAY_PARAMETER)
+                && additionalInfo.get(DataConstants.GATEWAY_PARAMETER).isBoolean());
+        Assert.assertTrue(additionalInfo.get(DataConstants.GATEWAY_PARAMETER).asBoolean());
+
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, createdDevice.getId());
+
+        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getCredentialsType().name());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getStatus().name());
+    }
+
     private void processTestProvisioningCreateNewDeviceWithAccessToken() throws Exception {
         CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
                 .deviceName("Test Provision device3")
@@ -233,6 +269,10 @@ public class CoapProvisionProtoDeviceTest extends AbstractCoapIntegrationTest {
     }
 
     private byte[] createTestsProvisionMessage(CredentialsType credentialsType, CredentialsDataProto credentialsData) throws Exception {
+        return createTestsProvisionMessage(credentialsType, credentialsData, false);
+    }
+
+    private byte[] createTestsProvisionMessage(CredentialsType credentialsType, CredentialsDataProto credentialsData, boolean isGateway) throws Exception {
         return ProvisionDeviceRequestMsg.newBuilder()
                 .setDeviceName("Test Provision device")
                 .setCredentialsType(credentialsType != null ? credentialsType : CredentialsType.ACCESS_TOKEN)
@@ -241,7 +281,9 @@ public class CoapProvisionProtoDeviceTest extends AbstractCoapIntegrationTest {
                         ProvisionDeviceCredentialsMsg.newBuilder()
                                 .setProvisionDeviceKey("testProvisionKey")
                                 .setProvisionDeviceSecret("testProvisionSecret")
-                ).build()
+                )
+                .setGateway(isGateway)
+                .build()
                 .toByteArray();
     }
 

application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/provision/MqttProvisionJsonDeviceTest.java

@@ -22,6 +22,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.TransportPayloadType;
@@ -68,6 +69,11 @@ public class MqttProvisionJsonDeviceTest extends AbstractMqttIntegrationTest {
         processTestProvisioningCreateNewDeviceWithoutCredentials();
     }
 
+    @Test
+    public void testProvisioningCreateNewGatewayDevice() throws Exception {
+        processTestProvisioningCreateNewGatewayDevice();
+    }
+
     @Test
     public void testProvisioningCreateNewDeviceWithAccessToken() throws Exception {
         processTestProvisioningCreateNewDeviceWithAccessToken();
@@ -130,6 +136,37 @@ public class MqttProvisionJsonDeviceTest extends AbstractMqttIntegrationTest {
     }
 
 
+    protected void processTestProvisioningCreateNewGatewayDevice() throws Exception {
+        MqttTestConfigProperties configProperties = MqttTestConfigProperties.builder()
+                .deviceName("Test Provision device3")
+                .transportPayloadType(TransportPayloadType.JSON)
+                .provisionType(DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES)
+                .provisionKey("testProvisionKey")
+                .provisionSecret("testProvisionSecret")
+                .build();
+        super.processBeforeTest(configProperties);
+        byte[] result = createMqttClientAndPublish(true);
+        JsonNode response = JacksonUtil.fromBytes(result);
+        Assert.assertTrue(response.hasNonNull("credentialsType"));
+        Assert.assertTrue(response.hasNonNull("status"));
+
+        Device createdDevice = deviceService.findDeviceByTenantIdAndName(tenantId, "Test Provision device");
+
+        Assert.assertNotNull(createdDevice);
+
+        JsonNode additionalInfo = createdDevice.getAdditionalInfo();
+        Assert.assertNotNull(additionalInfo);
+        Assert.assertTrue(additionalInfo.has(DataConstants.GATEWAY_PARAMETER)
+                && additionalInfo.get(DataConstants.GATEWAY_PARAMETER).isBoolean());
+        Assert.assertTrue(additionalInfo.get(DataConstants.GATEWAY_PARAMETER).asBoolean());
+
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, createdDevice.getId());
+
+        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.get("credentialsType").asText());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("status").asText());
+    }
+
+
     protected void processTestProvisioningCreateNewDeviceWithAccessToken() throws Exception {
         MqttTestConfigProperties configProperties = MqttTestConfigProperties.builder()
                 .deviceName("Test Provision device3")
@@ -264,11 +301,19 @@ public class MqttProvisionJsonDeviceTest extends AbstractMqttIntegrationTest {
     }
 
     protected byte[] createMqttClientAndPublish() throws Exception {
-        return createMqttClientAndPublish("");
+        return createMqttClientAndPublish(false);
+    }
+
+    protected byte[] createMqttClientAndPublish(boolean isGateway) throws Exception {
+        return createMqttClientAndPublish("", isGateway);
     }
 
     protected byte[] createMqttClientAndPublish(String deviceCredentials) throws Exception {
-        String provisionRequestMsg = createTestProvisionMessage(deviceCredentials);
+        return createMqttClientAndPublish(deviceCredentials, false);
+    }
+
+    protected byte[] createMqttClientAndPublish(String deviceCredentials, boolean isGateway) throws Exception {
+        String provisionRequestMsg = createTestProvisionMessage(deviceCredentials, isGateway);
         MqttTestClient client = new MqttTestClient();
         client.connectAndWait("provision");
         MqttTestCallback onProvisionCallback = new MqttTestSubscribeOnTopicCallback(DEVICE_PROVISION_RESPONSE_TOPIC);
@@ -280,7 +325,12 @@ public class MqttProvisionJsonDeviceTest extends AbstractMqttIntegrationTest {
         return onProvisionCallback.getPayloadBytes();
     }
 
-    protected String createTestProvisionMessage(String deviceCredentials) {
-        return "{\"deviceName\":\"Test Provision device\",\"provisionDeviceKey\":\"testProvisionKey\", \"provisionDeviceSecret\":\"testProvisionSecret\"" + deviceCredentials + "}";
+    protected String createTestProvisionMessage(String deviceCredentials, boolean isGateway) {
+        String request = "{\"deviceName\":\"Test Provision device\",\"provisionDeviceKey\":\"testProvisionKey\", \"provisionDeviceSecret\":\"testProvisionSecret\"" + deviceCredentials;
+        if (isGateway) {
+            request += ",\"gateway\":true";
+        }
+        request += "}";
+        return request;
     }
 }

application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/provision/MqttProvisionProtoDeviceTest.java

@@ -15,12 +15,14 @@
  */
 package org.thingsboard.server.transport.mqtt.mqttv3.provision;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.TransportPayloadType;
@@ -76,6 +78,11 @@ public class MqttProvisionProtoDeviceTest extends AbstractMqttIntegrationTest {
         processTestProvisioningCreateNewDeviceWithoutCredentials();
     }
 
+    @Test
+    public void testProvisioningCreateNewGatewayDevice() throws Exception {
+        processTestProvisioningCreateNewGatewayDevice();
+    }
+
     @Test
     public void testProvisioningCreateNewDeviceWithAccessToken() throws Exception {
         processTestProvisioningCreateNewDeviceWithAccessToken();
@@ -130,6 +137,36 @@ public class MqttProvisionProtoDeviceTest extends AbstractMqttIntegrationTest {
         Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getStatus().name());
     }
 
+    protected void processTestProvisioningCreateNewGatewayDevice() throws Exception {
+        MqttTestConfigProperties configProperties = MqttTestConfigProperties.builder()
+                .deviceName("Test Provision device3")
+                .transportPayloadType(TransportPayloadType.PROTOBUF)
+                .provisionType(DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES)
+                .provisionKey("testProvisionKey")
+                .provisionSecret("testProvisionSecret")
+                .build();
+        processBeforeTest(configProperties);
+
+        byte[] provisionRequestMsg = createTestsProvisionMessage(null, null, true);
+        byte[] responseBytesMsg = createMqttClientAndPublish(provisionRequestMsg);
+        ProvisionDeviceResponseMsg response = ProvisionDeviceResponseMsg.parseFrom(responseBytesMsg);
+
+        Device createdDevice = deviceService.findDeviceByTenantIdAndName(tenantId, "Test Provision device");
+
+        Assert.assertNotNull(createdDevice);
+
+        JsonNode additionalInfo = createdDevice.getAdditionalInfo();
+        Assert.assertNotNull(additionalInfo);
+        Assert.assertTrue(additionalInfo.has(DataConstants.GATEWAY_PARAMETER)
+                && additionalInfo.get(DataConstants.GATEWAY_PARAMETER).isBoolean());
+        Assert.assertTrue(additionalInfo.get(DataConstants.GATEWAY_PARAMETER).asBoolean());
+
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, createdDevice.getId());
+
+        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getCredentialsType().name());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getStatus().name());
+    }
+
     protected void processTestProvisioningCreateNewDeviceWithAccessToken() throws Exception {
         MqttTestConfigProperties configProperties = MqttTestConfigProperties.builder()
                 .deviceName("Test Provision device3")
@@ -280,6 +317,10 @@ public class MqttProvisionProtoDeviceTest extends AbstractMqttIntegrationTest {
     }
 
     protected byte[] createTestsProvisionMessage(CredentialsType credentialsType, CredentialsDataProto credentialsData) throws Exception {
+        return createTestsProvisionMessage(credentialsType, credentialsData, false);
+    }
+
+    protected byte[] createTestsProvisionMessage(CredentialsType credentialsType, CredentialsDataProto credentialsData, boolean isGateway) throws Exception {
         return ProvisionDeviceRequestMsg.newBuilder()
                 .setDeviceName("Test Provision device")
                 .setCredentialsType(credentialsType != null ? credentialsType : CredentialsType.ACCESS_TOKEN)
@@ -288,7 +329,9 @@ public class MqttProvisionProtoDeviceTest extends AbstractMqttIntegrationTest {
                         ProvisionDeviceCredentialsMsg.newBuilder()
                                 .setProvisionDeviceKey("testProvisionKey")
                                 .setProvisionDeviceSecret("testProvisionSecret")
-                ).build()
+                )
+                .setGateway(isGateway)
+                .build()
                 .toByteArray();
     }
 

common/dao-api/src/main/java/org/thingsboard/server/dao/device/provision/ProvisionRequest.java

@@ -28,4 +28,5 @@ public class ProvisionRequest {
     private DeviceCredentialsType credentialsType;
     private ProvisionDeviceCredentialsData credentialsData;
     private ProvisionDeviceProfileCredentials credentials;
+    private Boolean gateway;
 }

common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java

@@ -635,6 +635,7 @@ public class JsonConverter {
                 .setProvisionDeviceCredentialsMsg(buildProvisionDeviceCredentialsMsg(
                         getStrValue(jo, DataConstants.PROVISION_KEY, true),
                         getStrValue(jo, DataConstants.PROVISION_SECRET, true)))
+                .setGateway(jo.has(DataConstants.GATEWAY_PARAMETER) && jo.get(DataConstants.GATEWAY_PARAMETER).getAsBoolean())
                 .build();
     }
 

common/proto/src/main/proto/queue.proto

@@ -697,6 +697,7 @@ message ProvisionDeviceRequestMsg {
   CredentialsType credentialsType = 2;
   ProvisionDeviceCredentialsMsg provisionDeviceCredentialsMsg = 3;
   CredentialsDataProto credentialsDataProto = 4;
+  bool gateway = 5;
 }
 
 message ProvisionDeviceCredentialsMsg {

dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.dao.device;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -27,6 +28,7 @@ import org.springframework.util.CollectionUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.cache.device.DeviceCacheEvictEvent;
 import org.thingsboard.server.cache.device.DeviceCacheKey;
+import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceIdInfo;
 import org.thingsboard.server.common.data.DeviceInfo;
@@ -554,6 +556,11 @@ public class DeviceServiceImpl extends CachedVersionedEntityService<DeviceCacheK
         device.setName(provisionRequest.getDeviceName());
         device.setType(profile.getName());
         device.setTenantId(profile.getTenantId());
+        if (provisionRequest.getGateway() != null && provisionRequest.getGateway()) {
+            ObjectNode additionalInfoNode = JacksonUtil.newObjectNode();
+            additionalInfoNode.put(DataConstants.GATEWAY_PARAMETER, true);
+            device.setAdditionalInfo(additionalInfoNode);
+        }
         Device savedDevice = saveDevice(device);
         if (!StringUtils.isEmpty(provisionRequest.getCredentialsData().getToken()) ||
                 !StringUtils.isEmpty(provisionRequest.getCredentialsData().getX509CertHash()) ||

msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/HttpClientTest.java

@@ -21,6 +21,7 @@ import io.restassured.path.json.JsonPath;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileProvisionType;
@@ -156,6 +157,46 @@ public class HttpClientTest extends AbstractContainerTest {
         updateDeviceProfileWithProvisioningStrategy(deviceProfile, DeviceProfileProvisionType.DISABLED);
     }
 
+    @Test
+    public void provisionRequestForGatewayDeviceWithAllowToCreateNewDevicesStrategy() throws Exception {
+
+        String testDeviceName = "test_provision_device";
+
+        DeviceProfile deviceProfile = testRestClient.getDeviceProfileById(device.getDeviceProfileId());
+
+        deviceProfile = updateDeviceProfileWithProvisioningStrategy(deviceProfile, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES);
+
+        JsonObject provisionRequest = new JsonObject();
+        provisionRequest.addProperty("provisionDeviceKey", TEST_PROVISION_DEVICE_KEY);
+        provisionRequest.addProperty("provisionDeviceSecret", TEST_PROVISION_DEVICE_SECRET);
+        provisionRequest.addProperty("deviceName", testDeviceName);
+        provisionRequest.addProperty("gateway", true);
+
+        JsonPath provisionResponse = testRestClient.postProvisionRequest(provisionRequest.toString());
+
+        String credentialsType = provisionResponse.get("credentialsType");
+        String credentialsValue = provisionResponse.get("credentialsValue");
+        String status = provisionResponse.get("status");
+
+        testRestClient.deleteDeviceIfExists(device.getId());
+        device = testRestClient.getDeviceByName(testDeviceName);
+
+        JsonNode additionalInfo = device.getAdditionalInfo();
+
+        assertThat(additionalInfo).isNotNull();
+        assertThat(additionalInfo.has(DataConstants.GATEWAY_PARAMETER)
+                && additionalInfo.get(DataConstants.GATEWAY_PARAMETER).isBoolean()).isTrue();
+        assertThat(additionalInfo.get(DataConstants.GATEWAY_PARAMETER).asBoolean()).isTrue();
+
+        DeviceCredentials expectedDeviceCredentials = testRestClient.getDeviceCredentialsByDeviceId(device.getId());
+
+        assertThat(credentialsType).isEqualTo(expectedDeviceCredentials.getCredentialsType().name());
+        assertThat(credentialsValue).isEqualTo(expectedDeviceCredentials.getCredentialsId());
+        assertThat(status).isEqualTo("SUCCESS");
+
+        updateDeviceProfileWithProvisioningStrategy(deviceProfile, DeviceProfileProvisionType.DISABLED);
+    }
+
     @Test
     public void provisionRequestForDeviceWithDisabledProvisioningStrategy() throws Exception {