diff --git a/basyx/aas/adapter/json/aasJSONSchema.json b/basyx/aas/adapter/json/aasJSONSchema.json index e5e2716d3..5e0ca1faa 100644 --- a/basyx/aas/adapter/json/aasJSONSchema.json +++ b/basyx/aas/adapter/json/aasJSONSchema.json @@ -337,77 +337,6 @@ } ] }, - "DataSpecificationPhysicalUnit": { - "allOf": [ - { - "$ref": "#/definitions/DataSpecificationContent" - }, - { - "properties": { - "unitName": { - "type": "string", - "minLength": 1 - }, - "unitSymbol": { - "type": "string", - "minLength": 1 - }, - "definition": { - "type": "array", - "items": { - "$ref": "#/definitions/LangStringDefinitionTypeIec61360" - }, - "minItems": 1 - }, - "siNotation": { - "type": "string", - "minLength": 1 - }, - "siName": { - "type": "string", - "minLength": 1 - }, - "dinNotation": { - "type": "string", - "minLength": 1 - }, - "eceName": { - "type": "string", - "minLength": 1 - }, - "eceCode": { - "type": "string", - "minLength": 1 - }, - "nistName": { - "type": "string", - "minLength": 1 - }, - "sourceOfDefinition": { - "type": "string", - "minLength": 1 - }, - "conversionFactor": { - "type": "string", - "minLength": 1 - }, - "registrationAuthorityId": { - "type": "string", - "minLength": 1 - }, - "supplier": { - "type": "string", - "minLength": 1 - } - }, - "required": [ - "unitName", - "unitSymbol", - "definition" - ] - } - ] - }, "DataTypeDefXsd": { "type": "string", "enum": [ @@ -869,7 +798,6 @@ "Capability", "ConceptDescription", "DataSpecificationIEC61360", - "DataSpecificationPhysicalUnit", "Entity", "File", "MultiLanguageProperty", diff --git a/basyx/aas/adapter/json/json_deserialization.py b/basyx/aas/adapter/json/json_deserialization.py index 0eb7866c6..cfdafe1e1 100644 --- a/basyx/aas/adapter/json/json_deserialization.py +++ b/basyx/aas/adapter/json/json_deserialization.py @@ -187,7 +187,6 @@ def object_hook(cls, dct: Dict[str, object]) -> object: 'Range': cls._construct_range, 'ReferenceElement': cls._construct_reference_element, 'DataSpecificationIEC61360': cls._construct_data_specification_iec61360, - 'DataSpecificationPhysicalUnit': cls._construct_data_specification_physical_unit, } # Get modelType and constructor function @@ -460,37 +459,6 @@ def _construct_concept_description(cls, dct: Dict[str, object], object_class=mod ret.is_case_of.add(cls._construct_reference(case_data)) return ret - @classmethod - def _construct_data_specification_physical_unit(cls, dct: Dict[str, object], - object_class=model.base.DataSpecificationPhysicalUnit)\ - -> model.base.DataSpecificationPhysicalUnit: - ret = object_class( - unit_name=_get_ts(dct, 'unitName', str), - unit_symbol=_get_ts(dct, 'unitSymbol', str), - definition=cls._construct_lang_string_set(_get_ts(dct, 'definition', list), model.DefinitionTypeIEC61360) - ) - if 'siNotation' in dct: - ret.si_notation = _get_ts(dct, 'siNotation', str) - if 'siName' in dct: - ret.si_name = _get_ts(dct, 'siName', str) - if 'dinNotation' in dct: - ret.din_notation = _get_ts(dct, 'dinNotation', str) - if 'eceName' in dct: - ret.ece_name = _get_ts(dct, 'eceName', str) - if 'eceCode' in dct: - ret.ece_code = _get_ts(dct, 'eceCode', str) - if 'nistName' in dct: - ret.nist_name = _get_ts(dct, 'nistName', str) - if 'sourceOfDefinition' in dct: - ret.source_of_definition = _get_ts(dct, 'sourceOfDefinition', str) - if 'conversionFactor' in dct: - ret.conversion_factor = _get_ts(dct, 'conversionFactor', str) - if 'registrationAuthorityId' in dct: - ret.registration_authority_id = _get_ts(dct, 'registrationAuthorityId', str) - if 'supplier' in dct: - ret.supplier = _get_ts(dct, 'supplier', str) - return ret - @classmethod def _construct_data_specification_iec61360(cls, dct: Dict[str, object], object_class=model.base.DataSpecificationIEC61360)\ diff --git a/basyx/aas/adapter/json/json_serialization.py b/basyx/aas/adapter/json/json_serialization.py index 3a057de0e..fa3586b4f 100644 --- a/basyx/aas/adapter/json/json_serialization.py +++ b/basyx/aas/adapter/json/json_serialization.py @@ -72,7 +72,6 @@ def default(self, obj: object) -> object: model.Capability: self._capability_to_json, model.ConceptDescription: self._concept_description_to_json, model.DataSpecificationIEC61360: self._data_specification_iec61360_to_json, - model.DataSpecificationPhysicalUnit: self._data_specification_physical_unit_to_json, model.Entity: self._entity_to_json, model.Extension: self._extension_to_json, model.File: self._file_to_json, @@ -367,43 +366,6 @@ def _data_specification_iec61360_to_json( data_spec['levelType'] = {v: k in obj.level_types for k, v in _generic.IEC61360_LEVEL_TYPES.items()} return data_spec - @classmethod - def _data_specification_physical_unit_to_json( - cls, obj: model.base.DataSpecificationPhysicalUnit) -> Dict[str, object]: - """ - serialization of an object from class DataSpecificationPhysicalUnit to json - - :param obj: object of class DataSpecificationPhysicalUnit - :return: dict with the serialized attributes of this object - """ - data_spec: Dict[str, object] = { - 'modelType': 'DataSpecificationPhysicalUnit', - 'unitName': obj.unit_name, - 'unitSymbol': obj.unit_symbol, - 'definition': obj.definition - } - if obj.si_notation is not None: - data_spec['siNotation'] = obj.si_notation - if obj.si_name is not None: - data_spec['siName'] = obj.si_name - if obj.din_notation is not None: - data_spec['dinNotation'] = obj.din_notation - if obj.ece_name is not None: - data_spec['eceName'] = obj.ece_name - if obj.ece_code is not None: - data_spec['eceCode'] = obj.ece_code - if obj.nist_name is not None: - data_spec['nistName'] = obj.nist_name - if obj.source_of_definition is not None: - data_spec['sourceOfDefinition'] = obj.source_of_definition - if obj.conversion_factor is not None: - data_spec['conversionFactor'] = obj.conversion_factor - if obj.registration_authority_id is not None: - data_spec['registrationAuthorityId'] = obj.registration_authority_id - if obj.supplier is not None: - data_spec['supplier'] = obj.supplier - return data_spec - @classmethod def _asset_administration_shell_to_json(cls, obj: model.AssetAdministrationShell) -> Dict[str, object]: """ diff --git a/basyx/aas/adapter/xml/AAS.xsd b/basyx/aas/adapter/xml/AAS.xsd index 47cf861a8..1c9a6e209 100644 --- a/basyx/aas/adapter/xml/AAS.xsd +++ b/basyx/aas/adapter/xml/AAS.xsd @@ -192,7 +192,6 @@ - @@ -254,102 +253,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1226,11 +1129,6 @@ - - - - - diff --git a/basyx/aas/adapter/xml/xml_deserialization.py b/basyx/aas/adapter/xml/xml_deserialization.py index a1913261d..d3d65ce0c 100644 --- a/basyx/aas/adapter/xml/xml_deserialization.py +++ b/basyx/aas/adapter/xml/xml_deserialization.py @@ -1093,53 +1093,11 @@ def construct_data_specification_content(cls, element: etree.Element, **kwargs: data_specification_contents: Dict[str, Callable[..., model.DataSpecificationContent]] = \ {NS_AAS + k: v for k, v in { "dataSpecificationIec61360": cls.construct_data_specification_iec61360, - "dataSpecificationPhysicalUnit": cls.construct_data_specification_physical_unit, }.items()} if element.tag not in data_specification_contents: raise KeyError(f"{_element_pretty_identifier(element)} is not a valid DataSpecificationContent!") return data_specification_contents[element.tag](element, **kwargs) - @classmethod - def construct_data_specification_physical_unit(cls, element: etree.Element, - object_class=model.DataSpecificationPhysicalUnit, **_kwargs: Any) \ - -> model.DataSpecificationPhysicalUnit: - dspu = object_class(_child_text_mandatory(element, NS_AAS + "unitName"), - _child_text_mandatory(element, NS_AAS + "unitSymbol"), - _child_construct_mandatory(element, NS_AAS + "definition", - cls.construct_definition_type_iec61360)) - si_notation = _get_text_or_none(element.find(NS_AAS + "siNotation")) - if si_notation is not None: - dspu.si_notation = si_notation - si_name = _get_text_or_none(element.find(NS_AAS + "siName")) - if si_name is not None: - dspu.si_name = si_name - din_notation = _get_text_or_none(element.find(NS_AAS + "dinNotation")) - if din_notation is not None: - dspu.din_notation = din_notation - ece_name = _get_text_or_none(element.find(NS_AAS + "eceName")) - if ece_name is not None: - dspu.ece_name = ece_name - ece_code = _get_text_or_none(element.find(NS_AAS + "eceCode")) - if ece_code is not None: - dspu.ece_code = ece_code - nist_name = _get_text_or_none(element.find(NS_AAS + "nistName")) - if nist_name is not None: - dspu.nist_name = nist_name - source_of_definition = _get_text_or_none(element.find(NS_AAS + "sourceOfDefinition")) - if source_of_definition is not None: - dspu.source_of_definition = source_of_definition - conversion_factor = _get_text_or_none(element.find(NS_AAS + "conversionFactor")) - if conversion_factor is not None: - dspu.conversion_factor = conversion_factor - registration_authority_id = _get_text_or_none(element.find(NS_AAS + "registrationAuthorityId")) - if registration_authority_id is not None: - dspu.registration_authority_id = registration_authority_id - supplier = _get_text_or_none(element.find(NS_AAS + "supplier")) - if supplier is not None: - dspu.supplier = supplier - cls._amend_abstract_attributes(dspu, element) - return dspu - @classmethod def construct_data_specification_iec61360(cls, element: etree.Element, object_class=model.DataSpecificationIEC61360, **_kwargs: Any) -> model.DataSpecificationIEC61360: @@ -1319,7 +1277,6 @@ class XMLConstructables(enum.Enum): EMBEDDED_DATA_SPECIFICATION = enum.auto() DATA_SPECIFICATION_CONTENT = enum.auto() DATA_SPECIFICATION_IEC61360 = enum.auto() - DATA_SPECIFICATION_PHYSICAL_UNIT = enum.auto() def read_aas_xml_element(file: IO, construct: XMLConstructables, failsafe: bool = True, stripped: bool = False, @@ -1415,8 +1372,6 @@ def read_aas_xml_element(file: IO, construct: XMLConstructables, failsafe: bool constructor = decoder_.construct_embedded_data_specification elif construct == XMLConstructables.DATA_SPECIFICATION_IEC61360: constructor = decoder_.construct_data_specification_iec61360 - elif construct == XMLConstructables.DATA_SPECIFICATION_PHYSICAL_UNIT: - constructor = decoder_.construct_data_specification_physical_unit # the following constructors decide which constructor to call based on the elements tag elif construct == XMLConstructables.DATA_ELEMENT: constructor = decoder_.construct_data_element diff --git a/basyx/aas/adapter/xml/xml_serialization.py b/basyx/aas/adapter/xml/xml_serialization.py index cabec85bb..0b0cf176b 100644 --- a/basyx/aas/adapter/xml/xml_serialization.py +++ b/basyx/aas/adapter/xml/xml_serialization.py @@ -413,8 +413,6 @@ def data_specification_content_to_xml(obj: model.DataSpecificationContent, et_data_specification_content = abstract_classes_to_xml(tag, obj) if isinstance(obj, model.DataSpecificationIEC61360): et_data_specification_content.append(data_specification_iec61360_to_xml(obj)) - elif isinstance(obj, model.DataSpecificationPhysicalUnit): - et_data_specification_content.append(data_specification_physical_unit_to_xml(obj)) else: raise TypeError(f"Serialization of {obj.__class__} to XML is not supported!") return et_data_specification_content @@ -464,45 +462,6 @@ def data_specification_iec61360_to_xml(obj: model.DataSpecificationIEC61360, return et_data_specification_iec61360 -def data_specification_physical_unit_to_xml(obj: model.DataSpecificationPhysicalUnit, - tag: str = NS_AAS+"dataSpecificationPhysicalUnit") -> etree.Element: - """ - Serialization of objects of class :class:`~aas.model.base.DataSpecificationPhysicalUnit` to XML - - :param obj: Object of class :class:`~aas.model.base.DataSpecificationPhysicalUnit` - :param tag: Namespace+Tag of the ElementTree object. Default is "aas:dataSpecificationPhysicalUnit" - :return: Serialized ElementTree object - """ - et_data_specification_physical_unit = abstract_classes_to_xml(tag, obj) - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "unitName", text=obj.unit_name)) - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "unitSymbol", text=obj.unit_symbol)) - et_data_specification_physical_unit.append(lang_string_set_to_xml(obj.definition, NS_AAS + "definition")) - if obj.si_notation is not None: - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "siNotation", text=obj.si_notation)) - if obj.si_name is not None: - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "siName", text=obj.si_name)) - if obj.din_notation is not None: - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "dinNotation", text=obj.din_notation)) - if obj.ece_name is not None: - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "eceName", text=obj.ece_name)) - if obj.ece_code is not None: - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "eceCode", text=obj.ece_code)) - if obj.nist_name is not None: - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "nistName", text=obj.nist_name)) - if obj.source_of_definition is not None: - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "sourceOfDefinition", - text=obj.source_of_definition)) - if obj.conversion_factor is not None: - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "conversionFactor", - text=obj.conversion_factor)) - if obj.registration_authority_id is not None: - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "registrationAuthorityId", - text=obj.registration_authority_id)) - if obj.supplier is not None: - et_data_specification_physical_unit.append(_generate_element(NS_AAS + "supplier", text=obj.supplier)) - return et_data_specification_physical_unit - - def asset_administration_shell_to_xml(obj: model.AssetAdministrationShell, tag: str = NS_AAS+"assetAdministrationShell") -> etree.Element: """ diff --git a/basyx/aas/examples/data/_helper.py b/basyx/aas/examples/data/_helper.py index 978b8597f..414247da4 100644 --- a/basyx/aas/examples/data/_helper.py +++ b/basyx/aas/examples/data/_helper.py @@ -804,8 +804,6 @@ def check_data_specification_content_equal( .format(repr(object_), repr(expected_value))) if isinstance(object_, model.base.DataSpecificationIEC61360): self._check_data_specification_iec61360_equal(object_, expected_value) # type: ignore - elif isinstance(object_, model.base.DataSpecificationPhysicalUnit): - self._check_data_specification_physical_unit_equal(object_, expected_value) # type: ignore def _check_data_specification_iec61360_equal(self, object_: model.base.DataSpecificationIEC61360, expected_value: model.base.DataSpecificationIEC61360): @@ -839,30 +837,6 @@ def _check_data_specification_iec61360_equal(self, object_: model.base.DataSpeci "ValueList must contain 0 ValueReferencePairs", value=len(object_.value_list)): self._check_value_list_equal(object_.value_list, expected_value.value_list) # type: ignore - def _check_data_specification_physical_unit_equal( - self, object_: model.base.DataSpecificationPhysicalUnit, - expected_value: model.base.DataSpecificationPhysicalUnit): - """ - Checks if the given DataSpecificationPhysicalUnit objects are equal - - :param object_: Given DataSpecificationPhysicalUnit object to check - :param expected_value: expected DataSpecificationPhysicalUnit object - :return: - """ - self.check_attribute_equal(object_, 'unit_name', expected_value.unit_name) - self.check_attribute_equal(object_, 'unit_symbol', expected_value.unit_symbol) - self.check_attribute_equal(object_, 'definition', expected_value.definition) - self.check_attribute_equal(object_, 'si_notation', expected_value.si_notation) - self.check_attribute_equal(object_, 'si_name', expected_value.si_name) - self.check_attribute_equal(object_, 'din_notation', expected_value.din_notation) - self.check_attribute_equal(object_, 'ece_name', expected_value.ece_name) - self.check_attribute_equal(object_, 'ece_code', expected_value.ece_code) - self.check_attribute_equal(object_, 'nist_name', expected_value.nist_name) - self.check_attribute_equal(object_, 'source_of_definition', expected_value.source_of_definition) - self.check_attribute_equal(object_, 'conversion_factor', expected_value.conversion_factor) - self.check_attribute_equal(object_, 'registration_authority_id', expected_value.registration_authority_id) - self.check_attribute_equal(object_, 'supplier', expected_value.supplier) - def _check_value_list_equal(self, object_: model.ValueList, expected_value: model.ValueList): """ Checks if the given ValueList objects are equal diff --git a/basyx/aas/examples/data/example_aas.py b/basyx/aas/examples/data/example_aas.py index eb84b02c7..180d00c67 100644 --- a/basyx/aas/examples/data/example_aas.py +++ b/basyx/aas/examples/data/example_aas.py @@ -48,30 +48,6 @@ value="TEST", level_types={model.IEC61360LevelType.MIN, model.IEC61360LevelType.MAX}) ) -_embedded_data_specification_physical_unit = model.EmbeddedDataSpecification( - data_specification=model.ExternalReference((model.Key(type_=model.KeyTypes.GLOBAL_REFERENCE, - value='https://admin-shell.io/DataSpecificationTemplates/' - 'DataSpecificationPhysicalUnit/3/0'),)), - data_specification_content=model.DataSpecificationPhysicalUnit( - unit_name='TestPhysicalUnit', - unit_symbol='TPU', - definition=model.DefinitionTypeIEC61360({ - 'de': 'Dies ist eine DataSpecificationPhysicalUnit für Testzwecke', - 'en-US': 'This is a DataSpecificationPhysicalUnit for testing purposes' - }), - si_notation='t', - si_name='test', - din_notation='v', - ece_name='vest', - ece_code='ECE', - nist_name='nest', - source_of_definition='http://acplt.org/DataSpec/ExamplePUDef', - conversion_factor='1000', - registration_authority_id='DIN', - supplier='IAT' - ) -) - def create_full_example() -> model.DictObjectStore: """ @@ -745,7 +721,7 @@ def create_example_submodel() -> model.Submodel: kind=model.ModellingKind.INSTANCE, extension=(), supplemental_semantic_id=(), - embedded_data_specifications=(_embedded_data_specification_physical_unit,) + embedded_data_specifications=() ) return submodel @@ -777,8 +753,7 @@ def create_example_concept_description() -> model.ConceptDescription: 'Templates/Test_ConceptDescription', embedded_data_specifications=( _embedded_data_specification_iec61360, - )), - embedded_data_specifications=(_embedded_data_specification_physical_unit,) + )) ) return concept_description diff --git a/basyx/aas/model/base.py b/basyx/aas/model/base.py index 5f22e470e..64372f55d 100644 --- a/basyx/aas/model/base.py +++ b/basyx/aas/model/base.py @@ -2369,57 +2369,3 @@ def _get_symbol(self): def __repr__(self): return f"DataSpecificationIEC61360[unit={self.unit}]" - - -class DataSpecificationPhysicalUnit(DataSpecificationContent): - """ - A specialized :class:`~.DataSpecificationContent` to define descriptions - for physical units conformant to IEC 61360. - - :ivar unit_name: Name of the physical unit - :ivar unit_symbol: Symbol for the physical unit - :ivar definition: Definition in different languages - :ivar si_notation: Notation of SI physical unit - :ivar si_name: Name of SI physical unit - :ivar din_notation: Notation of physical unit conformant to DIN - :ivar ece_name: Name of physical unit conformant to ECE - :ivar ece_code: Code of physical unit conformant to ECE - :ivar nist_name: Name of NIST physical unit - :ivar source_of_definition: Source of definition - :ivar conversion_factor: Conversion factor - :ivar registration_authority_id: Registration authority ID - :ivar supplier: Supplier - """ - - def __init__( - self, - unit_name: str, - unit_symbol: str, - definition: DefinitionTypeIEC61360, - si_notation: Optional[str] = None, - si_name: Optional[str] = None, - din_notation: Optional[str] = None, - ece_name: Optional[str] = None, - ece_code: Optional[str] = None, - nist_name: Optional[str] = None, - source_of_definition: Optional[str] = None, - conversion_factor: Optional[str] = None, - registration_authority_id: Optional[str] = None, - supplier: Optional[str] = None, - ) -> None: - self.unit_name: str = unit_name - self.unit_symbol: str = unit_symbol - self.definition: DefinitionTypeIEC61360 = definition - self.si_notation: Optional[str] = si_notation - self.si_name: Optional[str] = si_name - self.din_notation: Optional[str] = din_notation - self.ece_name: Optional[str] = ece_name - self.ece_code: Optional[str] = ece_code - self.nist_name: Optional[str] = nist_name - self.source_of_definition: Optional[str] = source_of_definition - self.conversion_factor: Optional[str] = conversion_factor - self.registration_authority_id: Optional[str] = registration_authority_id - self.supplier: Optional[str] = supplier - - def __repr__(self): - return f"DataSpecificationPhysicalUnit[unit_name={self.unit_name}]" diff --git a/test/compliance_tool/files/test_demo_full_example.json b/test/compliance_tool/files/test_demo_full_example.json index 3c2a65bc3..fa3e4683f 100644 --- a/test/compliance_tool/files/test_demo_full_example.json +++ b/test/compliance_tool/files/test_demo_full_example.json @@ -1654,44 +1654,6 @@ } ] } - ], - "embeddedDataSpecifications": [ - { - "dataSpecification": { - "type": "ExternalReference", - "keys": [ - { - "type": "GlobalReference", - "value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationPhysicalUnit/3/0" - } - ] - }, - "dataSpecificationContent": { - "modelType": "DataSpecificationPhysicalUnit", - "unitName": "TestPhysicalUnit", - "unitSymbol": "TPU", - "definition": [ - { - "language": "de", - "text": "Dies ist eine DataSpecificationPhysicalUnit für Testzwecke" - }, - { - "language": "en-US", - "text": "This is a DataSpecificationPhysicalUnit for testing purposes" - } - ], - "siNotation": "t", - "siName": "test", - "dinNotation": "v", - "eceName": "vest", - "eceCode": "ECE", - "nistName": "nest", - "sourceOfDefinition": "http://acplt.org/DataSpec/ExamplePUDef", - "conversionFactor": "1000", - "registrationAuthorityId": "DIN", - "supplier": "IAT" - } - } ] }, { @@ -3243,44 +3205,6 @@ } ] } - ], - "embeddedDataSpecifications": [ - { - "dataSpecification": { - "type": "ExternalReference", - "keys": [ - { - "type": "GlobalReference", - "value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationPhysicalUnit/3/0" - } - ] - }, - "dataSpecificationContent": { - "modelType": "DataSpecificationPhysicalUnit", - "unitName": "TestPhysicalUnit", - "unitSymbol": "TPU", - "definition": [ - { - "language": "de", - "text": "Dies ist eine DataSpecificationPhysicalUnit für Testzwecke" - }, - { - "language": "en-US", - "text": "This is a DataSpecificationPhysicalUnit for testing purposes" - } - ], - "siNotation": "t", - "siName": "test", - "dinNotation": "v", - "eceName": "vest", - "eceCode": "ECE", - "nistName": "nest", - "sourceOfDefinition": "http://acplt.org/DataSpec/ExamplePUDef", - "conversionFactor": "1000", - "registrationAuthorityId": "DIN", - "supplier": "IAT" - } - } ] }, { diff --git a/test/compliance_tool/files/test_demo_full_example.xml b/test/compliance_tool/files/test_demo_full_example.xml index e5fc6d966..81cd70cca 100644 --- a/test/compliance_tool/files/test_demo_full_example.xml +++ b/test/compliance_tool/files/test_demo_full_example.xml @@ -680,45 +680,6 @@ - - - - ExternalReference - - - GlobalReference - https://admin-shell.io/DataSpecificationTemplates/DataSpecificationPhysicalUnit/3/0 - - - - - - TestPhysicalUnit - TPU - - - de - Dies ist eine DataSpecificationPhysicalUnit für Testzwecke - - - en-US - This is a DataSpecificationPhysicalUnit for testing purposes - - - t - test - v - vest - ECE - nest - http://acplt.org/DataSpec/ExamplePUDef - 1000 - DIN - IAT - - - - PARAMETER @@ -3073,45 +3034,6 @@ http://acplt.org/AdministrativeInformationTemplates/Test_ConceptDescription https://acplt.org/Test_ConceptDescription - - - - ExternalReference - - - GlobalReference - https://admin-shell.io/DataSpecificationTemplates/DataSpecificationPhysicalUnit/3/0 - - - - - - TestPhysicalUnit - TPU - - - de - Dies ist eine DataSpecificationPhysicalUnit für Testzwecke - - - en-US - This is a DataSpecificationPhysicalUnit for testing purposes - - - t - test - v - vest - ECE - nest - http://acplt.org/DataSpec/ExamplePUDef - 1000 - DIN - IAT - - - - ExternalReference diff --git a/test/compliance_tool/files/test_demo_full_example_json.aasx b/test/compliance_tool/files/test_demo_full_example_json.aasx index 96e20e718..ff6bfc7d2 100644 Binary files a/test/compliance_tool/files/test_demo_full_example_json.aasx and b/test/compliance_tool/files/test_demo_full_example_json.aasx differ diff --git a/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json b/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json index 0bd00b497..af711187a 100644 --- a/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json +++ b/test/compliance_tool/files/test_demo_full_example_wrong_attribute.json @@ -1654,44 +1654,6 @@ } ] } - ], - "embeddedDataSpecifications": [ - { - "dataSpecification": { - "type": "ExternalReference", - "keys": [ - { - "type": "GlobalReference", - "value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationPhysicalUnit/3/0" - } - ] - }, - "dataSpecificationContent": { - "modelType": "DataSpecificationPhysicalUnit", - "unitName": "TestPhysicalUnit", - "unitSymbol": "TPU", - "definition": [ - { - "language": "de", - "text": "Dies ist eine DataSpecificationPhysicalUnit für Testzwecke" - }, - { - "language": "en-US", - "text": "This is a DataSpecificationPhysicalUnit for testing purposes" - } - ], - "siNotation": "t", - "siName": "test", - "dinNotation": "v", - "eceName": "vest", - "eceCode": "ECE", - "nistName": "nest", - "sourceOfDefinition": "http://acplt.org/DataSpec/ExamplePUDef", - "conversionFactor": "1000", - "registrationAuthorityId": "DIN", - "supplier": "IAT" - } - } ] }, { @@ -3243,44 +3205,6 @@ } ] } - ], - "embeddedDataSpecifications": [ - { - "dataSpecification": { - "type": "ExternalReference", - "keys": [ - { - "type": "GlobalReference", - "value": "https://admin-shell.io/DataSpecificationTemplates/DataSpecificationPhysicalUnit/3/0" - } - ] - }, - "dataSpecificationContent": { - "modelType": "DataSpecificationPhysicalUnit", - "unitName": "TestPhysicalUnit", - "unitSymbol": "TPU", - "definition": [ - { - "language": "de", - "text": "Dies ist eine DataSpecificationPhysicalUnit für Testzwecke" - }, - { - "language": "en-US", - "text": "This is a DataSpecificationPhysicalUnit for testing purposes" - } - ], - "siNotation": "t", - "siName": "test", - "dinNotation": "v", - "eceName": "vest", - "eceCode": "ECE", - "nistName": "nest", - "sourceOfDefinition": "http://acplt.org/DataSpec/ExamplePUDef", - "conversionFactor": "1000", - "registrationAuthorityId": "DIN", - "supplier": "IAT" - } - } ] }, { diff --git a/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml b/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml index ab3c230e8..475b5ff0b 100644 --- a/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml +++ b/test/compliance_tool/files/test_demo_full_example_wrong_attribute.xml @@ -680,45 +680,6 @@ - - - - ExternalReference - - - GlobalReference - https://admin-shell.io/DataSpecificationTemplates/DataSpecificationPhysicalUnit/3/0 - - - - - - TestPhysicalUnit - TPU - - - de - Dies ist eine DataSpecificationPhysicalUnit für Testzwecke - - - en-US - This is a DataSpecificationPhysicalUnit for testing purposes - - - t - test - v - vest - ECE - nest - http://acplt.org/DataSpec/ExamplePUDef - 1000 - DIN - IAT - - - - PARAMETER @@ -3073,45 +3034,6 @@ http://acplt.org/AdministrativeInformationTemplates/Test_ConceptDescription https://acplt.org/Test_ConceptDescription - - - - ExternalReference - - - GlobalReference - https://admin-shell.io/DataSpecificationTemplates/DataSpecificationPhysicalUnit/3/0 - - - - - - TestPhysicalUnit - TPU - - - de - Dies ist eine DataSpecificationPhysicalUnit für Testzwecke - - - en-US - This is a DataSpecificationPhysicalUnit for testing purposes - - - t - test - v - vest - ECE - nest - http://acplt.org/DataSpec/ExamplePUDef - 1000 - DIN - IAT - - - - ExternalReference diff --git a/test/compliance_tool/files/test_demo_full_example_xml.aasx b/test/compliance_tool/files/test_demo_full_example_xml.aasx index e75a75ac6..b513a52cd 100644 Binary files a/test/compliance_tool/files/test_demo_full_example_xml.aasx and b/test/compliance_tool/files/test_demo_full_example_xml.aasx differ diff --git a/test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute.aasx b/test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute.aasx index 00c3427ea..06bc98b31 100644 Binary files a/test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute.aasx and b/test/compliance_tool/files/test_demo_full_example_xml_wrong_attribute.aasx differ