diff --git a/basyx/aas/adapter/_generic.py b/basyx/aas/adapter/_generic.py index baebd17af..982328e7e 100644 --- a/basyx/aas/adapter/_generic.py +++ b/basyx/aas/adapter/_generic.py @@ -13,10 +13,8 @@ from basyx.aas import model # XML Namespace definition -XML_NS_MAP = {"aas": "https://admin-shell.io/aas/3/0", - "abac": "https://admin-shell.io/aas/abac/3/0"} +XML_NS_MAP = {"aas": "https://admin-shell.io/aas/3/0"} XML_NS_AAS = "{" + XML_NS_MAP["aas"] + "}" -XML_NS_ABAC = "{" + XML_NS_MAP["abac"] + "}" MODELING_KIND: Dict[model.ModelingKind, str] = { model.ModelingKind.TEMPLATE: 'Template', diff --git a/basyx/aas/adapter/json/json_deserialization.py b/basyx/aas/adapter/json/json_deserialization.py index 295c4a7b5..3cbabe990 100644 --- a/basyx/aas/adapter/json/json_deserialization.py +++ b/basyx/aas/adapter/json/json_deserialization.py @@ -358,10 +358,6 @@ def _construct_administrative_information( logger.warning("Ignoring 'revision' attribute of AdministrativeInformation object due to missing 'version'") return ret - @classmethod - def _construct_security(cls, _dct: Dict[str, object], object_class=model.Security) -> model.Security: - return object_class() - @classmethod def _construct_operation_variable( cls, dct: Dict[str, object], object_class=model.OperationVariable) -> model.OperationVariable: diff --git a/basyx/aas/adapter/json/json_serialization.py b/basyx/aas/adapter/json/json_serialization.py index 61f2ced55..522bdae23 100644 --- a/basyx/aas/adapter/json/json_serialization.py +++ b/basyx/aas/adapter/json/json_serialization.py @@ -415,21 +415,6 @@ def _asset_administration_shell_to_json(cls, obj: model.AssetAdministrationShell data["submodels"] = list(obj.submodel) return data - # ################################################################# - # transformation functions to serialize classes from model.security - # ################################################################# - - @classmethod - def _security_to_json(cls, obj: model.Security) -> Dict[str, object]: # has no attributes in our implementation - """ - serialization of an object from class Security to json - - :param obj: object of class Security - :return: dict with the serialized attributes of this object - """ - data = cls._abstract_classes_to_json(obj) - return data - # ################################################################# # transformation functions to serialize classes from model.submodel # ################################################################# diff --git a/basyx/aas/adapter/xml/xml_deserialization.py b/basyx/aas/adapter/xml/xml_deserialization.py index f91678b90..f5e85101c 100644 --- a/basyx/aas/adapter/xml/xml_deserialization.py +++ b/basyx/aas/adapter/xml/xml_deserialization.py @@ -653,13 +653,6 @@ def construct_extension(cls, element: etree.Element, object_class=model.Extensio cls._amend_abstract_attributes(extension, element) return extension - @classmethod - def construct_security(cls, _element: etree.Element, object_class=model.Security, **_kwargs: Any) -> model.Security: - """ - TODO: this is just a stub implementation - """ - return object_class() - @classmethod def construct_submodel_element(cls, element: etree.Element, **kwargs: Any) -> model.SubmodelElement: """ @@ -1346,8 +1339,6 @@ def read_aas_xml_element(file: IO, construct: XMLConstructables, failsafe: bool constructor = decoder_.construct_administrative_information elif construct == XMLConstructables.QUALIFIER: constructor = decoder_.construct_qualifier - elif construct == XMLConstructables.SECURITY: - constructor = decoder_.construct_security elif construct == XMLConstructables.OPERATION_VARIABLE: constructor = decoder_.construct_operation_variable elif construct == XMLConstructables.ANNOTATED_RELATIONSHIP_ELEMENT: diff --git a/basyx/aas/adapter/xml/xml_serialization.py b/basyx/aas/adapter/xml/xml_serialization.py index 6b0a0c6cb..76951bb04 100644 --- a/basyx/aas/adapter/xml/xml_serialization.py +++ b/basyx/aas/adapter/xml/xml_serialization.py @@ -510,25 +510,6 @@ def asset_administration_shell_to_xml(obj: model.AssetAdministrationShell, return et_aas -# ############################################################## -# transformation functions to serialize classes from model.security -# ############################################################## - - -def security_to_xml(obj: model.Security, - tag: str = _generic.XML_NS_ABAC+"security") -> etree.Element: - """ - Serialization of objects of class :class:`~aas.model.security.Security` to XML - - todo: This is not yet implemented - - :param obj: Object of class :class:`~aas.model.security.Security` - :param tag: Namespace+Tag of the serialized element (optional). Default is "aas:security" - :return: Serialized ElementTree object - """ - return abstract_classes_to_xml(tag, obj) - - # ############################################################## # transformation functions to serialize classes from model.submodel # ############################################################## diff --git a/basyx/aas/model/__init__.py b/basyx/aas/model/__init__.py index 23e2a334a..985457f24 100644 --- a/basyx/aas/model/__init__.py +++ b/basyx/aas/model/__init__.py @@ -25,15 +25,11 @@ Providers for AAS objects, in order to store and retrieve :class:`~aas.model.base.Identifiable` objects by their :class:`~aas.model.base.Identifier`. -security.py - Security model of the AAS. Currently not existing. - submodel.py Meta-model of the submodels and events. """ from .aas import * -from .security import * from .base import * from .submodel import * from .provider import * diff --git a/basyx/aas/model/security.py b/basyx/aas/model/security.py deleted file mode 100644 index aa42324d3..000000000 --- a/basyx/aas/model/security.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2019 the Eclipse BaSyx Authors -# -# This program and the accompanying materials are made available under the terms of the MIT License, available in -# the LICENSE file of this project. -# -# SPDX-License-Identifier: MIT -""" -This module contains the security aspects of the AAS meta model. Currently, the security model is not ready yet, so this -module doesn't do anything. -""" - - -class Security: - """ - Security model is not ready yet. This is just a placeholder class. - """ - pass diff --git a/docs/source/model/index.rst b/docs/source/model/index.rst index 71601c761..ba8bc8c4d 100644 --- a/docs/source/model/index.rst +++ b/docs/source/model/index.rst @@ -17,5 +17,4 @@ initiating the class. If there is discrepancy between the two, it should be stat concept datatypes provider - security submodel diff --git a/docs/source/model/security.rst b/docs/source/model/security.rst deleted file mode 100644 index 83ea90f0d..000000000 --- a/docs/source/model/security.rst +++ /dev/null @@ -1,5 +0,0 @@ -aas.model.security - Security model of the AAS (currently not existing) -======================================================================= - -.. automodule:: basyx.aas.model.security - :members: