Skip to content

Commit

Permalink
Fix semantic_id for submodel template contact info
Browse files Browse the repository at this point in the history
  • Loading branch information
otto-ifak committed Nov 21, 2024
1 parent e021ff7 commit 55c6aa0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions aas_test_engines/test_cases/v3_0/submodel_templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Phone:
"semantic_id": "0173-1#02-AAO137#003"
})
available_time: Optional[LangString] = field(metadata={
"semantic_id": "https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/AvailableTime/",
"semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/AvailableTime/",
})


Expand Down Expand Up @@ -98,7 +98,7 @@ class IPCommunication:
"semantic_id": " https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/IPCommunication/TypeOfCommunication",
})
available_time: Optional[str] = field(metadata={
"semantic_id": "https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/AvailableTime/",
"semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/AvailableTime/",
})


Expand All @@ -111,10 +111,10 @@ class ContactInformation:
"semantic_id": "0173-1#02-AAO134#002",
})
language: Optional[List[str]] = field(metadata={
"semantic_id": "https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/Language",
"semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/Language",
})
time_zone: Optional[str] = field(metadata={
"semantic_id": " https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/TimeZone",
"semantic_id": " https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/TimeZone",
})
# TODO: Add hint: "mandatory property according to EU MachineDirective 2006/42/EC."
city_town: Optional[str] = field(metadata={
Expand All @@ -127,7 +127,7 @@ class ContactInformation:
"semantic_id": "0173-1#02-AAO127#003",
})
phone: Optional[Phone] = field(metadata={
"semantic_id": "https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/Phone",
"semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/Phone",
})
fax: Optional[Fax] = field(metadata={
"semantic_id": "0173-1#02-AAQ834#005",
Expand All @@ -136,7 +136,7 @@ class ContactInformation:
"semantic_id": "0173-1#02-AAQ836#005",
})
ipc_communication: Optional[List[IPCommunication]] = field(metadata={
"semantic_id": "https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/IPCommunication",
"semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/IPCommunication",
})
street: Optional[LangString] = field(metadata={
"semantic_id": "0173-1#02-AAO128#002",
Expand Down Expand Up @@ -180,7 +180,7 @@ class ContactInformation:
@template("https://admin-shell.io/zvei/nameplate/1/0/ContactInformations")
class ContactInformations:
contact_information: List[ContactInformation] = field(metadata={
"semantic_id": "https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation",
"semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation",
})


Expand All @@ -197,7 +197,7 @@ class DigitalNameplate:
'semantic_id': '0173-1#02-AAW338#001',
})
contact_information: ContactInformation = field(metadata={
"semantic_id": "https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation",
"semantic_id": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation",
})
manufacturer_product_root: Optional[LangString] = field(metadata={
"semantic_id": " 0173-1#02-AAU732#001",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/submodel_templates/contact_information.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation"
"value": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation"
}
],
"type": "ExternalReference"
Expand Down Expand Up @@ -61,7 +61,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/Language"
"value": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation/Language"
}
],
"type": "ExternalReference"
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/submodel_templates/digital_nameplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"keys": [
{
"type": "GlobalReference",
"value": "https://adminshell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation"
"value": "https://admin-shell.io/zvei/nameplate/1/0/ContactInformations/ContactInformation"
}
],
"type": "ExternalReference"
Expand Down

0 comments on commit 55c6aa0

Please sign in to comment.