Skip to content

Commit 007ba9d

Browse files
moritzsommermoritzsommer
committed
Update SDK to V3.0.1 of AAS Part 3a (IEC 61360)
1 parent 2f25cc0 commit 007ba9d

9 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎compliance_tool/test/files/test_demo_full_example.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"keys": [
125125
{
126126
"type": "GlobalReference",
127-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
127+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
128128
}
129129
]
130130
},
@@ -618,7 +618,7 @@
618618
"keys": [
619619
{
620620
"type": "GlobalReference",
621-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
621+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
622622
}
623623
]
624624
},
@@ -1492,7 +1492,7 @@
14921492
"keys": [
14931493
{
14941494
"type": "GlobalReference",
1495-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
1495+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
14961496
}
14971497
]
14981498
},
@@ -3073,7 +3073,7 @@
30733073
"keys": [
30743074
{
30753075
"type": "GlobalReference",
3076-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
3076+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
30773077
}
30783078
]
30793079
},

‎compliance_tool/test/files/test_demo_full_example.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<aas:keys>
3636
<aas:key>
3737
<aas:type>GlobalReference</aas:type>
38-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
38+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
3939
</aas:key>
4040
</aas:keys>
4141
</aas:dataSpecification>
@@ -1229,7 +1229,7 @@
12291229
<aas:keys>
12301230
<aas:key>
12311231
<aas:type>GlobalReference</aas:type>
1232-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
1232+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
12331233
</aas:key>
12341234
</aas:keys>
12351235
</aas:dataSpecification>
@@ -2851,7 +2851,7 @@
28512851
<aas:keys>
28522852
<aas:key>
28532853
<aas:type>GlobalReference</aas:type>
2854-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
2854+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
28552855
</aas:key>
28562856
</aas:keys>
28572857
</aas:dataSpecification>

‎compliance_tool/test/files/test_demo_full_example_json_aasx/aasx/data.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"keys": [
133133
{
134134
"type": "GlobalReference",
135-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
135+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
136136
}
137137
]
138138
},
@@ -626,7 +626,7 @@
626626
"keys": [
627627
{
628628
"type": "GlobalReference",
629-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
629+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
630630
}
631631
]
632632
},
@@ -1500,7 +1500,7 @@
15001500
"keys": [
15011501
{
15021502
"type": "GlobalReference",
1503-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
1503+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
15041504
}
15051505
]
15061506
},
@@ -3081,7 +3081,7 @@
30813081
"keys": [
30823082
{
30833083
"type": "GlobalReference",
3084-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
3084+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
30853085
}
30863086
]
30873087
},

‎compliance_tool/test/files/test_demo_full_example_wrong_attribute.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"keys": [
125125
{
126126
"type": "GlobalReference",
127-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
127+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
128128
}
129129
]
130130
},
@@ -618,7 +618,7 @@
618618
"keys": [
619619
{
620620
"type": "GlobalReference",
621-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
621+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
622622
}
623623
]
624624
},
@@ -1492,7 +1492,7 @@
14921492
"keys": [
14931493
{
14941494
"type": "GlobalReference",
1495-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
1495+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
14961496
}
14971497
]
14981498
},
@@ -3073,7 +3073,7 @@
30733073
"keys": [
30743074
{
30753075
"type": "GlobalReference",
3076-
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0"
3076+
"value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3"
30773077
}
30783078
]
30793079
},

‎compliance_tool/test/files/test_demo_full_example_wrong_attribute.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<aas:keys>
3636
<aas:key>
3737
<aas:type>GlobalReference</aas:type>
38-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
38+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
3939
</aas:key>
4040
</aas:keys>
4141
</aas:dataSpecification>
@@ -1229,7 +1229,7 @@
12291229
<aas:keys>
12301230
<aas:key>
12311231
<aas:type>GlobalReference</aas:type>
1232-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
1232+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
12331233
</aas:key>
12341234
</aas:keys>
12351235
</aas:dataSpecification>
@@ -2851,7 +2851,7 @@
28512851
<aas:keys>
28522852
<aas:key>
28532853
<aas:type>GlobalReference</aas:type>
2854-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
2854+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
28552855
</aas:key>
28562856
</aas:keys>
28572857
</aas:dataSpecification>

‎compliance_tool/test/files/test_demo_full_example_xml_aasx/aasx/data.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<aas:keys>
3636
<aas:key>
3737
<aas:type>GlobalReference</aas:type>
38-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
38+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
3939
</aas:key>
4040
</aas:keys>
4141
</aas:dataSpecification>
@@ -1237,7 +1237,7 @@
12371237
<aas:keys>
12381238
<aas:key>
12391239
<aas:type>GlobalReference</aas:type>
1240-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
1240+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
12411241
</aas:key>
12421242
</aas:keys>
12431243
</aas:dataSpecification>
@@ -2859,7 +2859,7 @@
28592859
<aas:keys>
28602860
<aas:key>
28612861
<aas:type>GlobalReference</aas:type>
2862-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
2862+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
28632863
</aas:key>
28642864
</aas:keys>
28652865
</aas:dataSpecification>

‎compliance_tool/test/files/test_demo_full_example_xml_wrong_attribute_aasx/aasx/data.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<aas:keys>
3636
<aas:key>
3737
<aas:type>GlobalReference</aas:type>
38-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
38+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
3939
</aas:key>
4040
</aas:keys>
4141
</aas:dataSpecification>
@@ -1237,7 +1237,7 @@
12371237
<aas:keys>
12381238
<aas:key>
12391239
<aas:type>GlobalReference</aas:type>
1240-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
1240+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
12411241
</aas:key>
12421242
</aas:keys>
12431243
</aas:dataSpecification>
@@ -2859,7 +2859,7 @@
28592859
<aas:keys>
28602860
<aas:key>
28612861
<aas:type>GlobalReference</aas:type>
2862-
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0</aas:value>
2862+
<aas:value>https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3</aas:value>
28632863
</aas:key>
28642864
</aas:keys>
28652865
</aas:dataSpecification>

‎sdk/basyx/aas/examples/data/example_aas.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
_embedded_data_specification_iec61360 = model.EmbeddedDataSpecification(
2424
data_specification=model.ExternalReference((model.Key(type_=model.KeyTypes.GLOBAL_REFERENCE,
2525
value='https://admin-shell.io/DataSpecificationTemplates/'
26-
'DataSpecificationIEC61360/3/0'),)),
26+
'DataSpecificationIEC61360/3'),)),
2727
data_specification_content=model.DataSpecificationIEC61360(preferred_name=model.PreferredNameTypeIEC61360({
2828
'de': 'Test Specification',
2929
'en-US': 'TestSpecification'

‎sdk/basyx/aas/model/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ class DataSpecificationContent:
11721172
**Constraint AASc-3a-050:** If the ``Data_specification_IEC_61360`` is used
11731173
for an element, the value of ``HasDataSpecification.embedded_data_specifications``
11741174
shall contain the external reference to the IRI of the corresponding data specification
1175-
template ``https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0``
1175+
template ``https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3``
11761176
"""
11771177
@abc.abstractmethod
11781178
def __init__(self):

0 commit comments

Comments
 (0)