Skip to content

Commit 09590aa

Browse files
hapakalahapakala
committed
Changes to aas json schema
1 parent 0232e0b commit 09590aa

6 files changed

+525
-57
lines changed

Diff for: ‎.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LIA_AAS_MQTT_HOST=localhost
66
LIA_AAS_MQTT_PORT=1883
77
LIA_preferedI40EndPoint=MQTT
88
LIA_REGISTRYENDPOINT=http://localhost:9021/i40commu
9-
LIA_AAS_PACKAGE=Demonstrator.json
9+
LIA_AAS_PACKAGE=HC20_SR_final.json
1010
LIA_PUBSUB_LISTNER_HOST=localhost
1111
LIA_PUBSUB_LISTNER_PORT=4051
1212
LIA_SECURITY_ENABLED=N

Diff for: ‎config/HC20_SR_final.json

+406
Large diffs are not rendered by default.

Diff for: ‎config/ass_JsonSchema.json

+39-56
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
},
4141
"text": {
4242
"type": "string",
43-
"minLength": 1,
43+
"minLength": 0,
4444
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
4545
}
4646
},
@@ -60,7 +60,7 @@
6060
"type": "string",
6161
"allOf": [
6262
{
63-
"minLength": 1,
63+
"minLength": 0,
6464
"maxLength": 4
6565
},
6666
{
@@ -75,7 +75,7 @@
7575
"type": "string",
7676
"allOf": [
7777
{
78-
"minLength": 1,
78+
"minLength": 0,
7979
"maxLength": 4
8080
},
8181
{
@@ -91,8 +91,8 @@
9191
},
9292
"templateId": {
9393
"type": "string",
94-
"minLength": 1,
95-
"maxLength": 2000,
94+
"minLength": 0,
95+
"maxLength": 5000,
9696
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
9797
}
9898
}
@@ -161,8 +161,8 @@
161161
},
162162
"globalAssetId": {
163163
"type": "string",
164-
"minLength": 1,
165-
"maxLength": 2000,
164+
"minLength": 0,
165+
"maxLength": 5000,
166166
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
167167
},
168168
"specificAssetIds": {
@@ -174,8 +174,8 @@
174174
},
175175
"assetType": {
176176
"type": "string",
177-
"minLength": 1,
178-
"maxLength": 2000,
177+
"minLength": 0,
178+
"maxLength": 5000,
179179
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
180180
},
181181
"defaultThumbnail": {
@@ -212,7 +212,7 @@
212212
},
213213
"messageTopic": {
214214
"type": "string",
215-
"minLength": 1,
215+
"minLength": 0,
216216
"maxLength": 255,
217217
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
218218
},
@@ -258,7 +258,7 @@
258258
"type": "string",
259259
"allOf": [
260260
{
261-
"minLength": 1,
261+
"minLength": 0,
262262
"maxLength": 100
263263
},
264264
{
@@ -383,20 +383,20 @@
383383
},
384384
"unit": {
385385
"type": "string",
386-
"minLength": 1,
386+
"minLength": 0,
387387
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
388388
},
389389
"unitId": {
390390
"$ref": "#/definitions/Reference"
391391
},
392392
"sourceOfDefinition": {
393393
"type": "string",
394-
"minLength": 1,
394+
"minLength": 0,
395395
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
396396
},
397397
"symbol": {
398398
"type": "string",
399-
"minLength": 1,
399+
"minLength": 0,
400400
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
401401
},
402402
"dataType": {
@@ -411,16 +411,16 @@
411411
},
412412
"valueFormat": {
413413
"type": "string",
414-
"minLength": 1,
414+
"minLength": 0,
415415
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
416416
},
417417
"valueList": {
418418
"$ref": "#/definitions/ValueList"
419419
},
420420
"value": {
421421
"type": "string",
422-
"minLength": 1,
423-
"maxLength": 2000,
422+
"minLength": 0,
423+
"maxLength": 5000,
424424
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
425425
},
426426
"levelType": {
@@ -536,8 +536,8 @@
536536
},
537537
"globalAssetId": {
538538
"type": "string",
539-
"minLength": 1,
540-
"maxLength": 2000,
539+
"minLength": 0,
540+
"maxLength": 5000,
541541
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
542542
},
543543
"specificAssetIds": {
@@ -610,7 +610,7 @@
610610
},
611611
"topic": {
612612
"type": "string",
613-
"minLength": 1,
613+
"minLength": 0,
614614
"maxLength": 255,
615615
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
616616
},
@@ -641,8 +641,7 @@
641641
"properties": {
642642
"name": {
643643
"type": "string",
644-
"minLength": 1,
645-
"maxLength": 128,
644+
"minLength": 0,
646645
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
647646
},
648647
"valueType": {
@@ -676,22 +675,16 @@
676675
"type": "string",
677676
"allOf": [
678677
{
679-
"minLength": 1,
680-
"maxLength": 2000
681-
},
682-
{
683-
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
684-
},
685-
{
686-
"pattern": "^file:(//((localhost|(\\[((([0-9A-Fa-f]{1,4}:){6}([0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))|::([0-9A-Fa-f]{1,4}:){5}([0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))|([0-9A-Fa-f]{1,4})?::([0-9A-Fa-f]{1,4}:){4}([0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))|(([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})?::([0-9A-Fa-f]{1,4}:){3}([0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))|(([0-9A-Fa-f]{1,4}:){2}[0-9A-Fa-f]{1,4})?::([0-9A-Fa-f]{1,4}:){2}([0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))|(([0-9A-Fa-f]{1,4}:){3}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}:([0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))|(([0-9A-Fa-f]{1,4}:){4}[0-9A-Fa-f]{1,4})?::([0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))|(([0-9A-Fa-f]{1,4}:){5}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}|(([0-9A-Fa-f]{1,4}:){6}[0-9A-Fa-f]{1,4})?::)|[vV][0-9A-Fa-f]+\\.([a-zA-Z0-9\\-._~]|[!$&'()*+,;=]|:)+)\\]|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|([a-zA-Z0-9\\-._~]|%[0-9A-Fa-f][0-9A-Fa-f]|[!$&'()*+,;=])*)))?/((([a-zA-Z0-9\\-._~]|%[0-9A-Fa-f][0-9A-Fa-f]|[!$&'()*+,;=]|[:@]))+(/(([a-zA-Z0-9\\-._~]|%[0-9A-Fa-f][0-9A-Fa-f]|[!$&'()*+,;=]|[:@]))*)*)?|/((([a-zA-Z0-9\\-._~]|%[0-9A-Fa-f][0-9A-Fa-f]|[!$&'()*+,;=]|[:@]))+(/(([a-zA-Z0-9\\-._~]|%[0-9A-Fa-f][0-9A-Fa-f]|[!$&'()*+,;=]|[:@]))*)*)?)$"
678+
"minLength": 0,
679+
"maxLength": 5000
687680
}
688681
]
689682
},
690683
"contentType": {
691684
"type": "string",
692685
"allOf": [
693686
{
694-
"minLength": 1,
687+
"minLength": 0,
695688
"maxLength": 100
696689
},
697690
{
@@ -771,8 +764,8 @@
771764
},
772765
"id": {
773766
"type": "string",
774-
"minLength": 1,
775-
"maxLength": 2000,
767+
"minLength": 0,
768+
"maxLength": 5000,
776769
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
777770
}
778771
},
@@ -790,8 +783,8 @@
790783
},
791784
"value": {
792785
"type": "string",
793-
"minLength": 1,
794-
"maxLength": 2000,
786+
"minLength": 0,
787+
"maxLength": 5000,
795788
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
796789
}
797790
},
@@ -851,7 +844,6 @@
851844
{
852845
"properties": {
853846
"text": {
854-
"maxLength": 128
855847
}
856848
}
857849
}
@@ -879,7 +871,7 @@
879871
{
880872
"properties": {
881873
"text": {
882-
"maxLength": 18
874+
"maxLength": 50
883875
}
884876
}
885877
}
@@ -1078,8 +1070,7 @@
10781070
},
10791071
"type": {
10801072
"type": "string",
1081-
"minLength": 1,
1082-
"maxLength": 128,
1073+
"minLength": 0,
10831074
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
10841075
},
10851076
"valueType": {
@@ -1142,22 +1133,14 @@
11421133
"properties": {
11431134
"category": {
11441135
"type": "string",
1145-
"minLength": 1,
1146-
"maxLength": 128,
1136+
"minLength": 0,
11471137
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
11481138
},
11491139
"idShort": {
11501140
"type": "string",
11511141
"allOf": [
11521142
{
1153-
"minLength": 1,
1154-
"maxLength": 128
1155-
},
1156-
{
1157-
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
1158-
},
1159-
{
1160-
"pattern": "^[a-zA-Z][a-zA-Z0-9_]*$"
1143+
"minLength": 0
11611144
}
11621145
]
11631146
},
@@ -1199,7 +1182,7 @@
11991182
"items": {
12001183
"$ref": "#/definitions/Key"
12011184
},
1202-
"minItems": 1
1185+
"minItems": 0
12031186
}
12041187
},
12051188
"required": [
@@ -1283,8 +1266,8 @@
12831266
"type": "string",
12841267
"allOf": [
12851268
{
1286-
"minLength": 1,
1287-
"maxLength": 2000
1269+
"minLength": 0,
1270+
"maxLength": 5000
12881271
},
12891272
{
12901273
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
@@ -1298,7 +1281,7 @@
12981281
"type": "string",
12991282
"allOf": [
13001283
{
1301-
"minLength": 1,
1284+
"minLength": 0,
13021285
"maxLength": 100
13031286
},
13041287
{
@@ -1323,13 +1306,13 @@
13231306
"properties": {
13241307
"name": {
13251308
"type": "string",
1326-
"minLength": 1,
1309+
"minLength": 0,
13271310
"maxLength": 64,
13281311
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
13291312
},
13301313
"value": {
13311314
"type": "string",
1332-
"minLength": 1,
1315+
"minLength": 0,
13331316
"maxLength": 2000,
13341317
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
13351318
},
@@ -1523,7 +1506,7 @@
15231506
"properties": {
15241507
"value": {
15251508
"type": "string",
1526-
"minLength": 1,
1509+
"minLength": 0,
15271510
"maxLength": 2000,
15281511
"pattern": "^([\\t\\n\\r -\ud7ff\ue000-\ufffd]|\\ud800[\\udc00-\\udfff]|[\\ud801-\\udbfe][\\udc00-\\udfff]|\\udbff[\\udc00-\\udfff])*$"
15291512
},

0 commit comments

Comments
 (0)