reformat code files with IDE reformat and added TestAbacusValidator t…

…o test the abacus validation

slp_abacus/resources/schemas/abacus_mapping_schema.json

@@ -2,27 +2,42 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Mapping File",
   "type": "object",
-  "required": ["trustzones", "components"],
+  "required": [
+    "trustzones",
+    "components"
+  ],
   "properties": {
     "trustzones": {
       "type": "array",
       "items": {
         "type": "object",
-        "required": ["label"],
+        "required": [
+          "label"
+        ],
         "properties": {
-          "label": {"$ref": "#/definitions/LabelUnion"},
-          "type": {"$ref": "#/definitions/query"}
+          "label": {
+            "$ref": "#/definitions/LabelUnion"
+          },
+          "type": {
+            "$ref": "#/definitions/query"
+          }
         }
       }
     },
     "components": {
       "type": "array",
       "items": {
         "type": "object",
-        "required": ["label"],
+        "required": [
+          "label"
+        ],
         "properties": {
-          "label": {"$ref": "#/definitions/LabelUnion"},
-          "type": {"$ref": "#/definitions/query"}
+          "label": {
+            "$ref": "#/definitions/LabelUnion"
+          },
+          "type": {
+            "$ref": "#/definitions/query"
+          }
         }
       }
     }
@@ -35,35 +50,35 @@
         }
       ]
     },
-    "LabelUnion":{
-      "anyOf":[
+    "LabelUnion": {
+      "anyOf": [
         {
-          "type":"array",
-          "items":{
-            "type":"string"
+          "type": "array",
+          "items": {
+            "type": "string"
           }
         },
         {
-          "$ref":"#/definitions/RegExClass"
+          "$ref": "#/definitions/RegExClass"
         },
         {
-          "type":"string"
+          "type": "string"
         }
       ],
-      "title":"LabelUnion"
+      "title": "LabelUnion"
     },
-    "RegExClass":{
-      "type":"object",
-      "additionalProperties":false,
-      "properties":{
-        "$regex":{
-          "type":"string"
+    "RegExClass": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "$regex": {
+          "type": "string"
         }
       },
-      "required":[
+      "required": [
         "$regex"
       ],
-      "title":"RegExClass"
+      "title": "RegExClass"
     }
   }
 }

slp_abacus/slp_abacus/abacus_processor.py

@@ -1,6 +1,6 @@
 from starlette.datastructures import UploadFile
 
-from sl_util.sl_util.file_utils import get_byte_data, get_byte_data_from_upload_file, read_byte_data
+from sl_util.sl_util.file_utils import get_byte_data, get_byte_data_from_upload_file
 from slp_abacus.slp_abacus.load.abacus_loader import AbacusLoader
 from slp_abacus.slp_abacus.load.abacus_mapping_file_loader import AbacusMappingFileLoader
 from slp_abacus.slp_abacus.parse.abacus_parser import AbacusParser
@@ -14,7 +14,7 @@ class AbacusProcessor(OTMProcessor):
     Abacus implementation of OTMProcessor
     """
 
-    def __init__(self, project_id: str, project_name: str, source, mappings: [bytes],  diag_type=None):
+    def __init__(self, project_id: str, project_name: str, source, mappings: [bytes], diag_type=None):
         self.project_id = project_id
         self.project_name = project_name
         self.source: bytes = \

slp_abacus/slp_abacus/load/abacus_loader.py

@@ -1,6 +1,5 @@
 import json
 import logging
-import yaml
 
 from sl_util.sl_util.file_utils import read_byte_data
 from slp_abacus.slp_abacus.objects.diagram_objects import Diagram, DiagramComponent, DiagramRepresentation

slp_abacus/slp_abacus/load/abacus_mapping_file_loader.py

@@ -12,7 +12,6 @@ def __init__(self, trustzones: List[Dict], components: List[Dict]):
         self.components: List[Dict] = components
 
 
-
 class AbacusMappingFileLoader(MappingFileLoader):
 
     def __init__(self, mapping_data_list: List[bytes]):

slp_abacus/slp_abacus/parse/abacus_parser.py

@@ -2,13 +2,13 @@
 
 from otm.otm.entity.otm import OTM
 from otm.otm.otm_builder import OTMBuilder
-from slp_base import OTMBuildingError
-from slp_base.slp_base.provider_parser import ProviderParser
-from slp_base.slp_base.provider_type import DiagramType
 from slp_abacus.slp_abacus.load.abacus_mapping_file_loader import AbacusMapping
 from slp_abacus.slp_abacus.objects.diagram_objects import Diagram
 from slp_abacus.slp_abacus.parse.diagram_mapper import DiagramMapper
 from slp_abacus.slp_abacus.parse.transformers.default_trustzone_transformer import DefaultTrustZoneTransformer
+from slp_base import OTMBuildingError
+from slp_base.slp_base.provider_parser import ProviderParser
+from slp_base.slp_base.provider_type import DiagramType
 
 logger = logging.getLogger(__name__)
 

slp_abacus/slp_abacus/parse/transformers/default_trustzone_transformer.py

@@ -4,9 +4,9 @@
 from otm.otm.trustzone_representation_calculator import \
     TrustZoneRepresentationCalculator
 from sl_util.sl_util.iterations_utils import append_if_not_exists
-from slp_base import OTMBuildingError
 from slp_abacus.slp_abacus.objects.diagram_objects import Diagram, DiagramTrustZone, DiagramComponent
 from slp_abacus.slp_abacus.parse.transformers.transformer import Transformer
+from slp_base import OTMBuildingError
 
 
 def _find_orphan_components(components: List[DiagramComponent]) -> List[DiagramComponent]:
@@ -25,7 +25,8 @@ def transform(self):
             return
 
         if not self.default_trustzone:
-            raise OTMBuildingError(title='Invalid configuration', message='A default trust zone is required with orphan components')
+            raise OTMBuildingError(title='Invalid configuration',
+                                   message='A default trust zone is required with orphan components')
 
         self.__use_default_trustzone_as_global_parent()
 

slp_abacus/slp_abacus/parse/transformers/parent_calculator_transformer.py

@@ -2,7 +2,6 @@
 
 from otm.otm.entity.parent_type import ParentType
 from slp_abacus.slp_abacus.objects.diagram_objects import DiagramComponent, DiagramTrustZone
-from slp_abacus.slp_abacus.parse.transformers.transformer import Transformer
 
 PARENT_TYPES = {
     DiagramComponent: ParentType.COMPONENT,

slp_abacus/slp_abacus/validate/abacus_mapping_file_validator.py

@@ -12,6 +12,3 @@ class AbacusMappingFileValidator(MultipleMappingFileValidator):
     def __init__(self, mappings_data: [bytes]):
         super(AbacusMappingFileValidator, self).__init__(
             Schema.from_package('slp_abacus', self.schema_filename), mappings_data)
-
-    # def validate(self):
-    #     logger.debug('Validating mapping files')

slp_abacus/slp_abacus/validate/abacus_validator.py

@@ -1,21 +1,36 @@
 import logging
 import os
 
-import xmlschema
-
 from sl_util.sl_util.file_utils import get_file_type_by_content
 from slp_base import ProviderValidator, DiagramFileNotValidError, DiagramType
-from slp_base.slp_base.provider_validator import generate_size_error, generate_content_type_error, generate_schema_error
+from slp_base.slp_base.provider_validator import generate_size_error, generate_content_type_error
 
 logger = logging.getLogger(__name__)
-path = os.path.dirname(__file__)
 
-class AbacusValidator(ProviderValidator):
+MAX_SIZE = 10 * 1024 * 1024
+MIN_SIZE = 10
 
-    def __init__(self):
-        super(AbacusValidator, self).__init__()
+path = os.path.dirname(__file__)
 
 
-    # def validate(self):
-    #     logger.info('Validating Abacus file')
+class AbacusValidator(ProviderValidator):
 
+    def __init__(self, data):
+        super(AbacusValidator, self).__init__()
+        self.data = data
+        self.provider = DiagramType.ABACUS
+
+    def validate(self):
+        logger.info('Validating Abacus file')
+        self.__validate_size()
+        self.__validate_content_type()
+
+    def __validate_size(self):
+        size = len(self.data)
+        if size > MAX_SIZE or size < MIN_SIZE:
+            raise generate_size_error(self.provider, 'diag_file', DiagramFileNotValidError)
+
+    def __validate_content_type(self):
+        mime = get_file_type_by_content(self.data)
+        if mime not in self.provider.valid_mime:
+            raise generate_content_type_error(self.provider, 'diag_file', DiagramFileNotValidError)