py-eb-model 1.1.5__py3-none-any.whl → 1.1.7__py3-none-any.whl

eb_model/tests/parser/test_os_xdm_parser.py

@@ -0,0 +1,150 @@
+from ...parser.os_xdm_parser import OsXdmParser
+from ...models.os_xdm import Os, OsResource
+from ...models.eb_doc import EBModel
+
+import xml.etree.ElementTree as ET
+import pytest
+
+
+class TestOsXdmParser:
+    def test_read_os_resources(self):
+
+        # Create a mock XML element for testing
+        xml_content = """
+        <datamodel version="8.0"
+                xmlns="http://www.tresos.de/_projects/DataModel2/18/root.xsd"
+                xmlns:a="http://www.tresos.de/_projects/DataModel2/18/attribute.xsd"
+                xmlns:v="http://www.tresos.de/_projects/DataModel2/06/schema.xsd"
+                xmlns:d="http://www.tresos.de/_projects/DataModel2/06/data.xsd">
+            <d:lst name="OsResource" type="MAP">
+                <d:ctr name="Resource1">
+                    <a:a name="IMPORTER_INFO" value="@CALC(SvcAs,os.resources,1)"/>
+                    <d:var name="OsResourceProperty" type="ENUMERATION" value="STANDARD">
+                        <d:lst name="OsResourceAccessingApplication">
+                            <d:ref type="REFERENCE" value="ASPath:/Os/Os/OsApplication_C0">
+                                <a:a name="IMPORTER_INFO" value="@CALC(SvcAs,os.resources,1)"/>
+                            </d:ref>
+                        </d:lst>
+                    </d:var>
+                </d:ctr>
+                <d:ctr name="Resource2">
+                    <d:var name="OsResourceProperty" type="ENUMERATION" value="INTERNAL"/>
+                    <d:lst name="OsResourceAccessingApplication"/>
+                    <d:ref name="OsResourceLinkedResourceRef" type="REFERENCE" >
+                        <a:a name="ENABLE" value="false"/>
+                        <a:a name="IMPORTER_INFO" value="@DEF"/>
+                    </d:ref>
+                </d:ctr>
+            </d:lst>
+        </datamodel>
+        """
+        element = ET.fromstring(xml_content)
+
+        # Mock Os object
+        model = EBModel.getInstance()
+        os = model.getOs()
+
+        # Create parser instance
+        parser = OsXdmParser()
+        parser.nsmap = {
+            '': "http://www.tresos.de/_projects/DataModel2/18/root.xsd",
+            'a': "http://www.tresos.de/_projects/DataModel2/18/attribute.xsd",
+            'v': "http://www.tresos.de/_projects/DataModel2/06/schema.xsd",
+            'd': "http://www.tresos.de/_projects/DataModel2/06/data.xsd"
+        }
+
+        # Call the method
+        parser.read_os_resources(element, os)
+
+        # Assertions
+        resources = os.getOsResourceList()
+        assert len(resources) == 2
+
+        resource1 = resources[0]
+        assert resource1.getName() == "Resource1"
+        assert resource1.getImporterInfo() == "@CALC(SvcAs,os.resources,1)"
+        assert resource1.isCalculatedSvcAs() is True
+        assert resource1.getOsResourceProperty() == "STANDARD"
+        assert len(resource1.getOsResourceAccessingApplicationRefs()) == 1
+        for ref in resource1.getOsResourceAccessingApplicationRefs():
+            assert ref.getValue() == "/Os/Os/OsApplication_C0"
+
+        resource2 = resources[1]
+        assert resource2.getName() == "Resource2"
+        assert resource2.getImporterInfo() is None
+        assert resource2.isCalculatedSvcAs() is False
+        assert resource2.getOsResourceProperty() == "INTERNAL"
+        assert len(resource2.getOsResourceAccessingApplicationRefs()) == 0
+
+    '''
+    def test_read_os_applications(self):
+        # Create a mock XML element for testing
+        xml_content = """
+        <datamodel version="8.0"
+                xmlns="http://www.tresos.de/_projects/DataModel2/18/root.xsd"
+                xmlns:a="http://www.tresos.de/_projects/DataModel2/18/attribute.xsd"
+                xmlns:v="http://www.tresos.de/_projects/DataModel2/06/schema.xsd"
+                xmlns:d="http://www.tresos.de/_projects/DataModel2/06/data.xsd">
+            <d:lst name="OsApplication" type="MAP">
+                <d:ctr name="App1">
+                    <d:var name="OsTrusted" type="BOOLEAN" value="true"/>
+                    <d:lst name="OsAppResourceRef">
+                        <d:ref type="REFERENCE" value="/Os/OsResource1"/>
+                        <d:ref type="REFERENCE" value="/Os/OsResource2"/>
+                    </d:lst>
+                    <d:lst name="OsAppTaskRef">
+                        <d:ref type="REFERENCE" value="/Os/OsTask1"/>
+                    </d:lst>
+                    <d:lst name="OsAppIsrRef">
+                        <d:ref type="REFERENCE" value="/Os/OsIsr1"/>
+                    </d:lst>
+                </d:ctr>
+                <d:ctr name="App2">
+                    <d:var name="OsTrusted" type="BOOLEAN" value="false"/>
+                    <d:lst name="OsAppResourceRef"/>
+                    <d:lst name="OsAppTaskRef"/>
+                    <d:lst name="OsAppIsrRef"/>
+                </d:ctr>
+            </d:lst>
+        </datamodel>
+        """
+        element = ET.fromstring(xml_content)
+
+        # Mock Os object
+        model = EBModel.getInstance()
+        os = model.getOs()
+
+        # Create parser instance
+        parser = OsXdmParser()
+        parser.nsmap = {
+            '': "http://www.tresos.de/_projects/DataModel2/18/root.xsd",
+            'a': "http://www.tresos.de/_projects/DataModel2/18/attribute.xsd",
+            'v': "http://www.tresos.de/_projects/DataModel2/06/schema.xsd",
+            'd': "http://www.tresos.de/_projects/DataModel2/06/data.xsd"
+        }
+
+        # Call the method
+        parser.read_os_applications(element, os)
+
+        # Assertions
+        applications = os.getOsApplicationList()
+        assert len(applications) == 2
+
+        app1 = applications[0]
+        assert app1.getName() == "App1"
+        assert app1.getOsTrusted() == "true"
+        assert len(app1.getOsAppResourceRefs()) == 2
+        assert app1.getOsAppResourceRefs()[0].getValue() == "/Os/OsResource1"
+        assert app1.getOsAppResourceRefs()[1].getValue() == "/Os/OsResource2"
+        assert len(app1.getOsAppTaskRefs()) == 1
+        assert app1.getOsAppTaskRefs()[0].getValue() == "/Os/OsTask1"
+        assert len(app1.getOsAppIsrRefs()) == 1
+        assert app1.getOsAppIsrRefs()[0].getValue() == "/Os/OsIsr1"
+
+        app2 = applications[1]
+        assert app2.getName() == "App2"
+        assert app2.getOsTrusted() == "false"
+        assert len(app2.getOsAppResourceRefs()) == 0
+        assert len(app2.getOsAppTaskRefs()) == 0
+        assert len(app2.getOsAppIsrRefs()) == 0
+     noqa: E501 '''

{py_eb_model-1.1.5.dist-info → py_eb_model-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-eb-model
-Version: 1.1.5
+Version: 1.1.7
 Summary: The parser for EB XDM file
 Home-page: UNKNOWN
 Author: melodypapa
@@ -34,7 +34,7 @@ And more details can be found at https://packaging.python.org/
 
 # 3. CLI 
 
-## 3.1. os-task-xlsx
+## 3.1. os-xdm-xlsx
 
 Extract the Os Task information from os.xdm and then report all to Excel file.
 
@@ -60,7 +60,7 @@ os-xdm-xlsx data/Os.xdm data/Os.xlsx
 
 ![](doc/os-xdm-xlsx/os_counter_in_excel.png)
 
-## 3.2. rte-task-xls
+## 3.2. rte-xdm-xlsx
 
 Extract the Rte Configuration information from rte.xdm and then report all to Excel file.
 
@@ -76,6 +76,16 @@ rte-xdm-xlsx data/Rte.xdm data/Rte.xlsx
 rte-xdm-xlsx -r data/Rte.xdm data/Os.xdm data/Runnable.xlsx
 ```
 
+# nvm-xdm-xlsx
+
+Extract the NvM Configuration information from nvm.xdm and then report all to Excel file.
+
+1. Export the Nvm Configuration information to excel file
+
+```bash
+nvm-xdm-xlsx data/NvM.xdm data/NvM.xlsx
+```
+
 ## 3.3. PrefSystemImporter
 
 Read the EB preference XDM and generate the ARXML file list into text file or create the AUTOSAR builder project file.
@@ -205,3 +215,16 @@ PrefSystemImporter --base-path c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rt
    * Rte::getRteBswModuleInstance
 
 
+**Version 1.1.6**
+
+1. Add the OsResource support in Os Module:
+   * Os::getOsResourceList
+   * Os::addOsResource
+2. Read the NvMBlockDescriptor List
+
+**Version 1.1.7**
+
+1. Solve the case issue of read_optional_value enables attribute.
+2. Support to read IMPORT_INFO for OsResource.
+3. Add the test cases for OsXdmParser.
+

py_eb_model-1.1.7.dist-info/RECORD

@@ -0,0 +1,47 @@
+eb_model/__init__.py,sha256=oMw5xoAS-lHLxufQSlBIXhGZZMcPmwGFA3PYpTwaQTU,92
+eb_model/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+eb_model/cli/nvm_xdm_2_xls_cli.py,sha256=9OxWkT7OdL2DZbG8N_2sE3y8T0GWyzpwYKWnpTm8lag,1742
+eb_model/cli/os_xdm_2_xls_cli.py,sha256=zUnxJ4uHWRSjMmpSK5hXRAzVt-_YGEyiMXrexnJSk6g,1970
+eb_model/cli/pref_system_importer_cli.py,sha256=Cra-rVpgxruLLyWHRdYAgbwfcHVPV2L8Jk6ck0v4lJU,3361
+eb_model/cli/rte_xdm_2_xls_cli.py,sha256=AQogqNfbcAtRYnJVj7gVvUQc9xsOlpZAZzvIulom7qw,2191
+eb_model/models/__init__.py,sha256=Jn4oOg6CxbAvULNaVt0obDLGPZC2sLzeo6rQt4eTDQ0,245
+eb_model/models/abstract.py,sha256=hYUffwaL_9Z_4kG3z8dQVBIlxWjODktmCTP1JZP5ecg,4449
+eb_model/models/eb_doc.py,sha256=d_vNhWda7ZwpmLPiCmlq316G-C2hvWz5bJBss9P2y_A,2955
+eb_model/models/eclipse_project.py,sha256=I1y4UUPJQqy8Bh77sJkufzcH9wXMN1Wk82er-m1Sxhc,155
+eb_model/models/importer_xdm.py,sha256=wUdwZQ-uq75EkhU4nzrYeNR5UphaTJ41MjywOPcCHsE,4246
+eb_model/models/nvm_xdm.py,sha256=cFeAblxdSNlGP7yN2cPLMmvvJVMNB0LuYmuM_eRQOyQ,11956
+eb_model/models/os_xdm.py,sha256=xBJPXDaKIczkI5TuKCBM28Xiga5FV3j7WK-UqLK8Qks,42939
+eb_model/models/rte_xdm.py,sha256=5z7m5zp4_eoMypKhB4tq65RHLLm8Tww_3P59MqxZ6ZQ,22067
+eb_model/parser/__init__.py,sha256=K_sp7EVjS2KoWUCdX_0h2jIY8Gxhwqs6AtRP1Pgj1TU,214
+eb_model/parser/eb_parser.py,sha256=l3oLb60GxlXiOYNmT0bLIGDfojS8gxa6YoXlak7fkiM,8434
+eb_model/parser/eb_parser_factory.py,sha256=zqsqq52uImU4-WcS5dvHfhM95hiEPAGRtNzVik8i8wc,971
+eb_model/parser/nvm_xdm_parser.py,sha256=UME7IRySnnkKvwHY1jehdraEatWTAxWWykxntWqadUk,2216
+eb_model/parser/os_xdm_parser.py,sha256=cBhUzmulZ0m61YopMzoGeQb1i4WwfYYbyZJq5AuOulk,14220
+eb_model/parser/pref_xdm_parser.py,sha256=EjfR4vrnjRVLw_7wyPmMYlBj6lPXZbBZMEdWlYPj3uI,1539
+eb_model/parser/rte_xdm_parser.py,sha256=zKs1vz0DxIt4zPi6yBvPjGvLkq-BR2z_Dz7Pv8LBuDA,5560
+eb_model/reporter/__init__.py,sha256=p-sMv7gJkxe3u8la09SZJjiWPgGGjZSaX0WoBD-hn-0,77
+eb_model/reporter/markdown.py,sha256=NhcJOFQ_BVbkgGe66uAT7KUPIchWU4kfVMtMLQtbK-w,1647
+eb_model/reporter/excel_reporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+eb_model/reporter/excel_reporter/abstract.py,sha256=ljjk7ejPrRr4QKVBzIaAcPa6kM_lRDc1THQKgdFF7vM,1899
+eb_model/reporter/excel_reporter/nvm_xdm.py,sha256=OM_hKXcuFQyZUnia0kuZ03OSSrOMW0i2vIpUa5LTdEc,1698
+eb_model/reporter/excel_reporter/os_xdm.py,sha256=AHlM28djFoOznoxB8Qz188BxwQL5N0Uc2-qISbbgyfQ,12072
+eb_model/reporter/excel_reporter/rte_xdm.py,sha256=ToU8ZQ7abG1qJyT2_TcND2cOq8YO2TBBzt3IAdl4qdI,4863
+eb_model/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+eb_model/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+eb_model/tests/models/test_abstract.py,sha256=P588Us1-Qjz28LEVFSnNTTS6zeNRS33kl-SuXRe8R-s,7283
+eb_model/tests/models/test_eb_doc.py,sha256=zp5-JGGT6oKTPqef8cv10CayDGe3QJmadN37z8J_0uU,2360
+eb_model/tests/models/test_eb_model.py,sha256=3fpIHhzQlf9KZjm4fZxcSTT4Zio6YhTrcn9UBvlhOfo,1632
+eb_model/tests/models/test_eclipse_project.py,sha256=xvIhPXzqkrP7E3bLcVJFaN75Qx0yMrq6_gr_SG6g_sE,688
+eb_model/tests/models/test_ecuc_container.py,sha256=-M_XZTSeWGVIJac6sj_an2-Ui65QVNXbfbETOD_Ipm8,758
+eb_model/tests/models/test_importer_xdm.py,sha256=CG-kt8JrJa6MTnsotDEGCEymsu7OTxgpCVEOjkJeaCw,3415
+eb_model/tests/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+eb_model/tests/parser/test_os_xdm_parser.py,sha256=V5yjexXfx0D47uHeEIM7bDiO1QCxiqHAwlmYWpcYYuQ,6607
+eb_model/writer/__init__.py,sha256=CXvQAsNV1OvYClkHdKCG7Q300OVBzcl2TmoD68MyQOs,95
+eb_model/writer/project_writer.py,sha256=9BQU1CJAktVxFvQk89Pj4IbizTJXnlQidt4eX_CIFXU,2800
+eb_model/writer/text_writer.py,sha256=7d4_PUTJk5Y6S_EQflAH3ACDnUw9VwJzP90GFDh0n0I,991
+py_eb_model-1.1.7.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
+py_eb_model-1.1.7.dist-info/METADATA,sha256=-Q55drso4z0SUaeVK_GMtK4LLDiyP4trkayoKroYTSs,7039
+py_eb_model-1.1.7.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+py_eb_model-1.1.7.dist-info/entry_points.txt,sha256=N7cHTMb7nGQXu2X5JvJo3JJQdRE11vRMlLyx27uarHg,234
+py_eb_model-1.1.7.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
+py_eb_model-1.1.7.dist-info/RECORD,,

{py_eb_model-1.1.5.dist-info → py_eb_model-1.1.7.dist-info}/entry_points.txt

@@ -1,5 +1,6 @@
 [console_scripts]
 PrefSystemImporter = eb_model.cli.pref_system_importer_cli:main
+nvm-xdm-xlsx = eb_model.cli.nvm_xdm_2_xls_cli:main
 os-xdm-xlsx = eb_model.cli.os_xdm_2_xls_cli:main
 rte-xdm-xlsx = eb_model.cli.rte_xdm_2_xls_cli:main
 

py_eb_model-1.1.5.dist-info/RECORD

@@ -1,38 +0,0 @@
-eb_model/__init__.py,sha256=oMw5xoAS-lHLxufQSlBIXhGZZMcPmwGFA3PYpTwaQTU,92
-eb_model/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eb_model/cli/os_xdm_2_xls_cli.py,sha256=zUnxJ4uHWRSjMmpSK5hXRAzVt-_YGEyiMXrexnJSk6g,1970
-eb_model/cli/pref_system_importer_cli.py,sha256=Cra-rVpgxruLLyWHRdYAgbwfcHVPV2L8Jk6ck0v4lJU,3361
-eb_model/cli/rte_xdm_2_xls_cli.py,sha256=83uzE2Vk0h267gWxF9mnWN3Bh69RJpYyKULFXpxTByY,2127
-eb_model/models/__init__.py,sha256=Jn4oOg6CxbAvULNaVt0obDLGPZC2sLzeo6rQt4eTDQ0,245
-eb_model/models/abstract.py,sha256=rYy45TV8HzcG1dQWbXD0yalWpkxubUzjAvwOugAwtbE,3884
-eb_model/models/eb_doc.py,sha256=Kx0eExrQCmkWdPC0OnzVcZAOeXtRcwNM6AFMANntgAQ,2671
-eb_model/models/eclipse_project.py,sha256=I1y4UUPJQqy8Bh77sJkufzcH9wXMN1Wk82er-m1Sxhc,155
-eb_model/models/importer_xdm.py,sha256=wUdwZQ-uq75EkhU4nzrYeNR5UphaTJ41MjywOPcCHsE,4246
-eb_model/models/os_xdm.py,sha256=Kj5DuBP3-RJUdEf3d5Q1iKhpqCF_lnM-evougloAsZo,33983
-eb_model/models/rte_xdm.py,sha256=dEsGhpnaG-VG5QfEPv6hxQdopzwMkHHz8kDHj_7MuYM,21851
-eb_model/parser/__init__.py,sha256=7VOmPr4dng_TrOyDZFu2_s3r0BJZQGiOUxALMY8EnqI,170
-eb_model/parser/eb_parser.py,sha256=_5sUl2pMt1SchHvrLOhU2axqa3FmKTWElSB79taz0O4,8188
-eb_model/parser/eb_parser_factory.py,sha256=zqsqq52uImU4-WcS5dvHfhM95hiEPAGRtNzVik8i8wc,971
-eb_model/parser/os_xdm_parser.py,sha256=folWFp-4HdxIBmEzrBW4LA3ZQRAYygI30sZbks6rOnQ,10510
-eb_model/parser/pref_xdm_parser.py,sha256=EjfR4vrnjRVLw_7wyPmMYlBj6lPXZbBZMEdWlYPj3uI,1539
-eb_model/parser/rte_xdm_parser.py,sha256=plUue0c4ejreE9w71_mT0JNzGSClf30cXhfC2NalrII,5471
-eb_model/reporter/__init__.py,sha256=H8D_23UwJi1Ph6yjBfZhxWVbu9ci5_O4471gqXGiZCM,36
-eb_model/reporter/markdown.py,sha256=NhcJOFQ_BVbkgGe66uAT7KUPIchWU4kfVMtMLQtbK-w,1647
-eb_model/reporter/excel_reporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eb_model/reporter/excel_reporter/abstract.py,sha256=PfIoiKNKy1eRJBABln7rADkSdwWzS03Vs03jBYM-_5Y,1622
-eb_model/reporter/excel_reporter/os_xdm.py,sha256=MG6-6qi7Dh1XXv4CR2I-iQpOvypso0dlfXt_ZQ3lO7I,6406
-eb_model/reporter/excel_reporter/rte_xdm.py,sha256=OHuVPUV7xCdDzxELyXi766YJ6GejTHrzPrlAUBqexIw,3937
-eb_model/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eb_model/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eb_model/tests/models/test_eb_model.py,sha256=3fpIHhzQlf9KZjm4fZxcSTT4Zio6YhTrcn9UBvlhOfo,1632
-eb_model/tests/models/test_ecuc_container.py,sha256=-M_XZTSeWGVIJac6sj_an2-Ui65QVNXbfbETOD_Ipm8,758
-eb_model/tests/models/test_importer_xdm.py,sha256=F80kO77jeyfCkLPRgRLjEj3UPcrACimR5LhBhFgX_m4,3372
-eb_model/writer/__init__.py,sha256=CXvQAsNV1OvYClkHdKCG7Q300OVBzcl2TmoD68MyQOs,95
-eb_model/writer/project_writer.py,sha256=9BQU1CJAktVxFvQk89Pj4IbizTJXnlQidt4eX_CIFXU,2800
-eb_model/writer/text_writer.py,sha256=7d4_PUTJk5Y6S_EQflAH3ACDnUw9VwJzP90GFDh0n0I,991
-py_eb_model-1.1.5.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
-py_eb_model-1.1.5.dist-info/METADATA,sha256=ZT0KjMQ8x1ezJYgwhkrupkz4lcb0-hKKVw4WWxTyKcI,6476
-py_eb_model-1.1.5.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-py_eb_model-1.1.5.dist-info/entry_points.txt,sha256=yDLH9wnJ5Fp7ImgyFRSnr3mU6nvaenuKZnbe2rgs8Mk,183
-py_eb_model-1.1.5.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
-py_eb_model-1.1.5.dist-info/RECORD,,