Commit e4a74ad1 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Several changes: 

Context:
- ORM models completed and tested
- Deactivated unneeded code-linting warnings
- Improved coding of fast_hasher method
- Added test unit for fast_hasher method
- Improved organization and structure of test units
parent fc308bcd

run_local_tests.sh

+3 −1
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ 
#    centralizedcybersecurity/tests/test_unitary.py



coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \

    context/tests/test_unitary.py

    context/tests/test_unitary_fast_hasher.py \

    context/tests/test_unitary_grpc.py \

    #context/tests/test_unitary_rest.py



#coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \

#    device/tests/test_unitary_driverapi.py \

src/context/service/database/ConfigModel.py

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ class ORM_ConfigActionEnum(Enum): 
grpc_to_enum__config_action = functools.partial(

    grpc_to_enum, ConfigActionEnum, ORM_ConfigActionEnum)



class ConfigModel(Model):

class ConfigModel(Model): # pylint: disable=abstract-method

    pk = PrimaryKeyField()



    def dump(self) -> List[Dict]:
@@ -29,7 +29,7 @@ class ConfigModel(Model): 
        config_rules = sorted(config_rules, key=operator.itemgetter('position'))

        return [remove_dict_key(config_rule, 'position') for config_rule in config_rules]



class ConfigRuleModel(Model):

class ConfigRuleModel(Model): # pylint: disable=abstract-method

    pk = PrimaryKeyField()

    config_fk = ForeignKeyField(ConfigModel)

    position = IntegerField(min_value=0, required=True)

src/context/service/database/ConstraintModel.py

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ from context.service.database.Tools import remove_dict_key 


LOGGER = logging.getLogger(__name__)



class ConstraintsModel(Model):

class ConstraintsModel(Model): # pylint: disable=abstract-method

    pk = PrimaryKeyField()



    def dump(self) -> List[Dict]:
@@ -18,7 +18,7 @@ class ConstraintsModel(Model): 
        constraints = sorted(constraints, key=operator.itemgetter('position'))

        return [remove_dict_key(constraint, 'position') for constraint in constraints]



class ConstraintModel(Model):

class ConstraintModel(Model): # pylint: disable=abstract-method

    pk = PrimaryKeyField()

    constraints_fk = ForeignKeyField(ConstraintsModel)

    position = IntegerField(min_value=0, required=True)

src/context/service/database/ContextModel.py

+2 −2
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ class ContextModel(Model): 
        return {'context_uuid': {'uuid': self.context_uuid}}



    def dump_service_ids(self) -> List[Dict]:

        from .ServiceModel import ServiceModel

        from .ServiceModel import ServiceModel # pylint: disable=import-outside-toplevel

        db_service_pks = self.references(ServiceModel)

        return [ServiceModel(self.database, pk).dump_id() for pk in db_service_pks]



    def dump_topology_ids(self) -> List[Dict]:

        from .TopologyModel import TopologyModel

        from .TopologyModel import TopologyModel # pylint: disable=import-outside-toplevel

        db_topology_pks = self.references(TopologyModel)

        return [TopologyModel(self.database, pk).dump_id() for pk in db_topology_pks]

src/context/service/database/DeviceModel.py

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class DeviceModel(Model): 
        return [DriverModel(self.database, pk).dump() for pk,_ in db_driver_pks]



    def dump_endpoints(self) -> List[Dict]:

        from .EndPointModel import EndPointModel

        from .EndPointModel import EndPointModel # pylint: disable=import-outside-toplevel

        db_endpoints_pks = self.references(EndPointModel)

        return [EndPointModel(self.database, pk).dump() for pk,_ in db_endpoints_pks]
@@ -66,7 +66,7 @@ class DeviceModel(Model): 
        if include_endpoints: result['device_endpoints'] = self.dump_endpoints()

        return result



class DriverModel(Model):

class DriverModel(Model): # pylint: disable=abstract-method

    pk = PrimaryKeyField()

    device_fk = ForeignKeyField(DeviceModel)

    driver = EnumeratedField(ORM_DeviceDriverEnum, required=True)