-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Split serviceGroupId into separate telem and cmd props
- Loading branch information
Showing
10 changed files
with
235 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
test-cases/generated/InterfaceWithAdjunctTypeMqttEmptyTelemServiceGroupIdV4.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| { | ||
| "requiredContexts": [ | ||
| "dtmi:dtdl:extension:mqtt;2" | ||
| ], | ||
| "valid": false, | ||
| "quirks": [], | ||
| "options": [], | ||
| "input": [ | ||
| { | ||
| "@context": [ | ||
| "dtmi:dtdl:context;4", | ||
| "dtmi:dtdl:extension:mqtt;2" | ||
| ], | ||
| "@id": "dtmi:jsonTest:TelemetryAndCommand;1", | ||
| "@type": [ | ||
| "Interface", | ||
| "Mqtt" | ||
| ], | ||
| "payloadFormat": "Json/ecma/404", | ||
| "telemetryTopic": "sample/{modelId}/{senderId}/telemetry", | ||
| "commandTopic": "sample/{modelId}/command/{commandName}", | ||
| "telemServiceGroupId": "", | ||
| "contents": [ | ||
| { | ||
| "@type": "Telemetry", | ||
| "name": "distance", | ||
| "schema": "double" | ||
| }, | ||
| { | ||
| "@type": "Telemetry", | ||
| "name": "color", | ||
| "schema": "string" | ||
| }, | ||
| { | ||
| "@type": "Command", | ||
| "name": "doit", | ||
| "request": { | ||
| "name": "poke", | ||
| "schema": "string" | ||
| }, | ||
| "response": { | ||
| "name": "peek", | ||
| "schema": "integer" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "expect": { | ||
| "parsingErrors": [ | ||
| { | ||
| "ValidationID": "dtmi:dtdl:parsingError:stringInvalid", | ||
| "PrimaryID": "dtmi:jsonTest:TelemetryAndCommand;1", | ||
| "Property": "dtmi:dtdl:extension:mqtt:v2:Mqtt:telemServiceGroupId", | ||
| "Value": "", | ||
| "PrimaryIndex": 0, | ||
| "PrimaryStart": 14 | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
test-cases/generated/InterfaceWithAdjunctTypeMqttInvalidTelemServiceGroupIdV4.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| { | ||
| "requiredContexts": [ | ||
| "dtmi:dtdl:extension:mqtt;2" | ||
| ], | ||
| "valid": false, | ||
| "quirks": [], | ||
| "options": [], | ||
| "input": [ | ||
| { | ||
| "@context": [ | ||
| "dtmi:dtdl:context;4", | ||
| "dtmi:dtdl:extension:mqtt;2" | ||
| ], | ||
| "@id": "dtmi:jsonTest:TelemetryAndCommand;1", | ||
| "@type": [ | ||
| "Interface", | ||
| "Mqtt" | ||
| ], | ||
| "payloadFormat": "Json/ecma/404", | ||
| "telemetryTopic": "sample/{modelId}/{senderId}/telemetry", | ||
| "commandTopic": "sample/{modelId}/command/{commandName}", | ||
| "telemServiceGroupId": "hello/there", | ||
| "contents": [ | ||
| { | ||
| "@type": "Telemetry", | ||
| "name": "distance", | ||
| "schema": "double" | ||
| }, | ||
| { | ||
| "@type": "Telemetry", | ||
| "name": "color", | ||
| "schema": "string" | ||
| }, | ||
| { | ||
| "@type": "Command", | ||
| "name": "doit", | ||
| "request": { | ||
| "name": "poke", | ||
| "schema": "string" | ||
| }, | ||
| "response": { | ||
| "name": "peek", | ||
| "schema": "integer" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "expect": { | ||
| "parsingErrors": [ | ||
| { | ||
| "ValidationID": "dtmi:dtdl:parsingError:stringInvalid", | ||
| "PrimaryID": "dtmi:jsonTest:TelemetryAndCommand;1", | ||
| "Property": "dtmi:dtdl:extension:mqtt:v2:Mqtt:telemServiceGroupId", | ||
| "Value": "hello/there", | ||
| "PrimaryIndex": 0, | ||
| "PrimaryStart": 14 | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
test-cases/generated/InterfaceWithAdjunctTypeMqttWithTelemServiceGroupIdV4.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| { | ||
| "requiredContexts": [ | ||
| "dtmi:dtdl:extension:mqtt;2" | ||
| ], | ||
| "valid": true, | ||
| "quirks": [], | ||
| "options": [], | ||
| "input": [ | ||
| { | ||
| "@context": [ | ||
| "dtmi:dtdl:context;4", | ||
| "dtmi:dtdl:extension:mqtt;2" | ||
| ], | ||
| "@id": "dtmi:jsonTest:TelemetryAndCommand;1", | ||
| "@type": [ | ||
| "Interface", | ||
| "Mqtt" | ||
| ], | ||
| "payloadFormat": "Json/ecma/404", | ||
| "telemetryTopic": "sample/{modelId}/{senderId}/telemetry", | ||
| "commandTopic": "sample/{modelId}/command/{commandName}", | ||
| "telemServiceGroupId": "hello", | ||
| "contents": [ | ||
| { | ||
| "@type": "Telemetry", | ||
| "name": "distance", | ||
| "schema": "double" | ||
| }, | ||
| { | ||
| "@type": "Telemetry", | ||
| "name": "color", | ||
| "schema": "string" | ||
| }, | ||
| { | ||
| "@type": "Command", | ||
| "name": "doit", | ||
| "request": { | ||
| "name": "poke", | ||
| "schema": "string" | ||
| }, | ||
| "response": { | ||
| "name": "peek", | ||
| "schema": "integer" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "expect": { | ||
| "elements": [ | ||
| { | ||
| "id": "dtmi:jsonTest:TelemetryAndCommand;1", | ||
| "type": "Interface", | ||
| "supplementalTypes": [ | ||
| "dtmi:dtdl:extension:mqtt:v2:Mqtt" | ||
| ], | ||
| "supplementalProperties": { | ||
| "dtmi:dtdl:extension:mqtt:v2:Mqtt:payloadFormat": "Json/ecma/404", | ||
| "dtmi:dtdl:extension:mqtt:v2:Mqtt:telemetryTopic": "sample/{modelId}/{senderId}/telemetry", | ||
| "dtmi:dtdl:extension:mqtt:v2:Mqtt:commandTopic": "sample/{modelId}/command/{commandName}", | ||
| "dtmi:dtdl:extension:mqtt:v2:Mqtt:telemServiceGroupId": "hello" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } |