Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compliance_tool/aas_compliance_tool/compliance_check_aasx.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,10 @@ def check_aas_example(file_path: str, state_manager: ComplianceToolStateManager,

# Check if file in file object is the same
list_of_id_shorts = ["ExampleSubmodelCollection", "ExampleFile"]
obj = example_data.get_identifiable("https://acplt.org/Test_Submodel")
obj = example_data.get_identifiable("https://example.org/Test_Submodel")
for id_short in list_of_id_shorts:
obj = obj.get_referable(id_short)
obj2 = obj_store.get_identifiable("https://acplt.org/Test_Submodel")
obj2 = obj_store.get_identifiable("https://example.org/Test_Submodel")
for id_short in list_of_id_shorts:
obj2 = obj2.get_referable(id_short)
try:
Expand Down
348 changes: 174 additions & 174 deletions compliance_tool/test/files/test_demo_full_example.json

Large diffs are not rendered by default.

332 changes: 166 additions & 166 deletions compliance_tool/test/files/test_demo_full_example.xml

Large diffs are not rendered by default.

Large diffs are not rendered by default.

348 changes: 174 additions & 174 deletions compliance_tool/test/files/test_demo_full_example_wrong_attribute.json

Large diffs are not rendered by default.

332 changes: 166 additions & 166 deletions compliance_tool/test/files/test_demo_full_example_wrong_attribute.xml

Large diffs are not rendered by default.

332 changes: 166 additions & 166 deletions compliance_tool/test/files/test_demo_full_example_xml_aasx/aasx/data.xml

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"assetAdministrationShells": [
{
"id": "https://acplt.org/Test_AssetAdministrationShell",
"id": "https://example.org/Test_AssetAdministrationShell",
"idShort": "TestAssetAdministrationShell",
"administration": {
"revision": "0"
},
"modelType": "AssetAdministrationShell",
"assetInformation": {
"assetKind": "Instance",
"globalAssetId": "http://acplt.org/TestAsset/"
"globalAssetId": "http://example.org/TestAsset/"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<aas:administration>
<aas:revision>0</aas:revision>
</aas:administration>
<aas:id>https://acplt.org/Test_AssetAdministrationShell</aas:id>
<aas:id>https://example.org/Test_AssetAdministrationShell</aas:id>
<aas:assetInformation>
<aas:assetKind>Instance</aas:assetKind>
<aas:globalAssetId>http://acplt.org/TestAsset/</aas:globalAssetId>
<aas:globalAssetId>http://example.org/TestAsset/</aas:globalAssetId>
</aas:assetInformation>
</aas:assetAdministrationShell>
</aas:assetAdministrationShells>
Expand Down
4 changes: 2 additions & 2 deletions compliance_tool/test/files/test_not_deserializable_aas.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"assetAdministrationShells": [
{
"id": "https://acplt.org/Test_AssetAdministrationShell",
"id": "https://example.org/Test_AssetAdministrationShell",
"idShort": "TestAssetAdministrationShell",
"modelType": "Test",
"assetInformation": {
"assetKind": "Instance",
"globalAssetId": "http://acplt.org/Test_Asset/"
"globalAssetId": "http://example.org/Test_Asset/"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion compliance_tool/test/files/test_not_deserializable_aas.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<aas:assetAdministrationShells>
<aas:submodel>
<aas:idShort/>
<aas:id>https://acplt.org/Test_Submodel2_Mandatory</aas:id>
<aas:id>https://example.org/Test_Submodel2_Mandatory</aas:id>
<aas:kind>Instance</aas:kind>
<aas:submodelElements/>
</aas:submodel>
Expand Down
6 changes: 3 additions & 3 deletions compliance_tool/test/test_compliance_check_aasx.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def test_check_aas_example(self) -> None:
self.assertEqual(Status.SUCCESS, manager.steps[1].status)
self.assertEqual(Status.FAILED, manager.steps[2].status)
self.assertEqual('FAILED: Check if data is equal to example data\n - ERROR: Attribute id_short of '
'AssetAdministrationShell[https://acplt.org/Test_AssetAdministrationShell] must be == '
'AssetAdministrationShell[https://example.org/Test_AssetAdministrationShell] must be == '
'TestAssetAdministrationShell (value=\'TestAssetAdministrationShell123\')',
manager.format_step(2, verbose_level=1))
self.assertEqual(Status.NOT_EXECUTED, manager.steps[3].status)
Expand Down Expand Up @@ -123,7 +123,7 @@ def test_check_aasx_files_equivalence(self) -> None:
self.assertEqual(Status.SUCCESS, manager.steps[3].status)
self.assertEqual(Status.FAILED, manager.steps[4].status)
self.assertEqual('FAILED: Check if data in files are equal\n - ERROR: Attribute id_short of '
'AssetAdministrationShell[https://acplt.org/Test_AssetAdministrationShell] must be == '
'AssetAdministrationShell[https://example.org/Test_AssetAdministrationShell] must be == '
'TestAssetAdministrationShell123 (value=\'TestAssetAdministrationShell\')',
manager.format_step(4, verbose_level=1))

Expand All @@ -136,7 +136,7 @@ def test_check_aasx_files_equivalence(self) -> None:
self.assertEqual(Status.SUCCESS, manager.steps[3].status)
self.assertEqual(Status.FAILED, manager.steps[4].status)
self.assertEqual('FAILED: Check if data in files are equal\n - ERROR: Attribute id_short of '
'AssetAdministrationShell[https://acplt.org/Test_AssetAdministrationShell] must be == '
'AssetAdministrationShell[https://example.org/Test_AssetAdministrationShell] must be == '
'TestAssetAdministrationShell (value=\'TestAssetAdministrationShell123\')',
manager.format_step(4, verbose_level=1))
self.assertEqual(Status.NOT_EXECUTED, manager.steps[5].status)
Expand Down
6 changes: 3 additions & 3 deletions compliance_tool/test/test_compliance_check_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def test_check_aas_example(self) -> None:
self.assertEqual(Status.SUCCESS, manager.steps[1].status)
self.assertEqual(Status.FAILED, manager.steps[2].status)
self.assertEqual('FAILED: Check if data is equal to example data\n - ERROR: Attribute id_short of '
'AssetAdministrationShell[https://acplt.org/Test_AssetAdministrationShell] must be == '
'AssetAdministrationShell[https://example.org/Test_AssetAdministrationShell] must be == '
'TestAssetAdministrationShell (value=\'TestAssetAdministrationShell123\')',
manager.format_step(2, verbose_level=1))

Expand Down Expand Up @@ -177,7 +177,7 @@ def test_check_json_files_equivalence(self) -> None:
self.assertEqual(Status.SUCCESS, manager.steps[3].status)
self.assertEqual(Status.FAILED, manager.steps[4].status)
self.assertEqual('FAILED: Check if data in files are equal\n - ERROR: Attribute id_short of '
'AssetAdministrationShell[https://acplt.org/Test_AssetAdministrationShell] must be == '
'AssetAdministrationShell[https://example.org/Test_AssetAdministrationShell] must be == '
'TestAssetAdministrationShell123 (value=\'TestAssetAdministrationShell\')',
manager.format_step(4, verbose_level=1))

Expand All @@ -190,6 +190,6 @@ def test_check_json_files_equivalence(self) -> None:
self.assertEqual(Status.SUCCESS, manager.steps[3].status)
self.assertEqual(Status.FAILED, manager.steps[4].status)
self.assertEqual('FAILED: Check if data in files are equal\n - ERROR: Attribute id_short of '
'AssetAdministrationShell[https://acplt.org/Test_AssetAdministrationShell] must be == '
'AssetAdministrationShell[https://example.org/Test_AssetAdministrationShell] must be == '
'TestAssetAdministrationShell (value=\'TestAssetAdministrationShell123\')',
manager.format_step(4, verbose_level=1))
6 changes: 3 additions & 3 deletions compliance_tool/test/test_compliance_check_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def test_check_aas_example(self) -> None:
self.assertEqual(Status.SUCCESS, manager.steps[1].status)
self.assertEqual(Status.FAILED, manager.steps[2].status)
self.assertEqual('FAILED: Check if data is equal to example data\n - ERROR: Attribute id_short of '
'AssetAdministrationShell[https://acplt.org/Test_AssetAdministrationShell] must be == '
'AssetAdministrationShell[https://example.org/Test_AssetAdministrationShell] must be == '
'TestAssetAdministrationShell (value=\'TestAssetAdministrationShell123\')',
manager.format_step(2, verbose_level=1))

Expand Down Expand Up @@ -169,7 +169,7 @@ def test_check_xml_files_equivalence(self) -> None:
self.assertEqual(Status.SUCCESS, manager.steps[3].status)
self.assertEqual(Status.FAILED, manager.steps[4].status)
self.assertEqual('FAILED: Check if data in files are equal\n - ERROR: Attribute id_short of '
'AssetAdministrationShell[https://acplt.org/Test_AssetAdministrationShell] must be == '
'AssetAdministrationShell[https://example.org/Test_AssetAdministrationShell] must be == '
'TestAssetAdministrationShell123 (value=\'TestAssetAdministrationShell\')',
manager.format_step(4, verbose_level=1))

Expand All @@ -182,6 +182,6 @@ def test_check_xml_files_equivalence(self) -> None:
self.assertEqual(Status.SUCCESS, manager.steps[3].status)
self.assertEqual(Status.FAILED, manager.steps[4].status)
self.assertEqual('FAILED: Check if data in files are equal\n - ERROR: Attribute id_short of '
'AssetAdministrationShell[https://acplt.org/Test_AssetAdministrationShell] must be == '
'AssetAdministrationShell[https://example.org/Test_AssetAdministrationShell] must be == '
'TestAssetAdministrationShell (value=\'TestAssetAdministrationShell123\')',
manager.format_step(4, verbose_level=1))
4 changes: 2 additions & 2 deletions sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Create a `Submodel`:
```python
from basyx.aas import model # Import all BaSyx Python SDK classes from the model package

identifier = 'https://acplt.org/Simple_Submodel'
identifier = 'https://example.org/Simple_Submodel'
submodel = model.Submodel(identifier)
```

Expand All @@ -97,7 +97,7 @@ Create a `Property` and add it to the `Submodel`:
semantic_reference = model.ExternalReference(
(model.Key(
type_=model.KeyTypes.GLOBAL_REFERENCE,
value='http://acplt.org/Properties/SimpleProperty'
value='http://example.org/Properties/SimpleProperty'
),)
)
property = model.Property(
Expand Down
4 changes: 2 additions & 2 deletions sdk/basyx/aas/adapter/aasx.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,10 @@ class AASXWriter:
cp.created = datetime.datetime.now()

with AASXWriter("filename.aasx") as writer:
writer.write_aas("https://acplt.org/AssetAdministrationShell",
writer.write_aas("https://example.org/AssetAdministrationShell",
object_store,
file_store)
writer.write_aas("https://acplt.org/AssetAdministrationShell2",
writer.write_aas("https://example.org/AssetAdministrationShell2",
object_store,
file_store)
writer.write_core_properties(cp)
Expand Down
6 changes: 3 additions & 3 deletions sdk/basyx/aas/examples/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ def create_example_aas_binding() -> model.DictObjectStore:
obj_store.update(example_aas_missing_attributes.create_full_example())
obj_store.add(example_submodel_template.create_example_submodel_template())

aas = obj_store.get_identifiable('https://acplt.org/Test_AssetAdministrationShell')
sm = obj_store.get_identifiable('https://acplt.org/Test_Submodel_Template')
aas = obj_store.get_identifiable('https://example.org/Test_AssetAdministrationShell')
sm = obj_store.get_identifiable('https://example.org/Test_Submodel_Template')
assert (isinstance(aas, model.aas.AssetAdministrationShell)) # make mypy happy
assert (isinstance(sm, model.submodel.Submodel)) # make mypy happy
aas.submodel.add(model.ModelReference.from_referable(sm))

cd = obj_store.get_identifiable('https://acplt.org/Test_ConceptDescription_Mandatory')
cd = obj_store.get_identifiable('https://example.org/Test_ConceptDescription_Mandatory')
assert (isinstance(cd, model.concept.ConceptDescription)) # make mypy happy
return obj_store
Loading