From d8eb88589ecee61561aa6dc70859043aee5192db Mon Sep 17 00:00:00 2001 From: Oleksandra Podhurska Date: Mon, 8 Apr 2024 10:29:10 +0300 Subject: [PATCH 1/2] LogicalDevice improvement --- .../LogicalDevice/LogicalDevice.json | 108 ++++++++++++++++++ .../LogicalServer/LogicalServer.json | 25 ++++ 2 files changed, 133 insertions(+) create mode 100644 Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalDevice.json create mode 100644 Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalServer/LogicalServer.json diff --git a/Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalDevice.json b/Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalDevice.json new file mode 100644 index 00000000..5a8eb1a6 --- /dev/null +++ b/Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalDevice.json @@ -0,0 +1,108 @@ +{ + "@id": "dtmi:org:w3id:rec:LogicalDevice;1", + "@type": "Interface", + "contents": [ + { + "@type": "Relationship", + "displayName": { + "en": "located in" + }, + "name": "locatedIn", + "target": "dtmi:org:w3id:rec:Space;1", + "writable": true + }, + { + "@type": "Relationship", + "displayName": { + "en": "served by" + }, + "name": "servedBy", + "target": "dtmi:org:w3id:rec:LogicalDevice;1", + "maxMultiplicity": 1, + "writable": true + }, + { + "@type": "Relationship", + "displayName": { + "en": "serves" + }, + "name": "serves", + "target": "dtmi:org:w3id:rec:LogicalDevice;1", + "writable": true + }, + { + "@type": "Property", + "displayName": { + "en": "connector type" + }, + "name": "connectorType", + "schema": "string", + "writable": true + }, + { + "@type": "Property", + "displayName": { + "en": "connector name" + }, + "name": "connectorName", + "schema": "string", + "writable": true + }, + { + "@type": "Property", + "displayName": { + "en": "Custom Tags" + }, + "name": "customTags", + "schema": { + "@type": "Map", + "mapKey": { + "name": "tagName", + "schema": "string" + }, + "mapValue": { + "name": "tagValue", + "schema": "boolean" + } + }, + "writable": true + }, + { + "@type": "Property", + "displayName": { + "en": "Identifiers" + }, + "name": "identifiers", + "schema": { + "@type": "Map", + "mapKey": { + "name": "namespace", + "schema": "string" + }, + "mapValue": { + "name": "identifier", + "schema": "string" + } + }, + "writable": true + }, + { + "@type": "Property", + "displayName": { + "en": "name" + }, + "name": "name", + "schema": "string", + "writable": true + } + ], + "description": { + "en": "Logical Device." + }, + "displayName": { + "en": "LogicalDevice" + }, + "@context": [ + "dtmi:dtdl:context;2" + ] +} \ No newline at end of file diff --git a/Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalServer/LogicalServer.json b/Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalServer/LogicalServer.json new file mode 100644 index 00000000..f7b5bb1b --- /dev/null +++ b/Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalServer/LogicalServer.json @@ -0,0 +1,25 @@ +{ + "@id": "dtmi:org:w3id:rec:LogicalServer;1", + "@type": "Interface", + "contents": [ + { + "@type": "Property", + "displayName": { + "en": "IP address" + }, + "name": "IPAddress", + "schema": "string", + "writable": true + } + ], + "description": { + "en": "Logical Server." + }, + "displayName": { + "en": "LogicalServer" + }, + "extends": "dtmi:org:w3id:rec:LogicalDevice;1", + "@context": [ + "dtmi:dtdl:context;2" + ] +} \ No newline at end of file From 9dda9b8f6a9bd7ffec1b3316eb4256efa1130878 Mon Sep 17 00:00:00 2001 From: Oleksandra Podhurska Date: Thu, 4 Jul 2024 17:56:18 +0300 Subject: [PATCH 2/2] GatewayConnectionParameter relation to LogicalDevice --- .../LogicalDevice/LogicalDevice.json | 17 ++++------------- .../Gateway-/GatewayConnectionParameter.json | 11 +++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalDevice.json b/Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalDevice.json index 5a8eb1a6..24e6fc05 100644 --- a/Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalDevice.json +++ b/Source/DTDLv2/RealEstateCore/LogicalDevice/LogicalDevice.json @@ -31,21 +31,12 @@ "writable": true }, { - "@type": "Property", - "displayName": { - "en": "connector type" - }, - "name": "connectorType", - "schema": "string", - "writable": true - }, - { - "@type": "Property", + "@type": "Relationship", "displayName": { - "en": "connector name" + "en": "has point" }, - "name": "connectorName", - "schema": "string", + "name": "hasPoint", + "target": "dtmi:org:w3id:rec:GatewayConnectionParameter;1", "writable": true }, { diff --git a/Source/DTDLv2/RealEstateCore/Point/Parameter/Gateway-/GatewayConnectionParameter.json b/Source/DTDLv2/RealEstateCore/Point/Parameter/Gateway-/GatewayConnectionParameter.json index 47d10f36..c57a3e72 100644 --- a/Source/DTDLv2/RealEstateCore/Point/Parameter/Gateway-/GatewayConnectionParameter.json +++ b/Source/DTDLv2/RealEstateCore/Point/Parameter/Gateway-/GatewayConnectionParameter.json @@ -3,6 +3,17 @@ "@type": "Interface", "displayName": "Gateway Connection Parameter", "extends": "dtmi:org:brickschema:schema:Brick:Parameter;1", + "contents": [ + { + "@type": "Property", + "displayName": { + "en": "gateway type" + }, + "name": "gatewayType", + "schema": "string", + "writable": true + } + ], "@context": [ "dtmi:dtdl:context;2" ]