Commit 0ed8cfee authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Device component: 

- Migrated to use new generic gRPC servicer
- Migrated to use new generic Rest servicer
- Migrated to use new settings framework
- Migrated tests to use new generic servicers and mock's
- Solved bug with endpoint monitors' population (dupplicated sample types due to wrong key generation)
- Use Emulated driver when both driver and device type are not specified
- Separated unitary tests and execution scripts per device driver
- Extracted common unitary test functionalities into separate code files
- Minor code styling/formatting
parent 11a69c44

scripts/run_tests_locally-device-all.sh

0 → 100755
+40 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.





PROJECTDIR=`pwd`



cd $PROJECTDIR/src

RCFILE=$PROJECTDIR/coverage/.coveragerc



# Run unitary tests and analyze coverage of code at same time



# Useful flags for pytest:

#-o log_cli=true -o log_file=device.log -o log_file_level=DEBUG



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

    device/tests/test_unitary_emulated.py



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

    device/tests/test_unitary_openconfig.py



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

    device/tests/test_unitary_tapi.py



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

    device/tests/test_unitary_p4.py



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

    device/tests/test_unitary_microwave.py

src/device/tests/MockMonitoringServiceServicerImpl.py→scripts/run_tests_locally-device-emulated.sh

100644 → 100755
+11 −12
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +13,16 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



import logging

from queue import Queue

from monitoring.proto.context_pb2 import Empty

from monitoring.proto.monitoring_pb2 import Kpi

from monitoring.proto.monitoring_pb2_grpc import MonitoringServiceServicer



LOGGER = logging.getLogger(__name__)

PROJECTDIR=`pwd`



class MockMonitoringServiceServicerImpl(MonitoringServiceServicer):

    def __init__(self, queue_samples : Queue):

        self.queue_samples = queue_samples

cd $PROJECTDIR/src

RCFILE=$PROJECTDIR/coverage/.coveragerc



    def IncludeKpi(self, request : Kpi, context) -> Empty:

        self.queue_samples.put(request)

        return Empty()
 
# Run unitary tests and analyze coverage of code at same time



# Useful flags for pytest:

#-o log_cli=true -o log_file=device.log -o log_file_level=DEBUG



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

    device/tests/test_unitary_emulated.py

scripts/run_test_microwave_device.sh→scripts/run_tests_locally-device-microwave.sh

+1 −1
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ RCFILE=$PROJECTDIR/coverage/.coveragerc 
# Useful flags for pytest:

#-o log_cli=true -o log_file=device.log -o log_file_level=DEBUG



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

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

    device/tests/test_unitary_microwave.py

scripts/run_tests_locally-device-openconfig.sh

0 → 100755
+28 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.





PROJECTDIR=`pwd`



cd $PROJECTDIR/src

RCFILE=$PROJECTDIR/coverage/.coveragerc



# Run unitary tests and analyze coverage of code at same time



# Useful flags for pytest:

#-o log_cli=true -o log_file=device.log -o log_file_level=DEBUG



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

    device/tests/test_unitary_openconfig.py

scripts/run_tests_locally-device.sh→scripts/run_tests_locally-device-p4.sh

+1 −1
Original line number Diff line number Diff line
@@ -25,4 +25,4 @@ RCFILE=$PROJECTDIR/coverage/.coveragerc 
#-o log_cli=true -o log_file=device.log -o log_file_level=DEBUG



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

    device/tests/test_unitary.py
 
    device/tests/test_unitary_p4.py