bindings: moved to seperate dir, added first unit test

Author: AshFungor

.devcontainer/arch-linux/Dockerfile

@@ -17,7 +17,7 @@ RUN pacman -Syu --noconfirm     \
     boost crypto++ xorg         \
     ttf-ubuntu-font-family      \
     ninja                       \
-    && pip install --break-system-packages conan \
+    && pip install --break-system-packages conan pytest \
     && paccache -r -k 0
 
 ###############

.devcontainer/debian/Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libopenscenegraph-dev libproj-dev libqt5opengl5-dev libxerces-c-dev \
     ninja-build qtbase5-dev sudo \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
-RUN pip install --break-system-packages conan 
+RUN pip install --break-system-packages conan pytest
 
 ###############
 # Build stage #

src/artery/CMakeLists.txt

@@ -163,15 +163,7 @@ if(WITH_STORYBOARD)
 endif()
 
 if(WITH_PYTHON_BINDINGS)
-    add_artery_feature(python_bindings)
-    target_sources(python_bindings PRIVATE
-        application/PythonItsG5Service.cc
-        application/bindings/VanetzaNetBindings.cc
-    )
-    target_link_libraries(python_bindings PRIVATE pybind11)
-    target_compile_definitions(python_bindings PRIVATE
-        $<$<CONFIG:Debug>:PREFER_LOCAL_PYTHON_STUBS>
-    )
+    add_subdirectory(bindings)
 endif()
 
 if(WITH_TRANSFUSION)

src/artery/bindings/CMakeLists.txt

@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.16)
+
+find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+
+add_artery_feature(python_bindings)
+
+target_sources(python_bindings PRIVATE
+    PythonItsG5Service.cc
+    VanetzaNetBindings.cc
+)
+
+target_link_libraries(python_bindings PRIVATE pybind11)
+
+target_compile_definitions(python_bindings PRIVATE
+    $<$<CONFIG:Debug>:PREFER_LOCAL_PYTHON_STUBS>
+)
+
+add_custom_target(test-bindings
+    COMMAND ${Python3_EXECUTABLE} -m pytest -v
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMENT "python bindings: tests"
+)
+
+add_test(NAME test_python_bindings
+    COMMAND ${Python3_EXECUTABLE} -m pytest -v tests
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)

src/artery/application/PythonItsG5Service.cc renamed to src/artery/bindings/PythonItsG5Service.cc

@@ -1,6 +1,5 @@
-#include "artery/application/PythonItsG5Service.h"
+#include "artery/bindings/PythonItsG5Service.h"
 
-#include "artery/application/ItsG5BaseService.h"
 #include "omnetpp/cexception.h"
 #include "pybind11/detail/common.h"
 #include "pybind11/embed.h"
@@ -9,7 +8,6 @@
 
 #include <omnetpp/cconfiguration.h>
 
-#include <cstddef>
 #include <filesystem>
 #include <memory>
 
@@ -109,7 +107,7 @@ void PythonItsG5Service::initializeModules()
 
 #ifdef PREFER_LOCAL_PYTHON_STUBS
         using path = std::filesystem::path;
-        auto localStubsBaseDir = path(__FILE__).parent_path() / "python";
+        auto localStubsBaseDir = path(__FILE__) / "python";
         extendPythonPath(localStubsBaseDir.string());
 #endif
         // Otherwise python stubs must be provided by system.

src/artery/application/PythonItsG5Service.h renamed to src/artery/bindings/PythonItsG5Service.h

@@ -1,4 +1,6 @@
-package artery.application;
+package artery.bindings;
+
+import artery.application.ItsG5Service;
 
 simple PythonItsG5Service like ItsG5Service {
     parameters:

src/artery/application/PythonItsG5Service.ned renamed to src/artery/bindings/PythonItsG5Service.ned

@@ -0,0 +1,27 @@
+from .byte_buffer_convertible import ByteBufferConvertible
+from .chunk_packet import ChunkPacket
+from .cohesive_packet import CohesivePacket
+
+from .osi_layer import (
+    OsiLayer,
+    OsiLayers,
+    osi_layer_iterable,
+    osi_layer_list,
+    max_osi_layer,
+    min_osi_layer,
+    num_osi_layers
+)
+
+
+__all__ = [
+    ByteBufferConvertible,
+    ChunkPacket,
+    CohesivePacket,
+    OsiLayer,
+    OsiLayers,
+    osi_layer_iterable,
+    osi_layer_list,
+    max_osi_layer,
+    min_osi_layer,
+    num_osi_layers
+] # type: ignore