dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added tenant id to edge queue proto

Browse Source
This commit is contained in:
Volodymyr Babak 2022-06-29 17:21:35 +03:00
parent 70991ba7a0
commit 7aa5731d55
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/QueueMsgConstructor.java
View File

@ -35,6 +35,8 @@ public class QueueMsgConstructor {
.setMsgType(msgType) .setMsgType(msgType)
.setIdMSB(queue.getId().getId().getMostSignificantBits()) .setIdMSB(queue.getId().getId().getMostSignificantBits())
.setIdLSB(queue.getId().getId().getLeastSignificantBits()) .setIdLSB(queue.getId().getId().getLeastSignificantBits())
.setTenantIdMSB(queue.getTenantId().getId().getMostSignificantBits())
.setTenantIdLSB(queue.getTenantId().getId().getLeastSignificantBits())
.setName(queue.getName()) .setName(queue.getName())
.setTopic(queue.getTopic()) .setTopic(queue.getTopic())
.setPollInterval(queue.getPollInterval()) .setPollInterval(queue.getPollInterval())

15
application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java
View File

@ -1813,6 +1813,10 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
Assert.assertTrue(latestMessage instanceof QueueUpdateMsg); Assert.assertTrue(latestMessage instanceof QueueUpdateMsg);
QueueUpdateMsg queueUpdateMsg = (QueueUpdateMsg) latestMessage; QueueUpdateMsg queueUpdateMsg = (QueueUpdateMsg) latestMessage;
Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, queueUpdateMsg.getMsgType()); Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, queueUpdateMsg.getMsgType());
Assert.assertEquals(savedQueue.getUuidId().getMostSignificantBits(), queueUpdateMsg.getIdMSB());
Assert.assertEquals(savedQueue.getUuidId().getLeastSignificantBits(), queueUpdateMsg.getIdLSB());
Assert.assertEquals(savedQueue.getTenantId().getId().getMostSignificantBits(), queueUpdateMsg.getTenantIdMSB());
Assert.assertEquals(savedQueue.getTenantId().getId().getLeastSignificantBits(), queueUpdateMsg.getTenantIdLSB());
Assert.assertEquals("EdgeMain", queueUpdateMsg.getName()); Assert.assertEquals("EdgeMain", queueUpdateMsg.getName());
Assert.assertEquals("tb_rule_engine.EdgeMain", queueUpdateMsg.getTopic()); Assert.assertEquals("tb_rule_engine.EdgeMain", queueUpdateMsg.getTopic());
Assert.assertEquals(25, queueUpdateMsg.getPollInterval()); Assert.assertEquals(25, queueUpdateMsg.getPollInterval());
@ -1829,6 +1833,17 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
// 2 // 2
edgeImitator.expectMessageAmount(1); edgeImitator.expectMessageAmount(1);
savedQueue.setPollInterval(50);
savedQueue = doPost("/api/queues?serviceType=" + ServiceType.TB_RULE_ENGINE.name(), savedQueue, Queue.class);
Assert.assertTrue(edgeImitator.waitForMessages());
latestMessage = edgeImitator.getLatestMessage();
Assert.assertTrue(latestMessage instanceof QueueUpdateMsg);
queueUpdateMsg = (QueueUpdateMsg) latestMessage;
Assert.assertEquals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE, queueUpdateMsg.getMsgType());
Assert.assertEquals(50, queueUpdateMsg.getPollInterval());
// 3
edgeImitator.expectMessageAmount(1);
doDelete("/api/queues/" + savedQueue.getUuidId()) doDelete("/api/queues/" + savedQueue.getUuidId())
.andExpect(status().isOk()); .andExpect(status().isOk());
Assert.assertTrue(edgeImitator.waitForMessages()); Assert.assertTrue(edgeImitator.waitForMessages());

18
common/edge-api/src/main/proto/edge.proto
View File

@ -445,14 +445,16 @@ message QueueUpdateMsg {
UpdateMsgType msgType = 1; UpdateMsgType msgType = 1;
int64 idMSB = 2; int64 idMSB = 2;
int64 idLSB = 3; int64 idLSB = 3;
string name = 4; int64 tenantIdMSB = 4;
string topic = 5; int64 tenantIdLSB = 5;
int32 pollInterval = 6; string name = 6;
int32 partitions = 7; string topic = 7;
bool consumerPerPartition = 8; int32 pollInterval = 8;
int64 packProcessingTimeout = 9; int32 partitions = 9;
SubmitStrategyProto submitStrategy = 10; bool consumerPerPartition = 10;
ProcessingStrategyProto processingStrategy = 11; int64 packProcessingTimeout = 11;
SubmitStrategyProto submitStrategy = 12;
ProcessingStrategyProto processingStrategy = 13;
} }
message SubmitStrategyProto { message SubmitStrategyProto {